From 3107ed8f56a8c6eb6a2f3ca8e8f01ae775cff545 Mon Sep 17 00:00:00 2001
From: Serhii Korneliuk <seiger@meta.ua>
Date: Thu, 21 Nov 2024 21:29:25 +0200
Subject: [PATCH] [FIX] Attributes.

---
 README.md                                     | 2 ++
 docs/pages/index.md                           | 2 ++
 views/attrvaluesTab.blade.php                 | 2 +-
 views/partials/attributeMultiselect.blade.php | 2 +-
 views/productTab.blade.php                    | 4 ++--
 views/productsTab.blade.php                   | 7 ++++---
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 7fc1071..cfa7550 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,9 @@ of Evolution CMS for seamless and efficient **online commerce**.
 - [ ] Automated Email Marketing.
 - [x] Plugin events.
   - [x] sCommerceManagerAddTabEvent.
+  - [x] sCommerceFormFieldRender.
   - [x] sCommerceAfterProductSave.
+  - [x] sCommerceAfterProductContentSave.
   - [x] sCommerceAfterProductDuplicate.
 - [x] Multi-currency Support (ISO 4217).
 - [ ] Integration with Payment Systems.
diff --git a/docs/pages/index.md b/docs/pages/index.md
index b611862..98be458 100644
--- a/docs/pages/index.md
+++ b/docs/pages/index.md
@@ -64,7 +64,9 @@ of Evolution CMS for seamless and efficient **online commerce**.
 - [ ] Automated Email Marketing.
 - [x] Plugin events.
   - [x] sCommerceManagerAddTabEvent.
+  - [x] sCommerceFormFieldRender.
   - [x] sCommerceAfterProductSave.
+  - [x] sCommerceAfterProductContentSave.
   - [x] sCommerceAfterProductDuplicate.
 - [x] Multi-currency Support (ISO 4217).
 - [ ] Integration with Payment Systems.
diff --git a/views/attrvaluesTab.blade.php b/views/attrvaluesTab.blade.php
index 8d528b5..b9ab5fd 100644
--- a/views/attrvaluesTab.blade.php
+++ b/views/attrvaluesTab.blade.php
@@ -49,7 +49,7 @@
 @push('scripts.bot')
     <div id="actions">
         <div class="btn-group">
-            <a id="Button5" class="btn btn-secondary" href="{!!$moduleUrl!!}">
+            <a id="Button5" class="btn btn-secondary" href="{!!$moduleUrl!!}&get=attributes">
                 <i class="fa fa-times-circle"></i><span>@lang('sCommerce::global.to_list_attributes')</span>
             </a>
             <a id="Button2" class="btn btn-primary" href="javascript:void(0);" onclick="addItem();">
diff --git a/views/partials/attributeMultiselect.blade.php b/views/partials/attributeMultiselect.blade.php
index 8954b71..aab9368 100644
--- a/views/partials/attributeMultiselect.blade.php
+++ b/views/partials/attributeMultiselect.blade.php
@@ -8,7 +8,7 @@
             <input type="hidden" name="{{$prefix}}{{$attribute->id}}" value="">
             <div class="input-group-prepend"><span class="input-group-text"><small>@lang('sCommerce::global.type_attr_multiselect')</small></span></div>
             <select id="{{$prefix}}{{$attribute->id}}" class="form-control select2" name="{{$prefix}}{{$attribute->id}}[]" multiple onchange="documentDirty=true;">
-                @foreach($options as $option)
+                @foreach(($options ?? []) as $option)
                     <option value="{{$option}}" @if(in_array($option, $value)) selected @endif>{{$option}}</option>
                 @endforeach
             </select>
diff --git a/views/productTab.blade.php b/views/productTab.blade.php
index 8751ed3..2feec54 100644
--- a/views/productTab.blade.php
+++ b/views/productTab.blade.php
@@ -38,7 +38,7 @@
                     </div>
                 </div>
             </div>
-            @if(sCommerce::config('product.show_field_availability', 1) == 1)
+            @if(sCommerce::config('product.show_field_availability', 1))
                 <div class="row-col col-lg-3 col-md-6 col-12">
                     <div class="row form-row">
                         <div class="col-auto col-title">
@@ -136,7 +136,7 @@
                     </div>
                 </div>
             @endif
-            @if(sCommerce::config('product.quantity_on', 1) == 2)&emsp;
+            @if(sCommerce::config('product.quantity_on', 1) == 2)
                 <div class="row-col col-lg-3 col-md-6 col-12">
                     <div class="row form-row">
                         <div class="col-auto col-title">
diff --git a/views/productsTab.blade.php b/views/productsTab.blade.php
index dcbc400..36c9540 100644
--- a/views/productsTab.blade.php
+++ b/views/productsTab.blade.php
@@ -1,4 +1,5 @@
 @php
+    use Seiger\sCommerce\Models\sProduct;
     $order = request()->has('order') ? request()->input('order') : 'id';
     if (evo()->getConfig('check_sMultisite', false)) {
         $domains = \Seiger\sMultisite\Models\sMultisite::all();
@@ -78,7 +79,7 @@ class="form-control rounded-left scom-input seiger__search"
                     <button class="seiger-sort-btn" style="padding:0;displai: inline;border: none;background: transparent;">@lang('sCommerce::global.quantity') <i class="fas fa-sort" style="color: #036efe;"></i></button>
                 </th>
             @endif
-            @if (sCommerce::config('products.show_field_availability', 1) == 1)
+            @if (sCommerce::config('products.show_field_availability', 1) && sCommerce::config('product.show_field_availability', 1))
                 <th class="sorting @if($order == 'availability') sorted @endif" data-order="availability">
                     <button class="seiger-sort-btn" style="padding:0;displai: inline;border: none;background: transparent;">@lang('sCommerce::global.availability') <i class="fas fa-sort" style="color: #036efe;"></i></button>
                 </th>
@@ -158,8 +159,8 @@ class="form-control rounded-left scom-input seiger__search"
                 @if (sCommerce::config('products.show_field_quantity', 1) && sCommerce::config('product.quantity_on', 1))
                     <td>{{$item->quantity}}</td>
                 @endif
-                @if (sCommerce::config('products.show_field_availability', 1) == 1)
-                    <td>{{$item->availability}}</td>
+                @if (sCommerce::config('products.show_field_availability', 1) && sCommerce::config('product.show_field_availability', 1))
+                    <td>{{sProduct::listAvailability()[$item->availability]}}</td>
                 @endif
                 @if (sCommerce::config('products.show_field_category', 1) == 1)
                     <td>