Merge pull request EC-CUBE#12 from chihiro-adachi/fix-product-point

商品ごとポイント付与率の修正
geany-y · May 2, 2016 · 3f88bec · 3f88bec
2 parents 48888f9 + 3c69748
commit 3f88bec
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Helper/PointCalculateHelper/PointCalculateHelper.php b/Helper/PointCalculateHelper/PointCalculateHelper.php
@@ -392,7 +392,7 @@ public function getAddPointByProduct()
         // 商品毎の付与率あればそちらを優先
         // なければサイト設定ポイントを利用
         $calculateRate = $basicPointRate;
-        if (!empty($pointRate)) {
+        if (!is_null($pointRate)) {
             $calculateRate = $pointRate;
         }
 
@@ -402,8 +402,8 @@ public function getAddPointByProduct()
 
         // 返却値生成
         $rate = array();
-        $rate['min'] = (integer)$this->getRoundValue($min_price * ((integer)$calculateRate / 100));
-        $rate['max'] = (integer)$this->getRoundValue($max_price * ((integer)$calculateRate / 100));
+        $rate['min'] = (integer)$this->getRoundValue($min_price * ($calculateRate / 100));
+        $rate['max'] = (integer)$this->getRoundValue($max_price * ($calculateRate / 100));
 
         return $rate;
     }

diff --git a/Repository/PointProductRateRepository.php b/Repository/PointProductRateRepository.php
@@ -130,8 +130,8 @@ public function getPointProductRateByEntity($entity = null)
     SELECT
       MAX(t2.plg_point_product_rate_id)
     FROM Plugin\Point\Entity\PointProductRate t2
-    WHERE t2.plg_point_product_rate IS NOT NULL AND t1.product_id = t1.product_id
-)';
+    WHERE t1.product_id = t1.product_id
+) AND t1.plg_point_product_rate IS NOT NULL';
 
             $result = $this->getEntityManager()->createQuery($dql)->getArrayResult();
 

diff --git a/Resource/doctrine/migration/Version20151215144009.php b/Resource/doctrine/migration/Version20151215144009.php
@@ -88,7 +88,7 @@ public function up(Schema $schema)
             $t = $schema->createTable(self::PLG_POINT_PRODUCT_RATE);
             $t->addColumn('plg_point_product_rate_id', 'integer', array('NotNull' => true, 'autoincrement' => true));
             $t->addColumn('product_id', 'integer', array('NotNull' => true, 'Default' => 0));
-            $t->addColumn('plg_point_product_rate', 'integer', array('NotNull' => false, 'Default' => 0));
+            $t->addColumn('plg_point_product_rate', 'integer', array('NotNull' => false));
             $t->addColumn('create_date', 'datetime', array('NotNull' => true));
             $t->addColumn('update_date', 'datetime', array('NotNull' => true));
             $t->setPrimaryKey(array('plg_point_product_rate_id'));