Changeset 2678892

Timestamp:

02/15/2022 08:50:32 AM (4 years ago)

Author:

peterlogisnap

Message:

Updates shipping methods

Location:

logisnap

Files:

• tags/1.0.2 (added)
• tags/1.0.2/LogiSnap.php (added)
• tags/1.0.2/includes (added)
• tags/1.0.2/includes/class-lss-actions.php (added)
• tags/1.0.2/includes/class-lss-admin.php (added)
• tags/1.0.2/includes/class-lss-api-client-response.php (added)
• tags/1.0.2/includes/class-lss-api-client.php (added)
• tags/1.0.2/includes/class-lss-carriers.php (added)
• tags/1.0.2/includes/class-lss-notices.php (added)
• tags/1.0.2/includes/class-lss-options.php (added)
• tags/1.0.2/includes/class-lss-shipping.php (added)
• tags/1.0.2/includes/class-lss-woocommerce.php (added)
• tags/1.0.2/includes/index.php (added)
• tags/1.0.2/includes/persist-admin-notices-dismissal.php (added)
• tags/1.0.2/index.php (added)
• tags/1.0.2/public (added)
• tags/1.0.2/public/css (added)
• tags/1.0.2/public/css/style.css (added)
• tags/1.0.2/public/images (added)
• tags/1.0.2/public/images/carriers (added)
• tags/1.0.2/public/images/carriers/airmee.png (added)
• tags/1.0.2/public/images/carriers/bring.png (added)
• tags/1.0.2/public/images/carriers/burd.png (added)
• tags/1.0.2/public/images/carriers/danske_fragtmaend.png (added)
• tags/1.0.2/public/images/carriers/dao.png (added)
• tags/1.0.2/public/images/carriers/gls.png (added)
• tags/1.0.2/public/images/carriers/misc.png (added)
• tags/1.0.2/public/images/carriers/postnord.png (added)
• tags/1.0.2/public/images/carriers/pstnord.png (added)
• tags/1.0.2/public/images/carriers/srt.png (added)
• tags/1.0.2/public/images/logo.png (added)
• tags/1.0.2/public/js (added)
• tags/1.0.2/public/js/dismiss-notice.js (added)
• tags/1.0.2/public/js/pickup-points.js (added)
• tags/1.0.2/readme.txt (added)
• tags/1.0.2/translations (added)
• tags/1.0.2/translations/index.php (added)
• trunk/LogiSnap.php (modified) (2 diffs)
• trunk/includes/class-lss-shipping.php (modified) (7 diffs)
• trunk/readme.txt (modified) (2 diffs)

logisnap/trunk/LogiSnap.php

@@ -3 +3 @@
  * Plugin Name: LogiSnap
  * Description: Easily integrate your LogiSnap solution into Woocommerce.
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author: LogiSnap
  * Author URI: //LogiSnap.com
@@ -29 +29 @@
 
     /** @var $*/
-    public $version = '1.0.1';
+    public $version = '1.0.2';
 
     /** @var LSS_Options */

logisnap/trunk/includes/class-lss-shipping.php

@@ -101 +101 @@
                     
                     $this->instance_form_fields['carrier'] = [
-                        'title'         => __( 'Shipping Method', 'logisnap-shipping-for-woocommerce' ),
+                        'title'         => __( 'Select Carrier', 'logisnap-shipping-for-woocommerce' ),
                         'type'          => 'select',
                         'class'         => '',
-                        'description'   => __( 'Which carrier this shipping method should apply to', 'logisnap-shipping-for-woocommerce' ),
                         'options'       => $options
                     ];
 
                     $this->instance_form_fields['type'] = [
-                        'title'         => __( 'Product', 'logisnap-shipping-for-woocommerce' ),
+                        'title'         => __( 'Shipment Type', 'logisnap-shipping-for-woocommerce' ),
                         'type'          => 'select',
                         'class'         => 'lss_product_type_field',
-                        'description'   => __( 'Which Carrier product type to use', 'logisnap-shipping-for-woocommerce' ),
                         'options'       => $type_options
                     ];
@@ -118 +116 @@
 
                     $this->instance_form_fields['cost'] = [
-                        'title'             => __( 'Cost', 'woocommerce' ),
+                        'title'             => __( 'Shipping Price', 'woocommerce' ),
                         'type'              => 'text',
                         'placeholder'       => '',
@@ -134 +132 @@
                     ];
 
+                    $this->instance_form_fields['reduce_shipping_price'] = [
+                        'title'             => __( 'Reduce Shipping Price By %', 'woocommerce' ),
+                        'type'              => 'text',
+                        'placeholder'       => '',
+                        'default'           => '0',
+                        'sanitize_callback' => array( $this, 'sanitize_cost' )
+                    ];
+
+
+                    $this->instance_form_fields['reduce_shipping_price_condition'] = [
+                        'title'             => __( 'Condition', 'woocommerce' ),
+                        'type'              => 'select',
+                        'placeholder'       => '',
+                        'default'           => '0',
+                        'sanitize_callback' => array( $this, 'sanitize_cost' ),
+                        'options'           => $this->get_conditions()
+                    ];
+
+                    $this->instance_form_fields['reduce_shipping_condition_amount'] = [
+                        'title'             => __( 'Amount', 'woocommerce' ),
+                        'type'              => 'text',
+                        'placeholder'       => '',
+                        'default'           => '0',
+                        'sanitize_callback' => array( $this, 'sanitize_cost' )
+                    ];
+
                     // when changing position 
                     // change index in admin enque js
+                       // 'When cart is below a price',
+                       // 'When cart is above a price',
                     $coupon_optionsArray = [
-                       'When cart is below a price',
-                       'When cart is above a price',
                        'Cut shipping price by procent',
                        'Cut shipping price by amount',
@@ -149 +173 @@
                         'type'          => 'select',
                         'class'         => 'lss_coupon_options_field',
-                        'description'   => __( 'What should happen when free coupon is applied',
-                                                'logisnap-shipping-for-woocommerce' ),
                         'options'       => $coupon_optionsArray,
                         'sanitize_callback' => array( $this, 'sanitize_cost' )
@@ -164 +186 @@
                     ];
                 }
+            }
+
+            function get_conditions(){
+                // when changing position 
+                // change index in admin enque js
+                $condiction = [
+                   'When cart is above amount',
+                   'When cart is below amount'
+                ];
+                return $condiction;
             }
 
@@ -317 +349 @@
                 }
 
+                $reduce_choice = $this->get_option('reduce_shipping_price_condition');
+                $cart_price = $package['contents_cost'];
+
+
+                if($reduce_choice == 0){
+                    $reduce_amount = $this->get_option( 'reduce_shipping_price' );
+                    $reduce_condition_amount = $this->get_option( 'reduce_shipping_condition_amount' );
+
+                    if($reduce_condition_amount < $cart_price)
+                        $rate['cost'] -= ($rate['cost'] / 100) * $reduce_amount;
+                }
+                else if($reduce_choice == 1){
+                    $reduce_amount = $this->get_option( 'reduce_shipping_price' );
+                    $reduce_condition_amount = $this->get_option( 'reduce_shipping_condition_amount' );
+
+                    if($reduce_condition_amount > $cart_price)
+                        $rate['cost'] -= ($rate['cost'] / 100) * $reduce_amount;
+                }
+
+
                 if($free_shipping_coupon)
                 {
                     $coupon_choice = $this->get_option( 'coupon_options' );
-                    $cart_price = $package['contents_cost'];
 
                     if($coupon_choice == 0)
-                    {    
-                        // check if the price is lower then selected
-                        if($this->get_option( 'coupon_amount' ) > $cart_price)
-                            $rate['cost'] = 0;
-                    }
-                    else if($coupon_choice == 1)
-                    {
-                        // check if the price is higher then selected
-                        if($this->get_option( 'coupon_amount' ) < $cart_price)
-                            $rate['cost'] = 0;
-                    }
-                    else if($coupon_choice == 2)
                     {
                         $rate['cost'] -= ($rate['cost'] / 100) * $this->get_option( 'coupon_amount' );
                     }
-                    else if($coupon_choice == 3){
+                    else if($coupon_choice == 1){
 
                         $rate['cost'] -= $this->get_option( 'coupon_amount' );
                     }
-                    else if($coupon_choice == 4){
+                    else if($coupon_choice == 2){
 
                         $rate['cost'] = 0;
@@ -426 +465 @@
                             // if free shipping is selected hide the amount field
                             // or if dont apply free coupon is selected
-                            if(valueOption == 4 || valueOption == 5){
+                            if(valueOption == 2 || valueOption == 3){
                                 minAmountField.hide();
                                 

logisnap/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 5.0
 Tested up to: 5.8
-Stable tag: 1.0.1
+Stable tag: 1.0.2
 Requires PHP: 5.6.0
 Requires WooCommerce: 3.0.0
@@ -23 +23 @@
 
 == Changelog ==
+
+= 1.0.2 =
+* Added more options for the shipping methods
+* Updated shipment method pop up
+
 = 1.0.1 =
 * Updated endpoints