Merge pull request #285 from oc-shopaholic/develop

Release version 1.27.1
oc-shopaholic · May 15, 2020 · 82a3941 · 82a3941
2 parents 5006103 + 599d4f3
commit 82a3941
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 30 deletions.
diff --git a/classes/import/ImportOfferModelFromCSV.php b/classes/import/ImportOfferModelFromCSV.php
@@ -38,6 +38,7 @@ protected function prepareImportData()
         $this->setProductField();
         $this->setQuantityField();
         $this->setMeasureField();
+        $this->setMeasureOfUnitField();
 
         $this->initPreviewImage();
         $this->initImageList();
@@ -100,7 +101,7 @@ protected function setQuantityField()
     /**
      * Set measure filed value
      */
-    protected function setMeasureField()
+    protected function setMeasureOfUnitField()
     {
         $sMeasure = array_get($this->arImportData, 'measure_of_unit');
         array_forget($this->arImportData, 'measure_of_unit');
@@ -122,4 +123,30 @@ protected function setMeasureField()
 
         $this->arImportData['measure_of_unit_id'] = $obMeasure->id;
     }
+
+    /**
+     * Set measure filed value
+     */
+    protected function setMeasureField()
+    {
+        $sMeasure = array_get($this->arImportData, 'measure_id');
+        array_forget($this->arImportData, 'measure_id');
+        if ($sMeasure === null) {
+            return;
+        }
+
+        if (empty($sMeasure)) {
+            $this->arImportData['measure_id'] = null;
+            return;
+        }
+
+        $obMeasure = Measure::getByName($sMeasure)->first();
+        if (empty($obMeasure)) {
+            $obMeasure = Measure::create([
+                'name' => $sMeasure,
+            ]);
+        }
+
+        $this->arImportData['measure_id'] = $obMeasure->id;
+    }
 }
diff --git a/classes/import/ImportOfferModelFromXML.php b/classes/import/ImportOfferModelFromXML.php
@@ -58,6 +58,7 @@ public function getFields() : array
             'height'           => Lang::get('lovata.toolbox::lang.field.height'),
             'length'           => Lang::get('lovata.toolbox::lang.field.length'),
             'width'            => Lang::get('lovata.toolbox::lang.field.width'),
+            'measure_id'       => Lang::get('lovata.shopaholic::lang.field.measure'),
             'quantity_in_unit' => Lang::get('lovata.shopaholic::lang.field.quantity_in_unit'),
             'measure_of_unit'  => Lang::get('lovata.shopaholic::lang.field.measure_of_unit'),
             'preview_text'     => Lang::get('lovata.toolbox::lang.field.preview_text'),

diff --git a/controllers/offers/config_import_export.yaml b/controllers/offers/config_import_export.yaml
@@ -28,6 +28,8 @@ import:
         label: 'lovata.toolbox::lang.field.length'
       width:
         label: 'lovata.toolbox::lang.field.width'
+      measure_id:
+        label: 'lovata.shopaholic::lang.field.measure'
       quantity_in_unit:
         label: 'lovata.shopaholic::lang.field.quantity_in_unit'
       measure_of_unit:
@@ -45,4 +47,4 @@ import:
       deactivate:
         label: 'lovata.toolbox::lang.field.import_deactivate'
         comment: 'lovata.toolbox::lang.field.import_deactivate_description'
-        type: checkbox
+        type: checkbox
diff --git a/models/Offer.php b/models/Offer.php
@@ -11,6 +11,7 @@
 use Kharanenka\Scope\ExternalIDField;
 use Kharanenka\Scope\NameField;
 
+use Lovata\Toolbox\Classes\Helper\PriceHelper;
 use Lovata\Toolbox\Traits\Helpers\TraitCached;
 use Lovata\Toolbox\Traits\Helpers\PriceHelperTrait;
 
@@ -285,20 +286,12 @@ public function afterSave()
     {
         $this->savePriceValue(null, $this->fSavedPrice, $this->fSavedOldPrice);
         $this->savePriceListValue();
-    }
-
-    /**
-     * Set quantity attribute value
-     * @param int $iQuantity
-     */
-    public function setQuantityAttribute($iQuantity)
-    {
-        $iQuantity = (int) $iQuantity;
-        if (empty($iQuantity) || $iQuantity < 0) {
-            $iQuantity = 0;
-        }
 
-        $this->attributes['quantity'] = $iQuantity;
+        //Clear relations with old prices and saved values
+        $this->reloadRelations('main_price');
+        $this->reloadRelations('price_link');
+        $this->fSavedPrice = null;
+        $this->fSavedOldPrice = null;
     }
 
     /**
@@ -391,14 +384,19 @@ public function getActiveCurrency()
      */
     protected function getPriceValueAttribute()
     {
-        $obPriceModel = $this->getPriceObject($this->getActivePriceType());
-        $this->setActivePriceType(null);
+        if ($this->fSavedPrice !== null) {
+            $fPrice = $this->fSavedPrice;
+        } else {
+            $obPriceModel = $this->getPriceObject($this->getActivePriceType());
+            $this->setActivePriceType(null);
 
-        if (empty($obPriceModel)) {
-            return 0;
+            if (empty($obPriceModel)) {
+                return 0;
+            }
+
+            $fPrice = $obPriceModel->price_value;
         }
 
-        $fPrice = $obPriceModel->price_value;
         $fPrice = CurrencyHelper::instance()->convert($fPrice, $this->getActiveCurrency());
 
         return $fPrice;
@@ -410,14 +408,19 @@ protected function getPriceValueAttribute()
      */
     protected function getOldPriceValueAttribute()
     {
-        $obPriceModel = $this->getPriceObject($this->getActivePriceType());
-        $this->setActivePriceType(null);
+        if ($this->fSavedOldPrice !== null) {
+            $fPrice = $this->fSavedOldPrice;
+        } else {
+            $obPriceModel = $this->getPriceObject($this->getActivePriceType());
+            $this->setActivePriceType(null);
 
-        if (empty($obPriceModel)) {
-            return 0;
+            if (empty($obPriceModel)) {
+                return 0;
+            }
+
+            $fPrice = $obPriceModel->old_price_value;
         }
 
-        $fPrice = $obPriceModel->old_price_value;
         $fPrice = CurrencyHelper::instance()->convert($fPrice, $this->getActiveCurrency());
         $this->setActiveCurrency(null);
 
@@ -468,7 +471,7 @@ protected function getPriceListAttribute()
      */
     protected function setPriceAttribute($sValue)
     {
-        $this->fSavedPrice = $sValue;
+        $this->fSavedPrice = PriceHelper::toFloat($sValue);
     }
 
     /**
@@ -478,7 +481,7 @@ protected function setPriceAttribute($sValue)
      */
     protected function setOldPriceAttribute($sValue)
     {
-        $this->fSavedOldPrice = $sValue;
+        $this->fSavedOldPrice = PriceHelper::toFloat($sValue);
     }
 
     /**
@@ -493,8 +496,8 @@ protected function setPriceListAttribute($arPriceList)
         }
 
         if (isset($arPriceList[0])) {
-            $this->fSavedPrice = array_get($arPriceList[0], 'price');
-            $this->fSavedOldPrice = array_get($arPriceList[0], 'old_price');
+            $this->fSavedPrice = PriceHelper::toFloat(array_get($arPriceList[0], 'price'));
+            $this->fSavedOldPrice = PriceHelper::toFloat(array_get($arPriceList[0], 'old_price'));
             unset($arPriceList[0]);
         }
 
@@ -512,6 +515,34 @@ protected function getTaxPercentAttribute()
         return $obOfferItem->tax_percent;
     }
 
+    /**
+     * Set quantity attribute value
+     * @param int $iQuantity
+     */
+    protected function setQuantityAttribute($iQuantity)
+    {
+        $iQuantity = (int) $iQuantity;
+        if (empty($iQuantity) || $iQuantity < 0) {
+            $iQuantity = 0;
+        }
+
+        $this->attributes['quantity'] = $iQuantity;
+    }
+
+    /**
+     * Set quantity_in_unit attribute value
+     * @param int $iQuantity
+     */
+    protected function setQuantityInUnitAttribute($sQuantity)
+    {
+        $fQuantity = (float) PriceHelper::toFloat($sQuantity);
+        if (empty($fQuantity) || $fQuantity < 0) {
+            $fQuantity = 0;
+        }
+
+        $this->attributes['quantity_in_unit'] = $fQuantity;
+    }
+
     /**
      * Create or update main price object
      * @param int|null $iPriceTypeID

diff --git a/models/Product.php b/models/Product.php
@@ -13,6 +13,7 @@
 use October\Rain\Database\Traits\SoftDelete;
 use October\Rain\Database\Traits\Validation;
 use October\Rain\Database\Traits\Purgeable;
+use October\Rain\Database\Traits\Nullable;
 
 use Lovata\Toolbox\Traits\Helpers\TraitCached;
 use Lovata\Shopaholic\Classes\Import\ImportProductModelFromCSV;
@@ -134,6 +135,8 @@ class Product extends ImportModel
     use CodeField;
     use ExternalIDField;
     use TraitCached;
+    use Nullable;
+
 
     public $table = 'lovata_shopaholic_products';
 
@@ -181,6 +184,7 @@ class Product extends ImportModel
 
     public $appends = [];
     public $purgeable = [];
+    public $nullable = [];
     public $fillable = [
         'active',
         'name',

diff --git a/updates/version.yaml b/updates/version.yaml
@@ -122,4 +122,6 @@
     - 'Added relation to Offer model with Measure model.'
     - update_table_offers_add_measure_field.php
 1.27.0:
-    - 'Added parent category field to backend in Category model. Thanks for contribution Dinwid.'
+    - 'Added parent category field to backend in Category model. Thanks for contribution Dinwid.'
+1.27.1:
+    - 'Fixed logic of getting prices in Offer model.'