Merge pull request #259 from Blair2004/v4.4.x

v4.4.2

Author: Blair2004

.gitignore

@@ -21,7 +21,11 @@ public/export/*
 !public/export/index.html
 !public/modules/index.html
 public/js/*.js
+!public/js/*.min.js
+!public/js/vendor.js
+!public/js/manifest.js
 public/css/*.css
+!public/css/app.css
 public/js/*.map
 public/js/*.txt
 public/css/*.map

app/Classes/Schema.php

@@ -10,6 +10,11 @@ public static function table( $table, $callback )
         return parent::table( Hook::filter( 'ns-table-name', $table ), $callback );
     }
 
+    public static function rename( $previous, $new )
+    {
+        return parent::rename( Hook::filter( 'ns-table-name', $previous ), Hook::filter( 'ns-table-name', $new ) );
+    }
+
     public static function create( $table, $callback )
     {
         return parent::create( Hook::filter( 'ns-table-name', $table ), $callback );

app/Services/CoreService.php

@@ -204,4 +204,14 @@ public function purgeMissingMigrations()
             Migration::where( 'migration', $diff )->delete();
         }
     }
+
+    /**
+     * Returns a boolean if the environment is 
+     * on production mode
+     * @return boolean
+     */
+    public function isProduction() 
+    {
+        return in_array( env( 'NS_ENV', 'prod' ), [ 'prod', 'production' ]);
+    }
 }

app/Services/CustomerService.php

@@ -524,9 +524,11 @@ public function updateCustomerOwedAmount( Customer $customer )
          * Change here will be negative, so we
          * want to be an absolute value.
          */
-        $change     =   abs( Order::whereIn( 'payment_status', [
+        $orders     =   Order::whereIn( 'payment_status', [
             Order::PAYMENT_PARTIALLY
-        ])->sum( 'change' ) );
+        ]);
+        
+        $change     =   abs( $orders->sum( 'change' ) );
 
         $customer->owed_amount  =   ns()->currency->getRaw( $unpaid + $change );
         $customer->save();

app/Services/OrdersService.php

@@ -289,7 +289,7 @@ public function __checkProvidedInstalments( $fields )
                 }
             }
 
-            if ( $total < ( float ) $fields[ 'total' ] ) {
+            if ( $total < ns()->currency->getRaw( ( float ) $fields[ 'total' ] ) ) {
                 throw new NotAllowedException( __( 'Unable to save an order with instalments amounts which additionnated is less than the order total.' ) );
             }
 
@@ -944,7 +944,7 @@ private function __computeOrderTotal($data)
         /**
          * compute change
          */
-        $order->change          =   $this->currencyService->getRaw( $order->tendered - $order->total );
+        $order->change          =   Currency::raw( $order->tendered - $order->total );
 
         /**
          * compute gross total
@@ -1669,7 +1669,7 @@ public function computeOrderProduct( OrderProduct $orderProduct )
     public function computeDiscountValues( $rate, $value )
     {
         if ( $rate > 0 ) {
-            return ( $value * $rate ) / 100;
+            return Currency::raw( ( $value * $rate ) / 100 );
         }
 
         return 0;
@@ -1847,7 +1847,7 @@ public function refreshOrder(Order $order)
         $order->discount        =   $this->computeOrderDiscount( $order );
         $order->total           =   ( $productTotal + $orderShipping ) - ( $order->discount + $order->total_coupons );
         $order->tax_value       =   $productsTotalTaxes;
-        $order->change          =   $order->tendered - $order->total;
+        $order->change          =   Currency::raw( $order->tendered - $order->total );
 
         $refunds                =   $order->refund;
         $totalRefunds           =   $refunds->map( fn( $refund ) => $refund->total )->sum();

app/Services/Setup.php

@@ -201,6 +201,7 @@ public function runMigration( $fields )
         DotenvEditor::setKey( 'NS_SOCKET_DOMAIN', $domain[ 'basename' ] );
         DotenvEditor::setKey( 'SANCTUM_STATEFUL_DOMAINS', $domain[ 'basename' ] );
         DotenvEditor::setKey( 'NS_SOCKET_ENABLED', 'false' );
+        DotenvEditor::setKey( 'NS_ENV', 'production' );
         DotenvEditor::save();
 
 

config/broadcasting.php

@@ -37,7 +37,7 @@
             'app_id' => env('PUSHER_APP_ID'),
             'options' => [
                 'cluster' => env('PUSHER_APP_CLUSTER'),
-                'useTLS' => false, // env( 'NS_SOCKET_SECURED', false ) ? true : false,
+                'useTLS' => env( 'NS_SOCKET_SECURED', false ) ? true : false,
                 'host'  => env( 'NS_SOCKET_DOMAIN', env( 'SESSION_DOMAIN' ) ),
                 'port'  =>  env( 'NS_SOCKET_PORT', 6001 ),
                 'scheme' => env( 'NS_SOCKET_SCHEME', 'http' ),

config/nexopos.php

@@ -1,6 +1,6 @@
 <?php
 return [
-    'version'       =>  '4.4.1',
+    'version'       =>  '4.4.2',
     'languages'     =>  [
         'en'        =>  'English',
         'fr'        =>  'Français',

config/websockets.php

@@ -8,7 +8,7 @@
      * Set a custom dashboard configuration
      */
     'dashboard' => [
-        'port' => env('LARAVEL_WEBSOCKETS_PORT', 6001),
+        'port' => env('NS_SOCKET_PORT', 6001),
     ],
 
     /*
@@ -29,6 +29,7 @@
             'secret' => env('PUSHER_APP_SECRET'),
             'path' => env('PUSHER_APP_PATH'),
             'capacity' => null,
+            'host'  =>  env( 'NS_SOCKET_DOMAIN', env( 'SESSION_DOMAIN' ) ),
             'enable_client_messages' => false,
             'enable_statistics' => true,
         ],
@@ -118,18 +119,18 @@
          * certificate chain of issuers. The private key also may be contained
          * in a separate file specified by local_pk.
          */
-        'local_cert' => env('LARAVEL_WEBSOCKETS_SSL_LOCAL_CERT', null),
+        'local_cert' => env('NS_SSL_LOCAL_CERT', null),
 
         /*
          * Path to local private key file on filesystem in case of separate files for
          * certificate (local_cert) and private key.
          */
-        'local_pk' => env('LARAVEL_WEBSOCKETS_SSL_LOCAL_PK', null),
+        'local_pk' => env('NS_SSL_LOCAL_PK', null),
 
         /*
          * Passphrase for your local_cert file.
          */
-        'passphrase' => env('LARAVEL_WEBSOCKETS_SSL_PASSPHRASE', null),
+        'passphrase' => env('NS_SSL_PASSPHRASE', null),
 
         'verify_peer' => false,
     ],

database/migrations/schema-updates/2020_12_08_221102_dec8_add_columns_to_expenses_history.php

@@ -14,11 +14,13 @@ class Dec8AddColumnsToExpensesHistory extends Migration
      */
     public function up()
     {
-        Schema::table('nexopos_expenses_history', function (Blueprint $table) {
-            if ( ! Schema::hasColumn( 'nexopos_expenses_history', 'status' ) ) {
-                $table->string( 'status' )->default( CashFlow::STATUS_ACTIVE );
-            }
-        });
+        if ( Schema::hasTable( 'nexopos_expenses_history' ) ) {
+            Schema::table('nexopos_expenses_history', function (Blueprint $table) {
+                if ( ! Schema::hasColumn( 'nexopos_expenses_history', 'status' ) ) {
+                    $table->string( 'status' )->default( CashFlow::STATUS_ACTIVE );
+                }
+            });
+        }
     }
 
     /**