Cleanup

Author: tobias-kuendig

components/product/servicemodal.htm

@@ -11,7 +11,7 @@ <h3>{{ 'offline.mall::frontend.services.modal_title'|trans }}</h3>
             <h4 class="mall-product-service__name">{{ service.name }}</h4>
             {% if service.description %}
             <div class="mall-product-service__description">
-                {{ html_clean(service.description|raw) }}
+                {{ service.description|content }}
             </div>
             {% endif %}
             {% if service.pivot.required %}
@@ -39,11 +39,11 @@ <h4 class="mall-product-service__name">{{ service.name }}</h4>
                             {{ option.name }}
                         </span>
                         <span class="mall-product-service-option__price">
-                            {{ html_clean(option.price().string|raw) }}
+                            {{ option.price().string|content }}
                         </span>
                         {% if option.description %}
                             <span class="mall-product-service-option__description">
-                                {{ html_clean(option.description|raw) }}
+                                {{ option.description|content }}
                             </span>
                         {% endif %}
                     </label>

controllers/Brands.php

@@ -9,6 +9,8 @@
 
 class Brands extends Controller
 {
+    public $turboVisitControl = 'disabled';
+
     /**
      * Implement behaviors for this controller.
      * @var array

controllers/Categories.php

@@ -12,6 +12,8 @@
 
 class Categories extends Controller
 {
+    public $turboVisitControl = 'disabled';
+
     /**
      * Implement behaviors for this controller.
      * @var array

controllers/Products.php

@@ -30,7 +30,9 @@
 
 class Products extends Controller
 {
-    use ProductPriceTable;
+   use ProductPriceTable;
+
+    public $turboVisitControl = 'reload';
 
     /**
      * Implement behaviors for this controller.
@@ -111,12 +113,12 @@ public function __construct()
     public function update($id)
     {
         parent::update($id);
-        
+
         // Something went wrong if no formModel is available. Proceed with default behavior.
         if (!isset($this->vars['formModel'])) {
             return;
         }
-        
+
         // If the product has no category something is wrong and needs fixing!
         if (!$this->vars['formModel']->categories) {
             Flash::error(trans('offline.mall::lang.common.action_required'));
@@ -131,7 +133,7 @@ public function update($id)
             if (!$latestFile || !$record instanceof ProductFile) {
                 return '';
             }
-            
+
             if (empty(trim($latestFile->version))) {
                 return '';
             }
@@ -185,7 +187,7 @@ public function change_category_onSave()
     }
 
     /**
-     * Save the initial price into the prices table and create an initial image set if images have 
+     * Save the initial price into the prices table and create an initial image set if images have
      * been uploaded.
      * @param Product $model
      * @return void
@@ -404,14 +406,14 @@ public function onRelationManageCreate()
         if ($this->relationName === 'files') {
             $parent['#Form-field-Product-missing_file_hint-group'] = '';
         }
-        
+
         if ($this->relationName === 'variants') {
             $this->updateProductPrices($this->vars['formModel'], $this->relationModel);
             $this->createImageSetFromTempImages($this->relationModel);
             $this->handlePropertyValueUpdates($this->relationModel);
 
             (new ProductObserver(app(Index::class)))->updated($this->vars['formModel']);
-        }        
+        }
 
         return $this->asExtension(RelationController::class)->relationRefresh();
     }
@@ -533,12 +535,12 @@ protected function createImageSetFromTempImages(Variant $variant)
                 $set->name       = $variant->name;
                 $set->product_id = $variant->product_id;
                 $set->save();
-    
+
                 $variant->image_set_id = $set->id;
                 $variant->save();
-    
+
                 $variant->commitDeferred(post('_session_key'));
-    
+
                 return DB::table('system_files')
                     ->where('attachment_type', Variant::MORPH_KEY)
                     ->where('attachment_id', $variant->id)
@@ -579,7 +581,7 @@ protected function updatePrices($model, $key = 'prices')
             }
         });
     }
-    
+
     /**
      * Update product prices.
      * @param mixed $product

controllers/Services.php

@@ -15,6 +15,8 @@
 
 class Services extends Controller
 {
+    public $turboVisitControl = 'disabled';
+
     /**
      * Implement behaviors for this controller.
      * @var array

controllers/services/config_relation.yaml

@@ -7,6 +7,11 @@ options:
     manage:
         form: $/offline/mall/models/serviceoption/fields.yaml
         recordsPerPage: 10
+    structure:
+        showTree: false
+        showReorder: true
+        showSorting: true
+        dragRow: true
 
 products:
     label: 'offline.mall::lang.common.products'

models/PropertyValue.php

@@ -163,6 +163,10 @@ private function jsonDecodeValue($value = null)
             return null;
         }
 
+        if (is_array($value)) {
+            return $value;
+        }
+
         return json_decode($value, true);
     }
 

models/serviceoption/columns.yaml

@@ -1,10 +1,4 @@
 columns:
-    sort_order_handle:
-        label: " "
-        type: partial
-        path: $/offline/mall/models/serviceoption/_reorder_handle.htm
-        sortable: false
-        width: 20px
     name:
         label: 'offline.mall::lang.common.name'
         type: text