From 62028c6f993e18c72b4b8b5274d9736c662e847f Mon Sep 17 00:00:00 2001 From: A1Gard Date: Mon, 4 Nov 2024 12:48:00 +0330 Subject: [PATCH 1/2] improved ui/ux by stock quantity --- app/Http/Controllers/Admin/AreaController.php | 1 + .../product/ProductAria/ProductAria.blade.php | 38 ++++++++++++------- .../ProductKaren/ProductKaren.blade.php | 38 ++++++++++++------- .../ProductYasamin/ProductYasamin.blade.php | 36 +++++++++++------- .../DefaultProductGrid.blade.php | 18 ++++++--- .../MinooProductGrid.blade.php | 18 ++++++--- .../ShivaProductGrid.blade.php | 18 ++++++--- 7 files changed, 110 insertions(+), 57 deletions(-) diff --git a/app/Http/Controllers/Admin/AreaController.php b/app/Http/Controllers/Admin/AreaController.php index f7ceb3a..b1868a4 100644 --- a/app/Http/Controllers/Admin/AreaController.php +++ b/app/Http/Controllers/Admin/AreaController.php @@ -225,6 +225,7 @@ class AreaController extends Controller public function build(){ + $exitCode = \Artisan::call('client'); $exitCode = \Artisan::call('build'); // Get the command output from cache diff --git a/resources/views/segments/product/ProductAria/ProductAria.blade.php b/resources/views/segments/product/ProductAria/ProductAria.blade.php index d4bf5ac..2ccbc6c 100644 --- a/resources/views/segments/product/ProductAria/ProductAria.blade.php +++ b/resources/views/segments/product/ProductAria/ProductAria.blade.php @@ -71,22 +71,32 @@

 
- @if($product->quantities()->count()>0) - __('Add to card')])' - @if($product->hasDiscount()) - :discount='@json($product->activeDiscounts()->first())' - @endif - > + @if($product->stock_quantity == 'IN_STOCK') + + @if($product->quantities()->count()>0) + __('Add to card')])' + @if($product->hasDiscount()) + :discount='@json($product->activeDiscounts()->first())' + @endif + > + @else + + + {{__("Add to card")}} + + @endif + @else - + - {{__("Add to card")}} + {{__("Not available")}} @endif
 
diff --git a/resources/views/segments/product/ProductKaren/ProductKaren.blade.php b/resources/views/segments/product/ProductKaren/ProductKaren.blade.php index 147bfb8..97df55e 100644 --- a/resources/views/segments/product/ProductKaren/ProductKaren.blade.php +++ b/resources/views/segments/product/ProductKaren/ProductKaren.blade.php @@ -111,22 +111,32 @@
 
- @if($product->quantities()->count()>0) - __('Add to card')])' - @if($product->hasDiscount()) - :discount='@json($product->activeDiscounts()->first())' - @endif - > + @if($product->stock_quantity == 'IN_STOCK') + + @if($product->quantities()->count()>0) + __('Add to card')])' + @if($product->hasDiscount()) + :discount='@json($product->activeDiscounts()->first())' + @endif + > + @else + + + {{__("Add to card")}} + + @endif + @else - + - {{__("Add to card")}} + {{__("Not available")}} @endif diff --git a/resources/views/segments/product/ProductYasamin/ProductYasamin.blade.php b/resources/views/segments/product/ProductYasamin/ProductYasamin.blade.php index 0afa5a6..8cb2a89 100644 --- a/resources/views/segments/product/ProductYasamin/ProductYasamin.blade.php +++ b/resources/views/segments/product/ProductYasamin/ProductYasamin.blade.php @@ -49,25 +49,33 @@ @endif
- @if($product->quantities()->count()>0) - __('Add to card')])' - @if($product->hasDiscount()) - :discount='@json($product->activeDiscounts()->first())' - @endif - > - @else -
+ @if($product->stock_quantity == 'IN_STOCK') + + @if($product->quantities()->count()>0) + __('Add to card')])' + @if($product->hasDiscount()) + :discount='@json($product->activeDiscounts()->first())' + @endif + > + @else {{__("Add to card")}} -
+ @endif + + @else + + + {{__("Not available")}} + @endif

{{__("Description")}} diff --git a/resources/views/segments/product_grid/DefaultProductGrid/DefaultProductGrid.blade.php b/resources/views/segments/product_grid/DefaultProductGrid/DefaultProductGrid.blade.php index 6e2215f..07a03ba 100644 --- a/resources/views/segments/product_grid/DefaultProductGrid/DefaultProductGrid.blade.php +++ b/resources/views/segments/product_grid/DefaultProductGrid/DefaultProductGrid.blade.php @@ -27,11 +27,19 @@
- - - {{__("Add to card")}} - + @if($product->stock_quantity == 'IN_STOCK') + + + {{__("Add to card")}} + + @else + + + {{__("Not available")}} + + @endif
diff --git a/resources/views/segments/product_grid/MinooProductGrid/MinooProductGrid.blade.php b/resources/views/segments/product_grid/MinooProductGrid/MinooProductGrid.blade.php index d6ed41b..dd6aaf3 100644 --- a/resources/views/segments/product_grid/MinooProductGrid/MinooProductGrid.blade.php +++ b/resources/views/segments/product_grid/MinooProductGrid/MinooProductGrid.blade.php @@ -4,11 +4,19 @@ {{$product->name}}
- - - {{__("Add to card")}} - + @if($product->stock_quantity == 'IN_STOCK') + + + {{__("Add to card")}} + + @else + + + {{__("Not available")}} + + @endif
- - - {{__("Add to card")}} - + @if($product->stock_quantity == 'IN_STOCK') + + + {{__("Add to card")}} + + @else + + + {{__("Not available")}} + + @endif
From 58962bf448f679dceeb584aa43ef7cc1f80e53dd Mon Sep 17 00:00:00 2001 From: A1Gard Date: Mon, 4 Nov 2024 13:11:11 +0330 Subject: [PATCH 2/2] fixed bug --- .../views/segments/product/ProductAria/ProductAria.blade.php | 2 +- .../views/segments/product/ProductKaren/ProductKaren.blade.php | 2 +- .../segments/product/ProductYasamin/ProductYasamin.blade.php | 2 +- .../DefaultProductGrid/DefaultProductGrid.blade.php | 2 +- .../product_grid/MinooProductGrid/MinooProductGrid.blade.php | 2 +- .../product_grid/ShivaProductGrid/ShivaProductGrid.blade.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/segments/product/ProductAria/ProductAria.blade.php b/resources/views/segments/product/ProductAria/ProductAria.blade.php index 2ccbc6c..7bc623b 100644 --- a/resources/views/segments/product/ProductAria/ProductAria.blade.php +++ b/resources/views/segments/product/ProductAria/ProductAria.blade.php @@ -71,7 +71,7 @@

 
- @if($product->stock_quantity == 'IN_STOCK') + @if($product->stock_status == 'IN_STOCK') @if($product->quantities()->count()>0)
 
- @if($product->stock_quantity == 'IN_STOCK') + @if($product->stock_status == 'IN_STOCK') @if($product->quantities()->count()>0)
- @if($product->stock_quantity == 'IN_STOCK') + @if($product->stock_status == 'IN_STOCK') @if($product->quantities()->count()>0)