Merge pull request #590 from Blair2004/v4.6.x

V4.6.14
Blair2004 · Mar 7, 2022 · 28d5007 · 28d5007
2 parents d86f42f + 11cfae3
commit 28d5007
Show file tree

Hide file tree

Showing 136 changed files with 6 additions and 5 deletions.
diff --git a/.do/deploy.template.yaml b/.do/deploy.template.yaml
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/LICENSE b/LICENSE
diff --git a/SECURITY.md b/SECURITY.md
diff --git a/app/Console/Commands/GenerateCashFlowCommand.php b/app/Console/Commands/GenerateCashFlowCommand.php
diff --git a/app/Crud/CustomerAccountCrud.php b/app/Crud/CustomerAccountCrud.php
diff --git a/app/Crud/ProviderProcurementsCrud.php b/app/Crud/ProviderProcurementsCrud.php
diff --git a/app/Crud/ProviderProductsCrud.php b/app/Crud/ProviderProductsCrud.php
diff --git a/app/Events/BeforeStartApiRouteEvent.php b/app/Events/BeforeStartApiRouteEvent.php
diff --git a/app/Events/BeforeStartWebRouteEvent.php b/app/Events/BeforeStartWebRouteEvent.php
diff --git a/app/Events/CashFlowAfterCreatedEvent.php b/app/Events/CashFlowAfterCreatedEvent.php
diff --git a/app/Events/CashFlowAfterUpdatedEvent.php b/app/Events/CashFlowAfterUpdatedEvent.php
diff --git a/app/Events/CashRegisterHistoryAfterCreatedEvent.php b/app/Events/CashRegisterHistoryAfterCreatedEvent.php
diff --git a/app/Events/CrudAfterDeleteEvent.php b/app/Events/CrudAfterDeleteEvent.php
diff --git a/app/Events/CustomerAfterCreatedEvent.php b/app/Events/CustomerAfterCreatedEvent.php
diff --git a/app/Events/CustomerBeforeDeletedEvent.php b/app/Events/CustomerBeforeDeletedEvent.php
diff --git a/app/Events/InstalledStateBeforeCheckedEvent.php b/app/Events/InstalledStateBeforeCheckedEvent.php
diff --git a/app/Events/LowStockProductsCountedEvent.php b/app/Events/LowStockProductsCountedEvent.php
diff --git a/app/Events/OrderAfterCheckPerformedEvent.php b/app/Events/OrderAfterCheckPerformedEvent.php
diff --git a/app/Events/OrderAfterInstalmentPaidEvent.php b/app/Events/OrderAfterInstalmentPaidEvent.php
diff --git a/app/Events/OrderAfterPaymentStatusChangedEvent.php b/app/Events/OrderAfterPaymentStatusChangedEvent.php
diff --git a/app/Events/ProductBeforeDeleteEvent.php b/app/Events/ProductBeforeDeleteEvent.php
diff --git a/app/Events/ProductCategoryAfterCreatedEvent.php b/app/Events/ProductCategoryAfterCreatedEvent.php
diff --git a/app/Events/ProductCategoryAfterUpdatedEvent.php b/app/Events/ProductCategoryAfterUpdatedEvent.php
diff --git a/app/Events/ProductCategoryBeforeDeletedEvent.php b/app/Events/ProductCategoryBeforeDeletedEvent.php
diff --git a/app/Exceptions/CoreVersionMismatchException.php b/app/Exceptions/CoreVersionMismatchException.php
diff --git a/app/Exceptions/Exception.php b/app/Exceptions/Exception.php
diff --git a/app/Exceptions/MethodNotAllowedHttpException.php b/app/Exceptions/MethodNotAllowedHttpException.php
diff --git a/app/Exceptions/ModuleVersionMismatchException.php b/app/Exceptions/ModuleVersionMismatchException.php
diff --git a/app/Exceptions/QueryException.php b/app/Exceptions/QueryException.php
diff --git a/app/Http/Controllers/BankingController.php b/app/Http/Controllers/BankingController.php
diff --git a/app/Http/Controllers/UpdateController.php b/app/Http/Controllers/UpdateController.php
@@ -44,7 +44,10 @@ public function runMigration( Request $request )
                 $request->input( 'file' ) 
             );
 
-            Artisan::call( 'migrate --path=' . $file, [ '--force' => true ]);
+            Artisan::call( 'migrate', [ 
+                '--path'    => $file,
+                '--force'   => true 
+            ]);
         }
 
         /**

diff --git a/app/Interfaces/Notification.php b/app/Interfaces/Notification.php
diff --git a/app/Jobs/DetectLowStockProductsJob.php b/app/Jobs/DetectLowStockProductsJob.php
diff --git a/app/Jobs/ProcurementRefreshJob.php b/app/Jobs/ProcurementRefreshJob.php
diff --git a/app/Listeners/NotificationListener.php b/app/Listeners/NotificationListener.php
diff --git a/app/Services/TestService.php b/app/Services/TestService.php
diff --git a/composer.json b/composer.json
diff --git a/config/nexopos.php b/config/nexopos.php
@@ -1,6 +1,6 @@
 <?php
 return [
-    'version'       =>  '4.6.13',
+    'version'       =>  '4.6.14',
     'languages'     =>  [
         'en'        =>  'English',
         'fr'        =>  'Français',

diff --git a/...migrations/create-tables/0000_00_00_000000_create_websockets_statistics_entries_table.php b/...migrations/create-tables/0000_00_00_000000_create_websockets_statistics_entries_table.php
diff --git a/database/migrations/misc/2021_07_31_153029_update_dashboard_days_report_jul31.php b/database/migrations/misc/2021_07_31_153029_update_dashboard_days_report_jul31.php
diff --git a/database/migrations/misc/2021_11_17_215824_update_create_options_for_order_type.php b/database/migrations/misc/2021_11_17_215824_update_create_options_for_order_type.php
diff --git a/...se/migrations/schema-updates/2021_07_31_100843_update_nexopos_registers_history_jul31.php b/...se/migrations/schema-updates/2021_07_31_100843_update_nexopos_registers_history_jul31.php
diff --git a/...grations/schema-updates/2021_08_01_085619_update_add_columns_to_expense_history__aug1.php b/...grations/schema-updates/2021_08_01_085619_update_add_columns_to_expense_history__aug1.php
diff --git a/database/migrations/schema-updates/2021_08_01_125501_update_expense_category_aug1.php b/database/migrations/schema-updates/2021_08_01_125501_update_expense_category_aug1.php
diff --git a/database/migrations/schema-updates/2021_08_05_165210_update_add_new_permissions__aug5.php b/database/migrations/schema-updates/2021_08_05_165210_update_add_new_permissions__aug5.php
diff --git a/...ations/schema-updates/2021_08_12_153954_update_add_taxto_order_refunds_products_aug12.php b/...ations/schema-updates/2021_08_12_153954_update_add_taxto_order_refunds_products_aug12.php
diff --git a/...ations/schema-updates/2021_09_01_194454_update_unit_product_quantities_table_sept1_21.php b/...ations/schema-updates/2021_09_01_194454_update_unit_product_quantities_table_sept1_21.php
diff --git a/database/migrations/schema-updates/2021_09_30_091808_update_columns_length_sept30_21.php b/database/migrations/schema-updates/2021_09_30_091808_update_columns_length_sept30_21.php
diff --git a/...e/migrations/schema-updates/2021_11_05_102755_update_products_unit_quantities_nov0521.php b/...e/migrations/schema-updates/2021_11_05_102755_update_products_unit_quantities_nov0521.php
diff --git a/.../schema-updates/2021_11_21_205222_update_customer_table_add_birth_date_column_nov2121.php b/.../schema-updates/2021_11_21_205222_update_customer_table_add_birth_date_column_nov2121.php
diff --git a/database/migrations/schema-updates/2021_11_25_032153_update_procurement_table_nov2521.php b/database/migrations/schema-updates/2021_11_25_032153_update_procurement_table_nov2521.php
diff --git a/database/migrations/schema-updates/2021_12_23_061301_set_cashier_permissions.php b/database/migrations/schema-updates/2021_12_23_061301_set_cashier_permissions.php
diff --git a/database/migrations/schema-updates/2021_12_28_090346_updatee_instalment_table_dec2821.php b/database/migrations/schema-updates/2021_12_28_090346_updatee_instalment_table_dec2821.php
diff --git a/...tions/schema-updates/2021_12_31_144653_remove_ignored_cash_flow_for_pristine_products.php b/...tions/schema-updates/2021_12_31_144653_remove_ignored_cash_flow_for_pristine_products.php
diff --git a/database/migrations/schema-updates/2022_01_02_200145_wipe_cash_flow_transaction_2janv22.php b/database/migrations/schema-updates/2022_01_02_200145_wipe_cash_flow_transaction_2janv22.php
diff --git a/database/migrations/schema-updates/2022_01_11_100733_update_customer_table_jan1122.php b/database/migrations/schema-updates/2022_01_11_100733_update_customer_table_jan1122.php
diff --git a/...e/migrations/schema-updates/2022_01_25_230855_update_nexo_p_o_s_orders_payments220126.php b/...e/migrations/schema-updates/2022_01_25_230855_update_nexo_p_o_s_orders_payments220126.php
diff --git a/database/permissions/pos.php b/database/permissions/pos.php
diff --git a/package.json b/package.json
diff --git a/public/audio/bubble.mp3 b/public/audio/bubble.mp3
diff --git a/public/audio/cash-sound.mp3 b/public/audio/cash-sound.mp3
diff --git a/public/audio/ding.mp3 b/public/audio/ding.mp3
diff --git a/public/audio/pop.mp3 b/public/audio/pop.mp3
diff --git a/public/js/app.min.js b/public/js/app.min.js
diff --git a/public/js/auth.min.js b/public/js/auth.min.js
diff --git a/public/js/bootstrap.min.js b/public/js/bootstrap.min.js
diff --git a/public/js/cashier.min.js b/public/js/cashier.min.js
diff --git a/public/js/dashboard.min.js b/public/js/dashboard.min.js
diff --git a/public/js/lang-loader.min.js b/public/js/lang-loader.min.js
diff --git a/public/js/popups.min.js b/public/js/popups.min.js
diff --git a/public/js/pos-init.min.js b/public/js/pos-init.min.js
diff --git a/public/js/pos.min.js b/public/js/pos.min.js
diff --git a/public/js/setup.min.js b/public/js/setup.min.js
diff --git a/public/js/update.min.js b/public/js/update.min.js
diff --git a/resources/lang/ar.json b/resources/lang/ar.json
diff --git a/resources/lang/pt.json b/resources/lang/pt.json
diff --git a/resources/ts/components/ns-avatar.vue b/resources/ts/components/ns-avatar.vue
diff --git a/resources/ts/components/ns-crud.vue b/resources/ts/components/ns-crud.vue
diff --git a/resources/ts/components/ns-notice.vue b/resources/ts/components/ns-notice.vue
diff --git a/resources/ts/components/ns-paginate.vue b/resources/ts/components/ns-paginate.vue
diff --git a/resources/ts/filters/truncate.ts b/resources/ts/filters/truncate.ts
diff --git a/resources/ts/libraries/print.ts b/resources/ts/libraries/print.ts
diff --git a/resources/ts/pages/dashboard/orders/ns-order-instalments-payment.vue b/resources/ts/pages/dashboard/orders/ns-order-instalments-payment.vue
diff --git a/resources/ts/pages/dashboard/pos/ns-pos-cart.vue b/resources/ts/pages/dashboard/pos/ns-pos-cart.vue
@@ -145,7 +145,7 @@
                         </tr>
                         <tr class="bg-green-200">
                             <td width="200" class="border border-gray-300 p-2">
-                                <a v-if="order" @click="openTaxSummary()" class="hover:text-blue-400 cursor-pointer outline-none border-dashed py-1 border-b border-blue-400 text-sm">Tax : {{ order.tax_value | currency }}</a>
+                                <a v-if="order" @click="openTaxSummary()" class="hover:text-blue-400 cursor-pointer outline-none border-dashed py-1 border-b border-blue-400 text-sm">{{ __( 'Tax' ) }} : {{ order.tax_value | currency }}</a>
                             </td>
                             <td width="200" class="border border-gray-300 p-2">{{ __( 'Total' ) }}</td>
                             <td width="200" class="border border-gray-300 p-2 text-right">{{ order.total | currency }}</td>

diff --git a/resources/ts/popups/ns-orders-filter-popup.vue b/resources/ts/popups/ns-orders-filter-popup.vue
diff --git a/resources/ts/popups/ns-pos-quick-product-popup.vue b/resources/ts/popups/ns-pos-quick-product-popup.vue
diff --git a/resources/views/pages/dashboard/orders/footer.blade.php b/resources/views/pages/dashboard/orders/footer.blade.php
diff --git a/resources/views/pages/dashboard/reports/low-stock-report.blade.php b/resources/views/pages/dashboard/reports/low-stock-report.blade.php
diff --git a/resources/views/pages/errors/core-exception.blade.php b/resources/views/pages/errors/core-exception.blade.php
diff --git a/resources/views/pages/errors/exception.blade.php b/resources/views/pages/errors/exception.blade.php
diff --git a/resources/views/pages/errors/module-exception.blade.php b/resources/views/pages/errors/module-exception.blade.php
diff --git a/routes/api-base.php b/routes/api-base.php
diff --git a/routes/authenticate.php b/routes/authenticate.php
diff --git a/routes/web-base.php b/routes/web-base.php
diff --git a/routes/web/banking.php b/routes/web/banking.php
diff --git a/routes/web/cash-registers.php b/routes/web/cash-registers.php
diff --git a/routes/web/customers.php b/routes/web/customers.php
diff --git a/routes/web/expenses.php b/routes/web/expenses.php
diff --git a/routes/web/medias.php b/routes/web/medias.php
diff --git a/routes/web/modules.php b/routes/web/modules.php
diff --git a/routes/web/orders.php b/routes/web/orders.php
diff --git a/routes/web/procurements.php b/routes/web/procurements.php
diff --git a/routes/web/products.php b/routes/web/products.php
diff --git a/routes/web/providers.php b/routes/web/providers.php
diff --git a/routes/web/reports.php b/routes/web/reports.php
diff --git a/routes/web/settings.php b/routes/web/settings.php
diff --git a/routes/web/taxes.php b/routes/web/taxes.php
diff --git a/routes/web/units.php b/routes/web/units.php
diff --git a/routes/web/users.php b/routes/web/users.php
diff --git a/setup.sh b/setup.sh
diff --git a/tests/Feature/CashRegisterActionsTest.php b/tests/Feature/CashRegisterActionsTest.php
diff --git a/tests/Feature/CombiningProductsTest.php b/tests/Feature/CombiningProductsTest.php
diff --git a/tests/Feature/ComputeTaxesFromSales.php b/tests/Feature/ComputeTaxesFromSales.php
diff --git a/tests/Feature/ConfigureAccoutingTest.php b/tests/Feature/ConfigureAccoutingTest.php
diff --git a/tests/Feature/CreateOrderOnRegister.php b/tests/Feature/CreateOrderOnRegister.php
diff --git a/tests/Feature/PerformStockAdjustmentTest.php b/tests/Feature/PerformStockAdjustmentTest.php
diff --git a/tests/Feature/TestLowStockProducts.php b/tests/Feature/TestLowStockProducts.php
diff --git a/tests/Feature/TestRewardSystem.php b/tests/Feature/TestRewardSystem.php
diff --git a/tests/Feature/TestSetOrderType.php b/tests/Feature/TestSetOrderType.php
diff --git a/tests/Traits/WithAccountingTest.php b/tests/Traits/WithAccountingTest.php
diff --git a/tests/Traits/WithAuthentication.php b/tests/Traits/WithAuthentication.php
diff --git a/tests/Traits/WithCashRegisterTest.php b/tests/Traits/WithCashRegisterTest.php
diff --git a/tests/Traits/WithCategoryTest.php b/tests/Traits/WithCategoryTest.php
diff --git a/tests/Traits/WithCombinedProductTest.php b/tests/Traits/WithCombinedProductTest.php
diff --git a/tests/Traits/WithCouponTest.php b/tests/Traits/WithCouponTest.php
diff --git a/tests/Traits/WithCustomerTest.php b/tests/Traits/WithCustomerTest.php
diff --git a/tests/Traits/WithExpenseTest.php b/tests/Traits/WithExpenseTest.php
diff --git a/tests/Traits/WithOrderTest.php b/tests/Traits/WithOrderTest.php
@@ -1076,8 +1076,6 @@ public function attemptCreateOrderWithInstalment()
                     ]
                 ]
             ]);
-
-        $response->dump();
 
         $response->assertJson([
             'status'    =>  'success'

diff --git a/tests/Traits/WithProcurementTest.php b/tests/Traits/WithProcurementTest.php
diff --git a/tests/Traits/WithProductTest.php b/tests/Traits/WithProductTest.php
diff --git a/tests/Traits/WithProviderTest.php b/tests/Traits/WithProviderTest.php
diff --git a/tests/Traits/WithReportTest.php b/tests/Traits/WithReportTest.php
diff --git a/tests/Traits/WithTaxTest.php b/tests/Traits/WithTaxTest.php
diff --git a/tests/Traits/WithUnitTest.php b/tests/Traits/WithUnitTest.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -1076,8 +1076,6 @@ public function attemptCreateOrderWithInstalment() @@
                         ]
                     ]
                 ]);
-            $response->dump();
             $response->assertJson([
                 'status'    =>  'success'
@@ Expand Down @@