theo 2 лет назад
Родитель
Сommit
67e39a2404

+ 3 - 3
backendEle/src/views/shop/goods-add.vue

@@ -48,13 +48,13 @@
                     <template slot="append">%</template>
                   </el-input>
                 </el-form-item>
-                <el-form-item label="US Price($)" p>
+                <el-form-item label="Member Price($)" p>
                     <el-input v-model="form.sellPriceStandard"></el-input>
                 </el-form-item>
-                <el-form-item label="Sales Price(₦)">
+                <el-form-item label="Member Price(₦)">
                     <el-input v-model="form.sellPrice"></el-input>
                 </el-form-item>
-                <el-form-item label="Market Price(₦)">
+                <el-form-item label="Retail Price(₦)">
                   <el-input v-model="form.marketPrice"></el-input>
                 </el-form-item>
                 <el-form-item label="Price BV" v-show="pvDisabled"><!-- 价格BV -->

+ 3 - 3
backendEle/src/views/shop/index.vue

@@ -109,13 +109,13 @@
               <template slot="append">%</template>
             </el-input>
           </el-form-item>
-          <el-form-item label="US Price($)" p>
+          <el-form-item label="Member Price($)" p>
             <el-input v-model="form.sellPriceStandard"></el-input>
           </el-form-item>
-          <el-form-item label="Sales Price(₦)" p>
+          <el-form-item label="Member Price(₦)" p>
             <el-input v-model="form.sellPrice"></el-input>
           </el-form-item>
-          <el-form-item label="Market Price(₦)">
+          <el-form-item label="Retail Price(₦)">
             <el-input v-model="form.marketPrice"></el-input>
           </el-form-item>
           <el-form-item label="Price BV" v-show="pvDisabled"> <!-- 价格BV -->

+ 1 - 1
common/messages/en-US/app.php

@@ -29,7 +29,7 @@ return [
     'soldOut' => 'Sold out',
     'productsDoesNotExists' => 'Products does not exists!',
     'allowOnlyOne' => 'Only 1 can be purchased at a time',
-    'canNotBuy' => 'You should buy the product in order',
+    'canNotBuy' => 'Please pay in EPP order',
     'productsDoesSoldOut' => 'Products has sold out!',
     'cashDoesNotAdequate' => '余额不足,无法购买商品',
     'exchangePointDoesNotAdequate' => '兑换积分不足,无法购买商品',

+ 3 - 0
common/models/forms/DeclarationForm.php

@@ -727,6 +727,9 @@ class DeclarationForm extends Model
                         throw new Exception(Yii::t('app', 'totalBVCanNotLessThanNextSelectedLevelBV'));
                     }
                 }
+                if ($hasInstalment && $decLevel['LEVEL_NAME'] == 'BA'){
+                    throw new Exception(Yii::t('app', 'totalBVCanNotLessThanNextSelectedLevelBV'));
+                }
                 $this->_decAmount = $totalAmount;
                 $this->_decPv = $totalPv;
                 $this->_decAmountStandard = $totalAmountStandard;