Update

- Added : return exact string for unmatched translation
- Fixed : create symbolic link on windows for language
- Fixed : flat array with keys
- Added : new hook when crud form is loaded
- Added : new filter when crud footer form is rendered
- Added : new filter when settings footer is rendered

Author: Blair2004

app/Services/HelperFunctions.php

@@ -199,6 +199,10 @@ function ns(): CoreService {
  * @param string $namespace
  * @return string $result
  */
-function __m( $key, $namespace ) {
-    return app( 'translator' )->get( $namespace . '.' . $key );
+function __m( $key, $namespace = 'default' ) {
+    if ( app( 'translator' )->has( $namespace . '.' . $key  ) ) {
+        return app( 'translator' )->get( $namespace . '.' . $key );
+    }
+    
+    return $key;
 }

app/Services/Helpers/ArrayHelper.php

@@ -137,7 +137,11 @@ static function flatArrayWithKeys( $data )
             if ( ! is_array( $data ) || is_numeric( $index ) ) {
                 return [ $index => $data ];
             } else if ( is_array( $data ) ) {
-                return self::flatArrayWithKeys( $data );
+                if ( array_keys( $data ) !== range(0, count( $data ) - 1) ) {
+                    return self::flatArrayWithKeys( $data );
+                } else {
+                    return [ $index => json_encode( $data ) ];
+                }
             }
 
             return [];

app/Services/ModulesService.php

@@ -760,7 +760,7 @@ public function createSymLink( $moduleNamespace )
             } else {
                 $mode       =   'J';
                 $link       =   public_path( 'modules-lang' . DIRECTORY_SEPARATOR . strtolower( $moduleNamespace ) );
-                $target     =   base_path( 'modules' . DIRECTORY_SEPARATOR . $moduleNamespace . DIRECTORY_SEPARATOR . 'Public' );
+                $target     =   base_path( 'modules' . DIRECTORY_SEPARATOR . $moduleNamespace . DIRECTORY_SEPARATOR . 'Lang' );
                 $link       =   exec("mklink /{$mode} \"{$link}\" \"{$target}\"");
             }
         }

app/Services/OrdersService.php

@@ -960,7 +960,7 @@ private function __saveOrderProducts($order, $products)
         $taxes          =   0;
         $gross          =   0;
 
-        $products->each(function ($product) use (&$subTotal, &$taxes, &$order, &$gross) {
+        $orderProducts  =   $products->map(function ($product) use (&$subTotal, &$taxes, &$order, &$gross) {
 
             /**
              * storing the product
@@ -1040,9 +1040,11 @@ private function __saveOrderProducts($order, $products)
             }
 
             event( new OrderProductAfterSavedEvent( $orderProduct, $order, $product ) );
+
+            return $orderProduct;
         });
 
-        return compact('subTotal', 'taxes', 'order');
+        return compact('subTotal', 'taxes', 'order', 'orderProducts' );
     }
 
     private function __buildOrderProducts( $products )
@@ -1691,8 +1693,12 @@ public function addProducts(Order $order, $products)
          * let's save the products
          * to the order now as the stock
          * seems to be okay
+         * @param array $orderProducts
+         * @param Order $order
+         * @param float $taxes
+         * @param float $subTotal
          */
-        $this->__saveOrderProducts($order, $products);
+        extract( $this->__saveOrderProducts( $order, $products ) );
 
         /**
          * Now we should refresh the order
@@ -1702,6 +1708,7 @@ public function addProducts(Order $order, $products)
 
         return [
             'status'    =>  'success',
+            'data'      =>  compact( 'orderProducts', 'order' ),
             'message'   =>  sprintf(
                 __('The product has been added to the order "%s"'),
                 $order->code

resources/ts/components/ns-crud-form.ts

@@ -1,4 +1,4 @@
-import { nsHttpClient, nsSnackBar } from '../bootstrap';
+import { nsHooks, nsHttpClient, nsSnackBar } from '../bootstrap';
 import Vue from 'vue';
 import FormValidation from '../libraries/form-validation';
 
@@ -72,7 +72,6 @@ const nsCrudForm    =   Vue.component( 'ns-crud-form', {
                     }).subscribe();
 
                     this.formValidation.triggerError( this.form, error );
-
                     this.formValidation.enableForm( this.form );
                 })
         },
@@ -84,6 +83,7 @@ const nsCrudForm    =   Vue.component( 'ns-crud-form', {
             const request   =   nsHttpClient.get( `${this.src}` );
             request.subscribe( (f:any) => {
                 this.form    =   this.parseForm( f.form );
+                nsHooks.doAction( 'ns-crud-form-loaded', this );
                 this.$emit( 'updated', this.form );
             }, ( error ) => {
                 nsSnackBar.error( error.message, 'OKAY', { duration: 0 }).subscribe();

resources/views/pages/dashboard/crud/form.blade.php

@@ -1,3 +1,7 @@
+<?php
+use App\Classes\Hook;
+use App\Classes\Output;
+?>
 @extends( 'layout.dashboard' )
 
 @section( 'layout.dashboard.body' )
@@ -20,4 +24,9 @@
         </ns-crud-form>
     </div>
 </div>
+@endsection
+
+@section( 'layout.dashboard.footer' )
+    @parent
+    {!! ( string ) Hook::filter( 'ns-crud-form-footer', new Output ) !!}
 @endsection

resources/views/pages/dashboard/settings/form.blade.php

@@ -1,3 +1,6 @@
+<?php
+use App\Classes\Output;
+?>
 @extends( 'layout.dashboard' )
 
 @section( 'layout.dashboard.body' )
@@ -20,4 +23,9 @@
         </div>
     </div>
 </div>
+@endsection
+
+@section( 'layout.dashboard.footer' )
+    @parent
+{!! ( string ) Hook::filter( 'ns-settings-footer', new Output, $identifier ) !!}
 @endsection