NoteStar 5 سال پیش
والد
کامیت
7eddee17e1

+ 4 - 2
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/checkout/cart/index.php

@@ -194,17 +194,19 @@ use fec\helpers\CRequest;
                                  </h2>
                             </div>
                             <div class="cart-summary-button">
-                                
+
                                 <button onclick="location.href='<?= Yii::$service->url->getUrl('checkout/onepage');  ?>'" type="button" title="Proceed to Checkout" class="button btn-proceed-checkout btn-checkout checkout-btn">
                                     <span>
                                         <span><?= Yii::$service->page->translate->__('Proceed to Pay');?></span>
                                     </span>
                                 </button>
-                                
+                                <!--
                                 <span class="or">- <?= Yii::$service->page->translate->__('OR');?> - </span>
+
                                 <a class="express_paypal" href="<?= Yii::$service->url->getUrl('payment/paypal/express/start');    ?>">
                                 
                                 </a>
+                                -->
                             </div>
                         </div>
                         <!--=======  End of Cart summery  =======-->

+ 5 - 1
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/checkout/cart/index.php

@@ -145,9 +145,12 @@ use fec\helpers\CRequest;
 					<div class="totals cart-totals">
 						<div class="proceed_to_checkout">
 							<div class="row no-gutter">
-								<div class="col-50">
+								<div class="col-100">
+
 									<button onclick="location.href='<?= Yii::$service->url->getUrl('checkout/onepage');  ?>'" type="button" title="Proceed to Checkout" class="button btn-proceed-checkout btn-checkout"><span><span><?= Yii::$service->page->translate->__('Proceed to Pay');?></span></span></button>
+
                                 </div>
+        <!--
                                 <?php if ($enablePaypalExpress): ?>
 								<div class="col-50">
 									<a  external class="express_paypal" href="<?= Yii::$service->url->getUrl('payment/paypal/express/start');    ?>">
@@ -155,6 +158,7 @@ use fec\helpers\CRequest;
 									</a>
 								</div>
                                 <?php endif;  ?>
+                                 -->
 							</div>
 						</div>
 					</div>

+ 2 - 15
common/config/fecshop_local_services/Shipping.php

@@ -14,31 +14,18 @@ return [
         'volumeWeightCoefficient' => 5000,
         'shippingConfig' => [
             'free_shipping'=> [  // 免运费
-                'label'=> 'Free shipping( 7-20 work days)',
+                'label'=> 'Free shipping( 10-20 work days)',
                 'name' => 'HKBRAM',
                 'formula' => '0',  // 这里填写公式,该值代表免邮。
                 // 国家限制,当国家限制不满足,则该物流不可用 (如果没有国家限制可以去掉)
-                'country' => [  // 这里填写(允许|不允许)使用的国家简码,如果您没有这方面的约束,请去掉,去掉后代表没有任何约束
-                    'type' => 'allow',  // allow代表只允许下面的国家使用该shipping,not_allow代表不允许下面国家使用该shipping
-                    'code' => [
-                        'CN',
-                        'US',
-                    ]
-                ],
                 // 重量限制,当重量超出这个范围,该物流将不可用 (如果没有重量限制可以去掉)
                 'weight' => [
                     'min' => 0,
                     'max' => 100,
                 ],
             ],
-            'middle_shipping'=> [  // xxx shipping
-                'label'=> 'middle shipping( 6-15 work days)',
-                'name' => 'HKBRAM',
-                'formula' => '[weight] * 0.5',  // 这里填写公式
-                // 对于国家和重量限制,如果没有,则不用填写,如果有,参考上面的样式填写
-            ],
             'fast_shipping'=> [
-                'label'=> 'Fast Shipping( 5-10 work days)',
+                'label'=> 'Fast Shipping( 3-12 work days)',
                 'name' => 'HKDHL',
                 'formula' => 'csv', // 请将文件名字的命名写入,譬如: fast_shipping.csv
                 'csv_content' => '', // 这个由shipping动态从文件中获取内容