INI-1495 : Added Transport Company CTT on Aiku

.github/workflows/deploy-staging.yml

@@ -17,6 +17,7 @@ jobs:
     environment: staging
     env:
       FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+      SENTRY_LOG_LEVEL: debug
     steps:
       - name: Checkout repo
         uses: actions/checkout@v6
@@ -58,8 +59,8 @@ jobs:
 #        uses: getsentry/action-release@v3
 #        env:
 #          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-#          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-#          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECTS }}
+#          SENTRY_ORG: 'inikoo-ltd'
 #        with:
 #          environment: staging
+#          projects: 'aiku'
 #          release: ${{ steps.date.outputs.date }}

app/Actions/CRM/Prospect/StoreProspect.php

@@ -31,6 +31,7 @@
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Rules\Enum;
 use Illuminate\Validation\Validator;
+use Inertia\Inertia;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\WithAttributes;
 
@@ -221,4 +222,20 @@ public function action(Shop $shop, array $modelData, int $hydratorsDelay = 0, bo
         return $this->handle($shop, $this->validatedData);
     }
 
+    public function asController(Shop $shop, ActionRequest $request): Prospect
+    {
+        $this->initialisationFromShop($shop, $request);
+        return $this->handle($shop, $this->validatedData);
+    }
+
+    public function htmlResponse(Prospect $prospect): \Symfony\Component\HttpFoundation\Response
+    {
+        return Inertia::location(route(
+            'grp.org.shops.show.crm.prospects.index',
+            [
+                'organisation' => $prospect->organisation->slug,
+                'shop'         => $prospect->shop->slug,
+            ]
+        ));
+    }
 }

app/Actions/CRM/Prospect/UI/CreateProspect.php

@@ -48,50 +48,50 @@ public function handle(Shop $parent, ActionRequest $request): Response
                 ],
                 'formData'    => [
                     'blueprint' =>
+                    [
                         [
-                            [
-                                'title'  => __('Contact'),
-                                'fields' => [
-                                    'company_name'    => [
-                                        'type'  => 'input',
-                                        'label' => __('Company')
-                                    ],
-                                    'contact_name'    => [
-                                        'type'  => 'input',
-                                        'label' => __('Contact name'),
-                                        'required' => true
-                                    ],
-                                    'email'           => [
-                                        'type'  => 'input',
-                                        'label' => __('Email')
-                                    ],
-                                    'phone'           => [
-                                        'type'  => 'phone',
-                                        'label' => __('phone')
-                                    ],
-                                    'contact_website' => [
-                                        'type'      => 'inputWithAddOn',
-                                        'label'     => __('website'),
-                                        'leftAddOn' => [
-                                            'label' => 'https://'
-                                        ],
+                            'title'  => __('Contact'),
+                            'fields' => [
+                                'company_name'    => [
+                                    'type'  => 'input',
+                                    'label' => __('Company')
+                                ],
+                                'contact_name'    => [
+                                    'type'  => 'input',
+                                    'label' => __('Contact name'),
+                                    'required' => true
+                                ],
+                                'email'           => [
+                                    'type'  => 'input',
+                                    'label' => __('Email')
+                                ],
+                                'phone'           => [
+                                    'type'  => 'phone',
+                                    'label' => __('phone')
+                                ],
+                                'contact_website' => [
+                                    'type'      => 'inputWithAddOn',
+                                    'label'     => __('website'),
+                                    'leftAddOn' => [
+                                        'label' => 'https://'
                                     ],
+                                ],
 
-                                ]
-                            ],
+                            ]
                         ],
+                    ],
                     'route'     =>
-                        match (class_basename($parent)) {
-                            'Shop' => [
-                                'name'       => 'org.models.shop.prospect.store',
-                                'parameters' => [$parent->id]
-                            ],
-                            default => [
-                                [
-                                    'name' => 'org.models.prospect.store',
-                                ]
+                    match (class_basename($parent)) {
+                        'Shop' => [
+                            'name'       => 'grp.models.shop.prospect.store',
+                            'parameters' => [$parent->id]
+                        ],
+                        default => [
+                            [
+                                'name' => 'org.models.prospect.store',
                             ]
-                        }
+                        ]
+                    }
                 ]
 
             ]
@@ -100,7 +100,7 @@ public function handle(Shop $parent, ActionRequest $request): Response
 
     public function authorize(ActionRequest $request): bool
     {
-        return $request->user()->authTo('crm.edit');
+        return $request->user()->authTo("crm.{$this->shop->id}.edit");
     }
 
 

app/Actions/CRM/Prospect/UI/IndexProspects.php

@@ -448,33 +448,21 @@ public function htmlResponse(
                     'icon'          => ['fal', 'fa-user-plus'],
                     'title'         => __('Prospects'),
                     'actions'       => [
-                        $this->canEdit ? [
-                            'type'    => 'buttonGroup',
-                            'buttons' =>
-                                match (class_basename($this->parent)) {
-                                    'Shop' => [
-                                        [
-                                            'style' => 'primary',
-                                            'icon'  => ['fal', 'fa-upload'],
-                                            'label' => 'Upload',
-                                            'route' => [
-                                                'name'       => 'grp.org.models.shop.prospects.upload',
-                                                'parameters' => $this->parent->id
-                                            ],
-                                        ],
-                                        [
-                                            'type'  => 'button',
-                                            'style' => 'create',
-                                            'label' => __('Prospect'),
-                                            'route' => [
-                                                'name'       => 'grp.org.shops.show.prospects.create',
-                                                'parameters' => $request->route()->originalParameters()
-                                            ]
-                                        ]
-                                    ],
-                                    default => []
-                                }
-                        ] : false
+                        $this->canEdit ?
+                            match (class_basename($this->parent)) {
+                                'Shop' => [
+                                    'type'  => 'button',
+                                    'style' => 'create',
+                                    'label' => __('Create Prospect'),
+                                    'route' => [
+                                        'name'       => 'grp.org.shops.show.crm.prospects.create',
+                                        'parameters' => $request->route()->originalParameters()
+                                    ]
+
+                                ],
+                                default => []
+                            }
+                            : false
                     ],
                     'subNavigation' => $subNavigation,
                 ]),

app/Actions/Catalogue/Product/Json/GetIrisAnnouncements.php

@@ -12,7 +12,6 @@
 use App\Actions\IrisAction;
 use App\Enums\Announcement\AnnouncementStatusEnum;
 use App\Http\Resources\Web\AnnouncementIrisResource;
-use App\Http\Resources\Web\AnnouncementResource;
 use App\Models\Web\Website;
 use Lorisleiva\Actions\ActionRequest;
 

app/Actions/Catalogue/ProductCategory/SyncProductCategoryRelatedProducts.php

@@ -18,12 +18,19 @@ class SyncProductCategoryRelatedProducts extends OrgAction
 {
     public function handle(ProductCategory $productCategory, array $modelData): ProductCategory
     {
-        $productIds = collect(Arr::get($modelData, 'product_ids', []))
-            ->map(fn ($productId) => (int)$productId)
-            ->unique()
-            ->values();
+        $productIds = array_unique(Arr::get($modelData, 'product_ids', []));
 
-        $productCategory->relatedProducts()->sync($productIds->all());
+        $relatedProducts = [];
+        $position        = 0;
+        foreach ($productIds as $productId) {
+            $position++;
+            $relatedProducts[$productId] = [
+                'position' => $position
+            ];
+        }
+
+
+        $productCategory->relatedProducts()->sync($relatedProducts);
 
         return $productCategory;
     }

app/Actions/Dispatching/BatchCode/DeleteBatchCode.php

@@ -26,7 +26,7 @@ public function handle(BatchCode $batchCode): BatchCode
         $batchCode->delete();
 
         if ($orgStockId) {
-            OrgStockHydrateCurrentBatchCodes::dispatch(OrgStock::find($orgStockId))->delay($this->hydratorsDelay);
+            OrgStockHydrateCurrentBatchCodes::run(OrgStock::find($orgStockId));
         }
 
         return $batchCode;

app/Actions/Dispatching/BatchCode/StoreBatchCode.php

@@ -26,7 +26,7 @@ public function handle(Warehouse $warehouse, array $modelData): BatchCode
 
         $batchCode = BatchCode::create($modelData);
 
-        OrgStockHydrateCurrentBatchCodes::dispatch(OrgStock::find($batchCode->org_stock_id))->delay($this->hydratorsDelay);
+        OrgStockHydrateCurrentBatchCodes::run(OrgStock::find($batchCode->org_stock_id));
 
         return $batchCode;
     }

app/Actions/Dispatching/BatchCode/UI/CreateBatchCode.php

@@ -82,9 +82,11 @@ public function handle(ActionRequest $request, ?OrgStock $orgStock): Response
                 'breadcrumbs' => $orgStock
                     ? $this->getOrgStockBreadcrumbs($orgStock, $request)
                     : $this->getBreadcrumbs($request->route()->originalParameters()),
-                'title'       => __('New Batch Code'),
+                'title'       => __('Batch Code') . ': ' . __('create new'),
                 'pageHead'    => [
-                    'title'   => __('New Batch Code'),
+                    'title'   => __('Create new'),
+                    'icon'  => 'fal fa-barcode',
+                    'model' => __('Batch code'),
                     'actions' => [
                         [
                             'type'  => 'button',

app/Actions/Dispatching/BatchCode/UI/EditBatchCode.php

@@ -39,9 +39,14 @@ public function handle(BatchCode $batchCode, ActionRequest $request): Response
             'EditModel',
             [
                 'breadcrumbs' => $this->getBreadcrumbs($batchCode, $request->route()->originalParameters()),
-                'title'       => __('Edit Batch Code').' '.$batchCode->code,
+                'title'       => __('Batch Code') . ': ' . $batchCode->code . ' (' . __('edit') . ')',
                 'pageHead'    => [
-                    'title'   => __('Edit Batch Code'),
+                    'icon'      => 'fal fa-barcode',
+                    'title'   => __('Edit'),
+                    'model'   => __('Batch code'),
+                    'container' => [
+                        'label' => $batchCode->code,
+                    ],
                     'actions' => [
                         [
                             'type'  => 'button',
@@ -66,6 +71,14 @@ public function handle(BatchCode $batchCode, ActionRequest $request): Response
                                     'label'       => __('SKU'),
                                     'placeholder' => __('Select SKU'),
                                     'mode'        => 'single',
+                                    'options'     => [
+                                        [
+                                            'id'   => $batchCode->orgStock?->id,
+                                            'slug' => $batchCode->orgStock?->slug,
+                                            'code' => $batchCode->orgStock?->code,
+                                            'name' => $batchCode->orgStock?->name,
+                                        ]
+                                    ],
                                     'searchable'  => true,
                                     'labelProp'   => 'name',
                                     'valueProp'   => 'id',
@@ -85,7 +98,7 @@ public function handle(BatchCode $batchCode, ActionRequest $request): Response
                                 'expiry_date' => [
                                     'type'  => 'date',
                                     'label' => __('Expiry Date'),
-                                    'value' => $batchCode->expiry_date?->format('Y-m-d'),
+                                    'value' => $batchCode->expiry_date,
                                 ],
                             ],
                         ],

app/Actions/Dispatching/BatchCode/UpdateBatchCode.php

@@ -29,10 +29,10 @@ public function handle(BatchCode $batchCode, array $modelData): BatchCode
 
         if ($batchCode->wasChanged('org_stock_id')) {
             if ($previousOrgStockId) {
-                OrgStockHydrateCurrentBatchCodes::dispatch(OrgStock::find($previousOrgStockId))->delay($this->hydratorsDelay);
+                OrgStockHydrateCurrentBatchCodes::run(OrgStock::find($previousOrgStockId));
             }
             if ($batchCode->org_stock_id) {
-                OrgStockHydrateCurrentBatchCodes::dispatch(OrgStock::find($batchCode->org_stock_id))->delay($this->hydratorsDelay);
+                OrgStockHydrateCurrentBatchCodes::run(OrgStock::find($batchCode->org_stock_id));
             }
         }
 

app/Actions/Dispatching/Picking/DeletePickingInAurora.php

@@ -32,7 +32,7 @@ public function getJobUniqueId(int $pickingID, Organisation $organisation): stri
      */
     public function handle(int $pickingID, Organisation $organisation, string $name, OrgStock $orgStock): void
     {
-        $apiUrl = $this->getApiUrl($organisation);
+        $apiUrl         = $this->getApiUrl($organisation);
         $auroraApiToken = $this->getApiToken($organisation);
         if (!$auroraApiToken || !app()->environment('production')) {
             return;
@@ -45,7 +45,8 @@ public function handle(int $pickingID, Organisation $organisation, string $name,
                 'picker_name' => $name,
                 'action'      => 'aiku_delete_picking',
                 'part_sku'    => $this->getAuroraObjectKey($orgStock),
-                'picking_key' => $pickingID
+                'picking_key' => $pickingID,
+                'date'        => now()->utc()->toIso8601String(),
 
             ]
         )->get($apiUrl);