frontend fixes

resources/js/Oasis/Invoices/Clients/CreateClient.vue

@@ -115,7 +115,7 @@
 							</InfoBox>
 
 							 <div class="block-wrapper">
-								 <ButtonBase :disabled="isLoading" :loading="isLoading" button-style="theme" type="submit">
+								 <ButtonBase :disabled="isLoading" :loading="isLoading" button-style="theme" type="submit" class="submit-button">
 									Create Client
 								</ButtonBase>
 							 </div>
@@ -269,4 +269,12 @@
     @import '@assets/vuefilemanager/_variables';
 	@import '@assets/vuefilemanager/_mixins';
 	@import '@assets/vuefilemanager/_forms';
+
+	@media only screen and (max-width: 960px) {
+
+		.submit-button {
+			width: 100%;
+			margin-top: 30px;
+		}
+	}
 </style>

resources/js/Oasis/Invoices/Invoices/EditInvoice.vue

@@ -215,12 +215,12 @@
 							</div>
 						</div>
 
-						<ButtonBase :disabled="isLoading" @click.native="deleteInvoice" button-style="danger" class="next-submit">
+						<ButtonBase :disabled="isLoading" @click.native="deleteInvoice" button-style="secondary" class="next-submit">
 							Delete Invoice
 						</ButtonBase>
 
-						<ButtonBase :disabled="isLoading" :loading="isLoading" @click.native="updateInvoice" button-style="theme-solid" class="next-submit" style="margin-top: 10px">
-							{{ $t('in_editor.submit') }}
+						<ButtonBase :disabled="isLoading" :loading="isLoading" @click.native="updateInvoice" button-style="theme-solid" class="next-submit" style="margin-top: 15px">
+							Save Changes
 						</ButtonBase>
 						<p class="error-message" v-if="isError">
 							{{ errorMessage }}

resources/js/Oasis/Invoices/components/ClientMobileMenu.vue

@@ -28,6 +28,7 @@ import OptionGroup from '@/components/FilesView/OptionGroup'
 import MenuMobile from '@/components/Mobile/MenuMobile'
 import Option from '@/components/FilesView/Option'
 import {mapGetters} from 'vuex'
+import {events} from '@/bus'
 
 export default {
     name: 'FileMenuMobile',
@@ -53,6 +54,17 @@ export default {
     methods: {
 		goToProfile() {
 			this.$router.push({name: 'ClientDetail', params: {id: this.clipboard[0].id}})
+		},
+		deleteItem() {
+			events.$emit('confirm:open', {
+				title: `Are you sure you want to delete client ${this.clipboard[0].name}?`,
+				message: 'Your client will be permanently deleted.',
+				buttonColor: 'danger-solid',
+				action: {
+					id: this.clipboard[0].id,
+					operation: 'delete-client'
+				}
+			})
 		}
     }
 }

resources/js/Oasis/Invoices/components/InvoiceBrowser.vue

@@ -12,7 +12,7 @@
 		>
             <MobileToolbar />
 
-            <SearchBar v-model="query" @reset-query="query = ''" class="mobile-search" :placeholder="$t('inputs.placeholder_search_files')" />
+            <SearchBar v-model="query" @reset-query="query = ''" class="mobile-search" :placeholder="searchPlaceholder" />
 
 			<!--Mobile Actions-->
             <InvoiceActionsMobile />
@@ -96,12 +96,15 @@
 				'isLoading',
 				'entries',
 			]),
+			searchPlaceholder() {
+				return this.currentFolder && ['regular-invoice', 'advance-invoice'].includes(this.currentFolder.location)
+					? this.$t('inputs.placeholder_search_invoices')
+					: this.$t('inputs.placeholder_search_clients')
+			},
 			isEmpty() {
 				return this.entries.length == 0
 			},
 			draggedItems() {
-				//Set opacity for dragged items
-
 				if (!this.clipboard.includes(this.draggingId)) {
 					return [this.draggingId]
 				}

resources/js/Oasis/Invoices/components/InvoiceContextMenu.vue

@@ -123,9 +123,12 @@ export default {
         closeAndResetContextMenu() {
             // Close context menu
             this.isVisible = false
+			this.showFromPreview = false
 
             // Reset item container
             this.item = undefined
+
+			events.$emit('file-preview:hide')
         },
         showFolderActionsMenu() {
             let container = document.getElementById('folder-actions')

resources/js/Oasis/Invoices/components/InvoiceMobileMenu.vue

@@ -11,7 +11,7 @@
 		<!--Trash location-->
         <MenuMobileGroup>
             <OptionGroup class="menu-option-group">
-                <Option @click.native="" title="Edit Invoice" icon="rename" />
+                <Option @click.native="editInvoice" title="Edit Invoice" icon="rename" />
                 <Option @click.native="" title="Send Invoice" icon="send" />
                 <Option @click.native="goToCompany" title="Go to Company" icon="user" />
                 <Option @click.native="deleteInvoice" :title="$t('context_menu.delete')" icon="trash" />
@@ -56,6 +56,9 @@ export default {
         }
     },
     methods: {
+		editInvoice() {
+			this.$router.push({name: 'EditInvoice', params: {id: this.clipboard[0].id}})
+		},
 		downloadInvoice() {
 			this.$downloadFile(this.clipboard[0].file_url, this.clipboard[0].name + '.' + this.clipboard[0].mimetype)
 		},

resources/js/components/FilesView/FilePreviewToolbar.vue

@@ -12,7 +12,7 @@
 		</div>
 
 		<div class="created-at-wrapper">
-			<p>{{ clipboard[0].filesize }}, {{ clipboard[0].created_at }}</p>
+			<p>{{ clipboard[0].filesize ? clipboard[0].filesize + ', ' : '' }}{{ clipboard[0].created_at }}</p>
 		</div>
 
 		<div class="navigation-icons">

resources/js/components/FilesView/ToolbarButton.vue

@@ -77,15 +77,7 @@
 @import "@assets/vuefilemanager/_mixins";
 
 .preview-sorting {
-    svg {
-        width: 19px;
-        height: 19px;
-
-    }
-
-    rect, line {
-        @include transition(150ms);
-    }
+	transform: scale(1.3);
 }
 
 .button {

resources/js/components/Sidebar/SidebarNavigation.vue

@@ -14,7 +14,7 @@
                 </div>
             </router-link>
 
-            <a @click="goToInvoice" title="Invoices" :class="{'is-active': $isThisRoute($route, invoiceRoutes)}" class="icon-navigation-item shared">
+            <a @click="goToInvoice" title="Invoices" :class="{'is-active': $isThisRoute($route, invoiceRoutes)}" class="icon-navigation-item invoice">
                 <div class="button-icon">
                     <file-text-icon size="19" />
                 </div>
@@ -80,12 +80,14 @@
         data() {
             return {
 				invoiceRoutes: [
-					'InvoicesList',
+					'BillingProfileSetUp',
 					'BillingProfile',
-					'CreateClient',
-					'CreateInvoice',
-					'ClientDetail',
 					'ClientInvoices',
+					'CreateInvoice',
+					'InvoicesList',
+					'CreateClient',
+					'ClientDetail',
+					'EditInvoice',
 				],
                 adminRoutes: [
                     'AppSettings',
@@ -200,6 +202,16 @@
                 }
             }
 
+			&.invoice {
+				.button-icon {
+					background: rgba($yellow, 0.1);
+
+					path, line, polyline, rect, circle {
+						stroke: $yellow;
+					}
+				}
+			}
+
             &.trash {
                 .button-icon {
                     background: rgba($red, 0.1);