From ada613b105cfcd009808ac0a36257304a925ea0e Mon Sep 17 00:00:00 2001
From: Robert Grundeken <robert.grundeken@tig.nl>
Date: Mon, 17 Feb 2020 10:03:57 +0100
Subject: [PATCH 1/7] GW-34 Free Shipping Added

---
 assets/js/admin/gls_admin.js                  |  23 ++++
 includes/admin/class-gls-admin.php            |   1 +
 .../class-gls-settings-delivery-options.php   |   5 +-
 ...settings-woocommerce-shipping-instance.php |  90 +++++++++++++++
 includes/class-gls-delivery-options.php       |  63 ++++++++++-
 languages/gls-woocommerce-nl_NL.mo            | Bin 11621 -> 12672 bytes
 languages/gls-woocommerce-nl_NL.po            | 105 +++++++++++++-----
 languages/gls-woocommerce.pot                 |  91 ++++++++++-----
 8 files changed, 316 insertions(+), 62 deletions(-)
 create mode 100644 includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php

diff --git a/assets/js/admin/gls_admin.js b/assets/js/admin/gls_admin.js
index 600b1ae..af8d528 100644
--- a/assets/js/admin/gls_admin.js
+++ b/assets/js/admin/gls_admin.js
@@ -5,6 +5,29 @@
             return;
         }
 
+        // Toggle free shipping fields (via ajax request)
+        $(document).on("change", '#tig_glstig_gls_freeshipping_enabled', function() {
+            toggleFreeShippingFields($(this).val());
+        });
+
+        $(document).on("click", '.wc-shipping-zone-method-settings', function() {
+            toggleFreeShippingFields($('#tig_glstig_gls_freeshipping_enabled').val());
+        });
+
+        function toggleFreeShippingFields(value) {
+            $("#tig_glstig_gls_freeshipping").parent().parent().parent().css('display','none');
+            $("#tig_glstig_gls_freeshipping_extra").parent().parent().parent().parent().css('display','none');
+
+            if (value == 1 ) {
+                $("#tig_glstig_gls_freeshipping").parent().parent().parent().css('display','table-row');
+                $("#tig_glstig_gls_freeshipping_extra").parent().parent().parent().parent().css('display','table-row');
+            }
+        }
+
+        if ($("#tig_glstig_gls_freeshipping_enabled").length) {
+            toggleFreeShippingFields($("#tig_glstig_gls_freeshipping_enabled").val());
+        }
+
         var is_blocked = function ($node) {
             return $node.is('.processing') || $node.parents('.processing').length;
         };
diff --git a/includes/admin/class-gls-admin.php b/includes/admin/class-gls-admin.php
index b011ac8..461a298 100644
--- a/includes/admin/class-gls-admin.php
+++ b/includes/admin/class-gls-admin.php
@@ -61,6 +61,7 @@ public function includes()
         include_once dirname(__FILE__) . '/class-gls-admin-assets.php';
         include_once dirname(__FILE__) . '/class-gls-admin-meta-boxes.php';
         include_once dirname(__FILE__) . '/class-gls-admin-api-notice.php';
+        include_once dirname(__FILE__) . '/settings/class-gls-settings-woocommerce-shipping-instance.php';
     }
 
     /**
diff --git a/includes/admin/settings/class-gls-settings-delivery-options.php b/includes/admin/settings/class-gls-settings-delivery-options.php
index 64ad05e..3f8d626 100644
--- a/includes/admin/settings/class-gls-settings-delivery-options.php
+++ b/includes/admin/settings/class-gls-settings-delivery-options.php
@@ -389,8 +389,9 @@ public function get_gls_shipping_methods($methods, $zone)
         if (!empty($methods)) {
             foreach ($methods as $method) {
                 if (get_class($method) == 'GLS_Shipping_Method' ) {
-                    $enabled_string = ($method->enabled == 'yes') ? __('active', 'gls_woocommerce') : __('deactive', 'gls_woocommerce');
-                    $gls_shipping_method[] = '<a href="' . admin_url('admin.php?page=wc-settings&tab=shipping&zone_id=' . $zone) . '">' . $method->title . '</a> &nbsp;<strong>' . $enabled_string. '</strong>';
+                    $enabled_string = ($method->enabled == 'yes') ? __('active', 'gls-woocommerce') : __('deactive', 'gls-woocommerce');
+                    $freeshipping_string = ((int)$method->instance_settings['freeshipping_enabled'] > 0 && (float)$method->instance_settings['freeshipping'] > 0) ? sprintf(__('free shipping above %s %s (excl. tax) ', 'gls-woocommerce'), (float)$method->instance_settings['freeshipping'], get_option('woocommerce_currency')) : __('no free shipping', 'gls-woocommerce');
+                    $gls_shipping_method[] = '<a href="' . admin_url('admin.php?page=wc-settings&tab=shipping&zone_id=' . $zone) . '">' . $method->title . '</a> &nbsp;<strong>' . $enabled_string. '</strong> &nbsp;(' . $freeshipping_string . ')';
                 }
             }
         }
diff --git a/includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php b/includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php
new file mode 100644
index 0000000..6f7a353
--- /dev/null
+++ b/includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ *
+ *          ..::..
+ *     ..::::::::::::..
+ *   ::'''''':''::'''''::
+ *   ::..  ..:  :  ....::
+ *   ::::  :::  :  :   ::
+ *   ::::  :::  :  ''' ::
+ *   ::::..:::..::.....::
+ *     ''::::::::::::''
+ *          ''::''
+ *
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Creative Commons License.
+ * It is available through the world-wide-web at this URL:
+ * http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
+ * If you are unable to obtain it through the world-wide-web, please send an email
+ * to servicedesk@tig.nl so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this module to newer
+ * versions in the future. If you wish to customize this module for your
+ * needs please contact servicedesk@tig.nl for more information.
+ *
+ * @copyright   Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
+ * @license     http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
+ */
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Class GLS_Settings_Woocommerce_Shipping_Instance
+ */
+class GLS_Settings_Woocommerce_Shipping_Instance
+{
+    public function __construct()
+    {
+        // @formatter:off
+        add_filter('woocommerce_shipping_instance_form_fields_tig_gls', array(__CLASS__, 'filter_woocommerce_shipping_instance_form_fields_tig_gls'), 10, 1);
+        // @formatter:on
+    }
+
+    /**
+     * Add extra formfields to GLS Shipping options instance in WooCommerce Shipping Settings
+     * @param $form_fields
+     * @return mixed
+     */
+    public function filter_woocommerce_shipping_instance_form_fields_tig_gls ($form_fields)
+    {
+
+        $form_field_freeshipping_enabled = array(
+            'title'         => __('Enable free shipping','gls-woocommerce'),
+            'type'          => 'select',
+            'description'   =>  __('Enable free shipping above an order amount','gls-woocommerce'),
+            'desc_tip'      => true,
+            'options'       => array(1 => 'Yes', 0 => 'No'),
+            'default'       => '0'
+        );
+
+        $form_field_freeshipping = array(
+            'title'         => __('Apply free shipping above order amount','gls-woocommerce'),
+            'type'          => 'price',
+            'disabled'      => false,
+            'description'   =>  __('Enter the order amount (excl. tax) above (and equal) which free shipping will be applied.','gls-woocommerce'),
+            'desc_tip'      => true,
+            'default'       => '0'
+        );
+
+        $form_field_freeshipping_extra = array(
+            'title'         => __('Apply free shipping to extra services','gls-woocommerce'),
+            'type'          => 'checkbox',
+            'description'   =>  __('Enable this when extra service costs are also free when free shipping applies.','gls-woocommerce'),
+            'default'       => 'no',
+            'desc_tip'      => true
+        );
+
+
+        $form_fields['freeshipping_enabled'] = $form_field_freeshipping_enabled;
+        $form_fields['freeshipping'] = $form_field_freeshipping;
+        $form_fields['freeshipping_extra'] = $form_field_freeshipping_extra;
+
+        return $form_fields;
+    }
+}
+
+new GLS_Settings_Woocommerce_Shipping_Instance();
\ No newline at end of file
diff --git a/includes/class-gls-delivery-options.php b/includes/class-gls-delivery-options.php
index 5539156..50b7f05 100644
--- a/includes/class-gls-delivery-options.php
+++ b/includes/class-gls-delivery-options.php
@@ -389,20 +389,81 @@ public static function adjust_shipping_rate($rates){
             return $rates;
         }
 
+        // Free Shipping
+        $freeshipping = self::calculate_gls_freeshipping();
+        $freeshipping_extra = self::get_shipping_method_instance_setting('freeshipping_extra');
+
         $service = $session->get('gls_service');
         $details = $service['details'] ?? [];
         $fee     = $details['fee'] ?? '';
 
         foreach ($rates as &$rate) {
             if ($rate->get_method_id() == 'tig_gls') {
-                $rate->cost += (float) $fee;
+                if ($freeshipping) {
+                    $rate->cost = 0;
+                }
+
+                if (!$freeshipping || $freeshipping_extra == "no") {
+                    $rate->cost += (float)$fee;
+                }
+
+                if ($rate->cost <= 0) {
+                    $rate->cost = 0;
+                    $rate->label = $rate->label . __(' (free shipping)','gls-woocommerce');
+                }
+
                 $tax_array = WC_Tax::calc_tax($rate->cost, WC_Tax::get_rates(), false );
+
                 $rate->set_taxes($tax_array);
             }
         }
         return $rates;
     }
 
+    /**
+     * @return bool
+     */
+    public static function calculate_gls_freeshipping()
+    {
+        $enabled = (int)self::get_shipping_method_instance_setting('freeshipping_enabled');
+
+        if (!$enabled) {
+            return false;
+        }
+
+        $freeshipping_amount = (float)self::get_shipping_method_instance_setting('freeshipping');
+
+        if ($freeshipping_amount > 0) {
+            $session = WC()->session;
+            $cart_totals = $session->get('cart_totals');
+            if ($freeshipping_amount <= ($cart_totals['subtotal'] + $cart_totals['subtotal_tax'])) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param $setting_name
+     * @return |null
+     */
+    public static function get_shipping_method_instance_setting($setting_name)
+    {
+        $session = WC()->session;
+        $chosen_shipping_method = $session->get('chosen_shipping_methods');
+
+        $shipping_method_id = explode(':',$chosen_shipping_method[0]);
+        $current_shipping_methods = WC()->shipping->get_shipping_methods();
+        $current_shipping_method = $current_shipping_methods[$shipping_method_id[1]];
+
+        //get instance setting
+        if ($current_shipping_method->instance_settings[$setting_name]) {
+            return $current_shipping_method->instance_settings[$setting_name];
+        }
+
+        return null;
+    }
+
     /**
      * @param $order
      * @param $data
diff --git a/languages/gls-woocommerce-nl_NL.mo b/languages/gls-woocommerce-nl_NL.mo
index 2323066e8b2a1afb1ffa581d31267e3c99031067..4ea5311f1e515c0702fe4b5a84d35cbdcc2979a5 100644
GIT binary patch
delta 3657
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
ZmGIwU*s!}NVT~7rnZfi`vvw<FJ_Q+~KF$CD

delta 2620
zcmY+_e@vBC9LMo<yNG~*@gq_Myh8j?xX7<UNkjqh0%nkkL=?&|O^_d9%$#*)&W+K=
zm^ZzZw$+kV>RNeov21JE>W{WsO}Di5ODoq}i#c+wKb*Zk_c{I1ncwI2Jcs){=bZ2P
zK97gGer@yrkQi~y(Do5&#D{KUUcvVH9B5xf8xw_JV*-AQb@&HXVQGvpsW^hVe-dl(
z48DQ0xEzBEjJXFt#(DS+)*9nC-*b{pM`o-s8_|c6IE8T-ME;p+4%K)L)A1HA#3X)n
zH)f%pQ)X?$`?x-Y8h9EP;RR$!a~b0q-~7ahmyX$R2M>>TCQyLM^p~Pm=tDiA3y1L_
zj^UrEWDPN!Ufho)(fo)@@Mp}&JE;5fnXM*Ji@A(%nmAdE`;j@Aqu7qGVk_RpW^5t<
zJj1++OK}D>@Cs^xzfqaWN^~+*WZjIKSU>7_m#lZtzk-hZBx6#r1@FbZsEHiG4H&Tf
zSFJZuH4#mE*j|%}x=u&!Z4R!-0?fey+kXrx8*>6XaXOj&Yei9PkX(d%P@c6IS-h!0
z#x#xA4%7rk?BB;wTX57~zl<8_3>M;f^x`k5VoYSUxws~U{FiXjO-B|6(SsMT3BSWi
z^pX};cOR<A#;tFoitI9Kpnt4+Y_ta4j&I=+)WTM>&pup*r8ws2q>PjEs2}`}+S57I
ziW8|ky$w0Yb{Q|~ck7VFn0kD{WlV?d|BH%K#%`kqh-cOXSdGlV45Ah~j&<li%gISj
z=Fo#vyjyy}yQq|2#MSsY>c$9Ww+Zu56L}g{&Cj8VZvq=Ii2D6?+aF2AYRi&PHL=Xm
zZ+y065VfM?$l}de)B`_5-FOMLl55BtXW~81!0D*_mLq>MRmfaT2TtI#IEhiqoaY6x
zo9k2P*83lw=?oZ$Y`4ipJ#Z~*Wm{3jvICXEanuA}!#(&8K7mVE?iM_N+Nv*+G0Ziq
zn?hO1bv9~Y+c1goO{Y$96nk+3d8WB(O{U^>U5=VS8|L8%Dl;ds7EhxxH*1Y1&)T9a
z)N5K`Ek`Y&8vScIY377Unkk%z@1bt^0Ne3X)a#i^8e|FT!PTghG@>Tbidsl7s)i1r
zGWa|yBSF;fP9vWHGm}gHHP9Dys9LX}UdLFLr@gMi7VO6=`~<h6o0qr&TX6_q$2FL|
z!l{8~WX@*T`l9tC)E3;ZrsR`<b=2`)d>=<K3JV!sDJ{qQ@gQn~=TND;fy&q|RLv~*
zI<ILFYUSmq=lD<=X+{^WB6OcxjSkxXHiCtPtC!z}2iSx=2sN!tS=mGAp>c#-9q|aE
zJ#Qk^b`pAB)l__H4>*_++-}dc&5eZrAr6tmlZ4tvhww3j<D-O+V4>mG%u#Pg3^7Qw
z648X}Vgo^D&0a!{-3%A*gXmTVjRc3=V-9}vI44T=e4>z8PpD~M)s%j<0f+w`ciSty
z?`lsG4MZgoOQ^Uv6MP)QjjwaKAa$Vvbn*`oL<f;Z=ySY<P@(N3RCs+vHPJ(;Ui4OU
z6WZJVnhI5W-%k|T&SCTr#Y8EgMy-b1T{?CVDxgGyPqry1^fAdM)G7#7@-~A1-ox*I
zC#v-lx_=#^R!{5-pE>_2J#5cIFU5FVfrPl!kSF#Tci`&6IahaRG~u_H!11)2=wfe4
zxu<A#MOol_+KjuTuq<#QeKJ&;5$Ot@T6)+W8p=v_#nun(>KW<Uy|b^UzdO{KeR09R
DFO}`v

diff --git a/languages/gls-woocommerce-nl_NL.po b/languages/gls-woocommerce-nl_NL.po
index 4dff27a..7f40ab0 100644
--- a/languages/gls-woocommerce-nl_NL.po
+++ b/languages/gls-woocommerce-nl_NL.po
@@ -1,26 +1,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GLS for Woocommerce v1\n"
-"POT-Creation-Date: 2020-01-27 09:44+0100\n"
-"PO-Revision-Date: 2020-01-27 09:44+0100\n"
+"POT-Creation-Date: 2020-02-14 16:13+0100\n"
+"PO-Revision-Date: 2020-02-14 16:14+0100\n"
 "Last-Translator: \n"
 "Language-Team: TIG support@tig.nl\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-KeywordsList: __;_e;_n:1,2;_x;esc_html__\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: gls-woocommerce.php:67 includes/admin/class-gls-admin-api-notice.php:59
+#: gls-woocommerce.php:69 includes/admin/class-gls-admin-api-notice.php:59
 #: includes/admin/settings/class-gls-settings-delivery-options.php:56
 msgid "GLS"
 msgstr "GLS"
 
-#: gls-woocommerce.php:68
+#: gls-woocommerce.php:70
 msgid "Connect WooCommerce to GLS to provide GLS delivery options in checkout."
 msgstr ""
 "Activeer GLS WooCommerce om GLS verzendmethode opties te bieden in de kassa."
@@ -68,7 +68,7 @@ msgstr "Download Label"
 msgid "Track ID"
 msgstr "Track ID"
 
-#: includes/admin/class-gls-admin.php:76
+#: includes/admin/class-gls-admin.php:77
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -273,7 +273,7 @@ msgstr "Het winkeladres kan aangepast worden bij de WooCommerce tab “Algemeen
 
 #: includes/admin/settings/class-gls-settings-delivery-options.php:340
 #: includes/admin/settings/class-gls-settings-delivery-options.php:373
-#: includes/admin/settings/class-gls-settings-delivery-options.php:435
+#: includes/admin/settings/class-gls-settings-delivery-options.php:436
 #, php-format
 msgid "%shere%s"
 msgstr "%shier%s"
@@ -309,7 +309,16 @@ msgstr "actief"
 msgid "deactive"
 msgstr "inactief"
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:421
+#: includes/admin/settings/class-gls-settings-delivery-options.php:393
+#, php-format
+msgid "free shipping above %s %s (excl. tax) "
+msgstr "verzendkosten vervallen bij orderbedrag van %s %s (excl. BTW) "
+
+#: includes/admin/settings/class-gls-settings-delivery-options.php:393
+msgid "no free shipping"
+msgstr "altijd verzendkosten rekenen"
+
+#: includes/admin/settings/class-gls-settings-delivery-options.php:422
 msgid ""
 "In order for the GLS plugin to work correctly, it should be setup as active "
 "shipping method."
@@ -317,45 +326,45 @@ msgstr ""
 "Om de GLS verzendmethode goed te laten werken moet het GLS geconfigureerd "
 "zijn als actieve verzendmethode."
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:425
+#: includes/admin/settings/class-gls-settings-delivery-options.php:426
 msgid "GLS shipping method check"
 msgstr "GLS verzendmethode check"
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:431
+#: includes/admin/settings/class-gls-settings-delivery-options.php:432
 msgid "Configured GLS shipping methods found"
 msgstr "Geconfigureerde GLS verzendmethodes"
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:433
+#: includes/admin/settings/class-gls-settings-delivery-options.php:434
 msgid "Active shipping methods will be shown to the customer in the checkout."
 msgstr "Actieve verzendmethodes worden getoond in de kassa."
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:435
+#: includes/admin/settings/class-gls-settings-delivery-options.php:436
 msgid "The shipping methods can be changed"
 msgstr ""
 "Verzendmethodes kunnen worden aangepast bij de WooCommerce tab "
 "“Verzendmethoden”"
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:452
+#: includes/admin/settings/class-gls-settings-delivery-options.php:453
 msgid "Api credentials are correct."
 msgstr "Api gegevens zijn correct ingevuld."
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:452
+#: includes/admin/settings/class-gls-settings-delivery-options.php:453
 msgid "Click here to setup the delivery options."
 msgstr "Klik hier voor de verzendopties."
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:460
+#: includes/admin/settings/class-gls-settings-delivery-options.php:461
 msgid "Api credentials are not correct, please fill in the correct values."
 msgstr "Api gegevens zijn niet correct, vul alstublieft de juiste gegevens in."
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:525
+#: includes/admin/settings/class-gls-settings-delivery-options.php:526
 msgid "GLS Netherlands Shipping WooCommerce Plugin"
 msgstr "GLS WooCommerce Plugin"
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:528
+#: includes/admin/settings/class-gls-settings-delivery-options.php:529
 msgid "This plugin is developed by "
 msgstr "Deze plugin is ontwikkeld door "
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:533
+#: includes/admin/settings/class-gls-settings-delivery-options.php:534
 msgid ""
 "To use this extension you need to be a business customer of GLS Netherlands. "
 "If you are not yet a business customer, just request your individual offer "
@@ -365,56 +374,88 @@ msgstr ""
 "van GLS Nederland. Als u nog geen zakelijke klant bent, kunt u zich "
 "eenvoudig registreren met dit formulier: "
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:534
+#: includes/admin/settings/class-gls-settings-delivery-options.php:535
 msgid "become a customer."
 msgstr "zakelijke klant."
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:539
+#: includes/admin/settings/class-gls-settings-delivery-options.php:540
 msgid "Do you need help with setting up this plugin?"
 msgstr "Hulp nodig met het opzetten van deze plugin?"
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:542
+#: includes/admin/settings/class-gls-settings-delivery-options.php:543
 msgid "Phone"
 msgstr "Telefoonnummer"
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:543
+#: includes/admin/settings/class-gls-settings-delivery-options.php:544
 msgid "during business hours"
 msgstr "tijdens kantooruren"
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:546
+#: includes/admin/settings/class-gls-settings-delivery-options.php:547
 msgid "E-mail"
 msgstr "E-mailadres"
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:550
+#: includes/admin/settings/class-gls-settings-delivery-options.php:551
 msgid "GLS Website"
 msgstr "GLS Website"
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:574
+#: includes/admin/settings/class-gls-settings-delivery-options.php:575
 msgid "Delivery Option"
 msgstr "Verzendoptie"
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:575
+#: includes/admin/settings/class-gls-settings-delivery-options.php:576
 msgid "Description"
 msgstr "Beschrijving"
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:576
+#: includes/admin/settings/class-gls-settings-delivery-options.php:577
 msgid "Additional Fee (excl. VAT)"
 msgstr "Extra kosten (excl. BTW)"
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:577
+#: includes/admin/settings/class-gls-settings-delivery-options.php:578
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:625
+#: includes/admin/settings/class-gls-settings-delivery-options.php:626
 #, php-format
 msgid "The \"%s\" delivery option is currently enabled"
 msgstr "De “%s” verzendoptie is momenteel ingeschakeld"
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:628
+#: includes/admin/settings/class-gls-settings-delivery-options.php:629
 #, php-format
 msgid "The \"%s\" delivery option is currently disabled"
 msgstr "De “%s” verzendoptie is momenteel uitgeschakeld"
 
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:56
+msgid "Enable free shipping"
+msgstr "Gratis verzenden aanzetten"
+
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:58
+msgid "Enable free shipping above an order amount"
+msgstr "Verzendkosten vervallen bij orderbedrag vanaf"
+
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:65
+msgid "Apply free shipping above order amount"
+msgstr "Verzendkosten vervallen bij orderbedrag vanaf"
+
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:68
+msgid ""
+"Enter the order amount (excl. tax) above (and equal) which free shipping "
+"will be applied."
+msgstr ""
+"Vul een orderbedrag (excl. btw) in vanaf waar de de verzendkosten komen te "
+"vervallen."
+
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:74
+msgid "Apply free shipping to extra services"
+msgstr "Ook geen verzendkosten rekenen voor extra services"
+
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:76
+msgid ""
+"Enable this when extra service costs are also free when free shipping "
+"applies."
+msgstr ""
+"Vink dit aan als je voor extra services ook de verzendkosten wil laten "
+"vervallen bij het boven ingevulde orderbedrag."
+
 #: includes/api/class-gls-api-get-delivery-options.php:65
 msgid "Postcode and/or country not specified."
 msgstr "Postcode en/of land niet opgegeven."
@@ -459,6 +500,10 @@ msgstr "Klonen verboden."
 msgid "Unserializing instances of this class is forbidden."
 msgstr "Unserializing instanties van deze klasse is verboden."
 
+#: includes/class-gls-delivery-options.php:412
+msgid " (free shipping)"
+msgstr " (gratis verzenden)"
+
 #: includes/options/class-gls-option-s12.php:41
 msgid "TimeDefiniteService (Saturday before 12.00 AM)"
 msgstr "TimeDefiniteService (zaterdag vóór 12.00 uur)"
diff --git a/languages/gls-woocommerce.pot b/languages/gls-woocommerce.pot
index 513f5d8..5177b09 100644
--- a/languages/gls-woocommerce.pot
+++ b/languages/gls-woocommerce.pot
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-01-22 09:48+0100\n"
+"POT-Creation-Date: 2020-02-14 11:27+0100\n"
 "PO-Revision-Date: 2020-01-06 13:34+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -10,18 +10,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-KeywordsList: __;_e;_n;_x;esc_html__\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: gls-woocommerce.php:67 includes/admin/class-gls-admin-api-notice.php:59
+#: gls-woocommerce.php:69 includes/admin/class-gls-admin-api-notice.php:59
 #: includes/admin/settings/class-gls-settings-delivery-options.php:56
 msgid "GLS"
 msgstr ""
 
-#: gls-woocommerce.php:68
+#: gls-woocommerce.php:70
 msgid "Connect WooCommerce to GLS to provide GLS delivery options in checkout."
 msgstr ""
 
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Processed %s Order for GLS shipment information."
 msgstr ""
 
+#: includes/admin/class-gls-admin-meta-boxes.php:56
+msgid "Create labels"
+msgstr ""
+
 #: includes/admin/class-gls-admin-order-columns.php:57
 msgid "GLS Shipping Information"
 msgstr ""
@@ -60,7 +64,7 @@ msgstr ""
 msgid "Track ID"
 msgstr ""
 
-#: includes/admin/class-gls-admin.php:78
+#: includes/admin/class-gls-admin.php:77
 msgid "Settings"
 msgstr ""
 
@@ -248,7 +252,7 @@ msgstr ""
 
 #: includes/admin/settings/class-gls-settings-delivery-options.php:340
 #: includes/admin/settings/class-gls-settings-delivery-options.php:373
-#: includes/admin/settings/class-gls-settings-delivery-options.php:435
+#: includes/admin/settings/class-gls-settings-delivery-options.php:436
 #, php-format
 msgid "%shere%s"
 msgstr ""
@@ -280,105 +284,134 @@ msgstr ""
 msgid "deactive"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:421
+#: includes/admin/settings/class-gls-settings-delivery-options.php:393
+#, php-format
+msgid "free shipping above %s %s (excl. tax) "
+msgstr ""
+
+#: includes/admin/settings/class-gls-settings-delivery-options.php:393
+msgid "no free shipping"
+msgstr ""
+
+#: includes/admin/settings/class-gls-settings-delivery-options.php:422
 msgid ""
 "In order for the GLS plugin to work correctly, it should be setup as active "
 "shipping method."
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:425
+#: includes/admin/settings/class-gls-settings-delivery-options.php:426
 msgid "GLS shipping method check"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:431
+#: includes/admin/settings/class-gls-settings-delivery-options.php:432
 msgid "Configured GLS shipping methods found"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:433
+#: includes/admin/settings/class-gls-settings-delivery-options.php:434
 msgid "Active shipping methods will be shown to the customer in the checkout."
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:435
+#: includes/admin/settings/class-gls-settings-delivery-options.php:436
 msgid "The shipping methods can be changed"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:452
+#: includes/admin/settings/class-gls-settings-delivery-options.php:453
 msgid "Api credentials are correct."
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:452
+#: includes/admin/settings/class-gls-settings-delivery-options.php:453
 msgid "Click here to setup the delivery options."
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:460
+#: includes/admin/settings/class-gls-settings-delivery-options.php:461
 msgid "Api credentials are not correct, please fill in the correct values."
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:525
+#: includes/admin/settings/class-gls-settings-delivery-options.php:526
 msgid "GLS Netherlands Shipping WooCommerce Plugin"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:528
+#: includes/admin/settings/class-gls-settings-delivery-options.php:529
 msgid "This plugin is developed by "
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:533
+#: includes/admin/settings/class-gls-settings-delivery-options.php:534
 msgid ""
 "To use this extension you need to be a business customer of GLS Netherlands. "
 "If you are not yet a business customer, just request your individual offer "
 "using this form: "
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:534
+#: includes/admin/settings/class-gls-settings-delivery-options.php:535
 msgid "become a customer."
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:539
+#: includes/admin/settings/class-gls-settings-delivery-options.php:540
 msgid "Do you need help with setting up this plugin?"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:542
+#: includes/admin/settings/class-gls-settings-delivery-options.php:543
 msgid "Phone"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:543
+#: includes/admin/settings/class-gls-settings-delivery-options.php:544
 msgid "during business hours"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:546
+#: includes/admin/settings/class-gls-settings-delivery-options.php:547
 msgid "E-mail"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:550
+#: includes/admin/settings/class-gls-settings-delivery-options.php:551
 msgid "GLS Website"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:574
+#: includes/admin/settings/class-gls-settings-delivery-options.php:575
 msgid "Delivery Option"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:575
+#: includes/admin/settings/class-gls-settings-delivery-options.php:576
 msgid "Description"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:576
+#: includes/admin/settings/class-gls-settings-delivery-options.php:577
 msgid "Additional Fee (excl. VAT)"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:577
+#: includes/admin/settings/class-gls-settings-delivery-options.php:578
 msgid "Enabled"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:625
+#: includes/admin/settings/class-gls-settings-delivery-options.php:626
 #, php-format
 msgid "The \"%s\" delivery option is currently enabled"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-delivery-options.php:628
+#: includes/admin/settings/class-gls-settings-delivery-options.php:629
 #, php-format
 msgid "The \"%s\" delivery option is currently disabled"
 msgstr ""
 
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:55
+msgid "Apply free shipping above order amount (0 = off)"
+msgstr ""
+
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:57
+msgid ""
+"Enter the order amount (excl. tax) above (and equal) which free shipping "
+"will be applied. 0 = free shipping turned off."
+msgstr ""
+
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:63
+msgid "Apply free shipping to extra services"
+msgstr ""
+
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:65
+msgid ""
+"Enable this when extra service costs are also free when free shipping "
+"applies."
+msgstr ""
+
 #: includes/api/class-gls-api-get-delivery-options.php:65
 msgid "Postcode and/or country not specified."
 msgstr ""

From 4b3175c9ce22e312e89a316509acfc36eb7cb8d1 Mon Sep 17 00:00:00 2001
From: Robert Grundeken <robert.grundeken@tig.nl>
Date: Fri, 21 Feb 2020 16:30:52 +0100
Subject: [PATCH 2/7] Removed the Display of prices from extra services by free
 shipping

---
 ...settings-woocommerce-shipping-instance.php |   2 +-
 includes/class-gls-delivery-options.php       |  34 ++++++++++++++++--
 languages/gls-woocommerce-nl_NL.mo            | Bin 12672 -> 12742 bytes
 languages/gls-woocommerce-nl_NL.po            |  14 ++++++--
 languages/gls-woocommerce.pot                 |  34 ++++++++++++++----
 5 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php b/includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php
index 6f7a353..5dd1c89 100644
--- a/includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php
+++ b/includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php
@@ -57,7 +57,7 @@ public function filter_woocommerce_shipping_instance_form_fields_tig_gls ($form_
             'type'          => 'select',
             'description'   =>  __('Enable free shipping above an order amount','gls-woocommerce'),
             'desc_tip'      => true,
-            'options'       => array(1 => 'Yes', 0 => 'No'),
+            'options'       => array(0 => __('No','gls-woocommerce'), 1 => __('Yes','gls-woocommerce')),
             'default'       => '0'
         );
 
diff --git a/includes/class-gls-delivery-options.php b/includes/class-gls-delivery-options.php
index 50b7f05..057361c 100644
--- a/includes/class-gls-delivery-options.php
+++ b/includes/class-gls-delivery-options.php
@@ -240,9 +240,20 @@ function (&$option) use ($enabled_options) {
      */
     private function additional_fee($option, $enabled_options)
     {
+
+        $freeshipping = self::has_gls_freeshipping();
+        $freeshipping_extra = self::get_shipping_method_instance_setting('freeshipping_extra');
+        if ($freeshipping && $freeshipping_extra =="yes") {
+            return '';
+        }
+
         $code = 'gls_' . strtolower($option->service);
         $fee  = isset($enabled_options[$code]) ? $enabled_options[$code]->additional_fee : '';
 
+        if ($fee < 0 && $freeshipping) {
+            return '';
+        }
+
         return $fee;
     }
 
@@ -390,7 +401,7 @@ public static function adjust_shipping_rate($rates){
         }
 
         // Free Shipping
-        $freeshipping = self::calculate_gls_freeshipping();
+        $freeshipping = self::has_gls_freeshipping();
         $freeshipping_extra = self::get_shipping_method_instance_setting('freeshipping_extra');
 
         $service = $session->get('gls_service');
@@ -423,7 +434,7 @@ public static function adjust_shipping_rate($rates){
     /**
      * @return bool
      */
-    public static function calculate_gls_freeshipping()
+    public static function has_gls_freeshipping()
     {
         $enabled = (int)self::get_shipping_method_instance_setting('freeshipping_enabled');
 
@@ -456,6 +467,13 @@ public static function get_shipping_method_instance_setting($setting_name)
         $current_shipping_methods = WC()->shipping->get_shipping_methods();
         $current_shipping_method = $current_shipping_methods[$shipping_method_id[1]];
 
+        //fallback; manual init instance to get to config settings
+        if (!isset($current_shipping_method)) {
+            $current_shipping_method = $current_shipping_methods[$shipping_method_id[0]];
+            $current_shipping_method->instance_id = $shipping_method_id[1];
+            $current_shipping_method->init_instance_settings();
+        }
+
         //get instance setting
         if ($current_shipping_method->instance_settings[$setting_name]) {
             return $current_shipping_method->instance_settings[$setting_name];
@@ -494,6 +512,18 @@ public function format_shop_delivery_fee()
             return;
         }
 
+        $freeshipping = self::has_gls_freeshipping();
+
+        //negative fee + free shipping means display no value
+        if ($additional_fee < 0 && $freeshipping) {
+            return;
+        }
+
+        $freeshipping_extra = self::get_shipping_method_instance_setting('freeshipping_extra');
+        if ($freeshipping && $freeshipping_extra == "yes") {
+            return;
+        }
+
         $tax = WC_Tax::calc_tax((float) $additional_fee, WC_Tax::get_rates(), false);
 
         return wc_price((float) reset($tax) + (float) $additional_fee);
diff --git a/languages/gls-woocommerce-nl_NL.mo b/languages/gls-woocommerce-nl_NL.mo
index 4ea5311f1e515c0702fe4b5a84d35cbdcc2979a5..985c61e5981b6c3217fd5365c68908bed5dcce10 100644
GIT binary patch
delta 2818
zcmYk;dra0<9LMp)9Uh3A+*Be$Fa#x#OF|HF5s4m1K@^FIi-1Cz2pS6ch#T43=%SNN
zSGLuhvM|<YwWUjKT_#$tR=HJ^KN=hVIBKr(PiwtDzvr-Z#`k%h-{JTC&h2}CaIEv2
zPS4$F|I>!zArgrge`79TSTG-yYc69V@j9yMM~uSXunO;CDdvS5vkC`M&v_Foa0=Jr
zpO}X6Va8m*5?rTl=c&Zf5b=O90horBn2Gwre%yi+7>IX~A2ZJfUp4o!98I_}4?+b-
zU^{By{ix?0w_e0luD{1vP5VBT1R6s47K1b?NR!FJ4On8Y`%nWof-yLXn(+kc`ybo(
zS<K*i4*Su?C`NGv>+oL;!djMbmzKSeN;giUAI3!+vl>@nCKjMN=s*o{7$3nCxDuyP
zD{=!{@D4U%-U?&3;W#oDGlvi1A|_!3v+$^cEGk;cX4De)SjSKU`v7&Hi+yqigqmRo
z`r<go;aeDw7f=JbiktB}+rEOE^!rRyE>*;_{^XBw+lHN}9B9Kb?8dct(YD{l5Uzj5
z4xB^HtemIHdennEtbM2)7(^y*#;j*h1H2T^`s;?vG-yw5p{{>Ibu^DzxQNPyB=&)<
zHEz@v9Kwxw4%grhn2dkpR*YkRO0WlYD$b*l@k{H1hl;W>oJ>+jxz-L;hi~H~UPaAp
zFNsl&2QU{eV;(M|exFJ&+S?7NTympkz7>_cyOH!TeW?3AN2#zq<^*b~-$kv!S9sEg
zrA9qq4^Pz>Mo_;WLk(a8*W)ZQX|se{iAXZ73iD7C8Ah$tB))^cW3tZwVLtW1v#2fj
z5DRez^`Lv`#;AwA187B^f*w@T4qy!)L*0MVwlAXg_#f27Tq$02tWD^ge-9OQ!JI}t
za2oZ+E4UtKQSXB#RL6nzq7{oqCSlT1r=}X&CDV<X@hHBI)A$A!vCjwb2CAP@5~0yU
z#Z6^5zK?zw#BepBP$a=k8mhx$)Bx&H$=8Zn@>fv<d=Go^BW%T$+|+<Ws6D@hEQXo0
z`lPe|kJ7M)ibm9c+Uqv!Aa-;88ZvpaXpQCw=sF)Y;3m{ST98}JLDUMK!%Cb&P3SLc
zXohzy(=zP&&!WM_4TY$gRN@oZfUKT5i2?X2y6_6N;J2uApUPWF=3y{aq9#;}8b~ub
zNsP+15e&ugOx9mZbA|@pIEB3I%;%_%ZlkjNS5)?flMwuvGCp?TJ}kwraXSXE@io|t
z`|&&$V_cRuR~nGrF$31K9$UGN+KL5h0vEcj=HoLQLd`5Y+q<NNn9uc5)Br!ha9lvG
z*b@5U>KtzlC1D`f`51}CsONcVsc30-pq9KBIr3%_eNg2Y;%Q<p5k;sRA$AdsL>HmX
zwUR1Y$^VxMF0@^m`EucXWkz)VwXE&7wFzIcb#Z{;ed4?_HG0jcpXec2S?Bm^8<vZ<
zK-;6F+d>>Aiij|xgHR!5Odp|y45okQJx$%&uVj3lXeBtN&hdF1%L(o49^z#}MXRKu
z{a4vX=vAzv+)FH%DqB$kv%5~>si~WYpns>h_~djrTQKNtGA~%SVLCwyI3<Knj<9)!
zC~#VgIgEN&EEjF5UP^94`JtjeL@EP>j_o1B)5eF+u99Ymc#3$AC?j4ZRGJCBxt7Z&
zDjIklQEVGGqh3-mgc7WlAcdU&7al{ELPBpya?>fDdW65d(3?r+NupX6TlmZC{9RbS
zPNA~XUJP5G#d;!tX4LhIYi4`w7lFQA1E(SrZw7D7NzTbH%H1^cM`A&kUtL$%Ov1Wr
NLB2KZr|x7={s&x_`|<z)

delta 2752
zcmX}ue@vBC9LMoP{JwyKiZ==biQf={{7`-v3J5|fk^ve-#x)DX1f__|E;U+Z)+UxM
zSF5dzYQwoflVYvSKa6Jo2rFG}wyd>TxysgETgG~Sp6Ae+-{*CnbMJl5ukU%}oNw6Y
zzq};mRYN&MBoZMZ#*E>w;an)sdyI+27cc@(U>v@Kb@&lh;SIb6E2G@!v|$bR1DJtR
zn2z6}o*x=*Otvw8GfpL*hKm@A*RU4<MEziGj4}1tiDCF2^3RNO;VWhut8oUCFlv!8
zi!mED@G{hM8m)bp#{F@Or++g|<z^Z#AcHeMBmYc*%k3D-({x{i8bCEJ!v@rhJ5j$M
zvhAao!~Gcc<19XnwTxyfo<l8eJj=L~{!J2<JvfNLco}cSE0~M(s19<LxC5-gOzxX7
z0SA%Eo1@r)Z{ZHSfz8;m)LoG=Oy>R!uE2}vR|f$qTFO+Wr6pWt-GUm}Uexzyt@EfE
z=CE(eu?4-@iyFuXZp2aBe#!bfDu*KY5$R&$mb3n9NTfk~pN<<a7c+35ZGQzLxj%tj
z_%5=lCY)ZS7xkP>YXLfYkIc<9T02n#JYYW`_Okxki=(#TbyP<mVm?lya^MFfTTLAM
zprx<C)#$_9@HnR6C%6s2#dVm+{^(Toppx)8>o_V2=loRE(cjigGD;n`;s-c_npr*x
zu?g2;5e{Q9PNF`)irUlbs2Ru6tCBSxNduFI`d$^X3uY5)h5emWv{cXHXb>|&Js_K>
z=?CjjpVy%}Zo@o$5t*c!Lao3Bti!)h6R0H9v_d`j2EK_YSk6VyYe!bzZ+fYe(J+8|
z&?(%Ev#0?iuXM9M3zekB*oYfY-#=p8Ph$-CpQ2`V-g@1dkm}BSJ+j!Q6{B_j`>5!L
zhtQcB>by^(-UpwfmTV50gt>}3C6V;b?wCx}jH~f5_TkI;4?cp2*=P-13D5#DxEp;K
zO#fzvibnJ$lGx@aREPhf2C$UrDCv?>OJ0u};4bXJ{n&}$;C3wI%i8mokjb03t!Hr+
z_dlWrv@DDD*IuurB1>=&HXxHUr>%3=0BQgU90jUoHEQMBu@<{g6FFs_!3gfJpw9a*
z)&Ob(K{>4d9aLg-+`VkVQ0@<+elUa`ID$Io-&_AcJvfNBl4jyT4aAF@NIELX$}kEW
zQ7h7l`d&Bk4l{$ftiOlK5gLl{HB{D~N9Dpiwqh<fRrn0vjc2hDy=;6Rc3~yXp>iZP
z-%Y{-Yn$~c)E1nye&x57P+HIMK?!PR*HB9uz!Iz|a0l3ri?~0D<d>O5<;*1v!{0C#
z1E}YO7rHAFi(2V4<b)d^2BDvoG;4_Ugi13}?$q2%7d%O5xf+N&i4<a?ut3h6u@7|`
z9wRgWz5R9)D#|Gp`gBf?bHjxR`kl9$8nnEcQ7@53JU}QHn22+Xz}!WY5nAfU2@=^U
zZCrWp{9m-!+D>-K`Ts;8#1TqfZSPv*K4P=Z|2<S5C7KA{p3Z*v;}gUVVxin`D|Oa-
zs}d@N&~j@Fwh=13h#o?(X)U=<lnN<g_7fSzV)}Q=Uanh-3PNXgkYMYbbIohONh)yu
zOxuo1!VWc1_7OUEQN(V-M{Fb(3MuCNg>;i`&`T(q@Dlz5wowca4--l#C7sH>gc3(Z
z8L!gq;#@skYwZ0HmJ$bvEkrn>l11o+woo3V5=oHA>dMVf*-kt}1W$bI`Pwrv8b2L&
gtU2+Eh{EEO!qW1>;)&Fx(&&kf?9alFttfo|KX2CdV*mgE

diff --git a/languages/gls-woocommerce-nl_NL.po b/languages/gls-woocommerce-nl_NL.po
index 7f40ab0..5faeef9 100644
--- a/languages/gls-woocommerce-nl_NL.po
+++ b/languages/gls-woocommerce-nl_NL.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GLS for Woocommerce v1\n"
-"POT-Creation-Date: 2020-02-14 16:13+0100\n"
-"PO-Revision-Date: 2020-02-14 16:14+0100\n"
+"POT-Creation-Date: 2020-02-21 15:37+0100\n"
+"PO-Revision-Date: 2020-02-21 15:38+0100\n"
 "Last-Translator: \n"
 "Language-Team: TIG support@tig.nl\n"
 "Language: nl\n"
@@ -432,6 +432,14 @@ msgstr "Gratis verzenden aanzetten"
 msgid "Enable free shipping above an order amount"
 msgstr "Verzendkosten vervallen bij orderbedrag vanaf"
 
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:60
+msgid "No"
+msgstr "Nee"
+
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:60
+msgid "Yes"
+msgstr "Ja"
+
 #: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:65
 msgid "Apply free shipping above order amount"
 msgstr "Verzendkosten vervallen bij orderbedrag vanaf"
@@ -500,7 +508,7 @@ msgstr "Klonen verboden."
 msgid "Unserializing instances of this class is forbidden."
 msgstr "Unserializing instanties van deze klasse is verboden."
 
-#: includes/class-gls-delivery-options.php:412
+#: includes/class-gls-delivery-options.php:423
 msgid " (free shipping)"
 msgstr " (gratis verzenden)"
 
diff --git a/languages/gls-woocommerce.pot b/languages/gls-woocommerce.pot
index 5177b09..72fd70c 100644
--- a/languages/gls-woocommerce.pot
+++ b/languages/gls-woocommerce.pot
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-02-14 11:27+0100\n"
+"POT-Creation-Date: 2020-02-21 15:37+0100\n"
 "PO-Revision-Date: 2020-01-06 13:34+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -392,21 +392,37 @@ msgstr ""
 msgid "The \"%s\" delivery option is currently disabled"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:55
-msgid "Apply free shipping above order amount (0 = off)"
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:56
+msgid "Enable free shipping"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:57
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:58
+msgid "Enable free shipping above an order amount"
+msgstr ""
+
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:60
+msgid "No"
+msgstr ""
+
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:60
+msgid "Yes"
+msgstr ""
+
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:65
+msgid "Apply free shipping above order amount"
+msgstr ""
+
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:68
 msgid ""
 "Enter the order amount (excl. tax) above (and equal) which free shipping "
-"will be applied. 0 = free shipping turned off."
+"will be applied."
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:63
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:74
 msgid "Apply free shipping to extra services"
 msgstr ""
 
-#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:65
+#: includes/admin/settings/class-gls-settings-woocommerce-shipping-instance.php:76
 msgid ""
 "Enable this when extra service costs are also free when free shipping "
 "applies."
@@ -456,6 +472,10 @@ msgstr ""
 msgid "Unserializing instances of this class is forbidden."
 msgstr ""
 
+#: includes/class-gls-delivery-options.php:423
+msgid " (free shipping)"
+msgstr ""
+
 #: includes/options/class-gls-option-s12.php:41
 msgid "TimeDefiniteService (Saturday before 12.00 AM)"
 msgstr ""

From 7caecf18fd9a454b57e90c1e3b8ea41f8cca862f Mon Sep 17 00:00:00 2001
From: Robert Grundeken <robert.grundeken@tig.nl>
Date: Fri, 21 Feb 2020 16:52:32 +0100
Subject: [PATCH 3/7] fixed: add to cart freezes, when no chosen shipping
 method

---
 includes/class-gls-delivery-options.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/class-gls-delivery-options.php b/includes/class-gls-delivery-options.php
index 057361c..d1c7955 100644
--- a/includes/class-gls-delivery-options.php
+++ b/includes/class-gls-delivery-options.php
@@ -468,7 +468,7 @@ public static function get_shipping_method_instance_setting($setting_name)
         $current_shipping_method = $current_shipping_methods[$shipping_method_id[1]];
 
         //fallback; manual init instance to get to config settings
-        if (!isset($current_shipping_method)) {
+        if (!isset($current_shipping_method) && $chosen_shipping_method) {
             $current_shipping_method = $current_shipping_methods[$shipping_method_id[0]];
             $current_shipping_method->instance_id = $shipping_method_id[1];
             $current_shipping_method->init_instance_settings();

From dee44b614d96ad092bb0596be4a2cce8d987bcbf Mon Sep 17 00:00:00 2001
From: Jasper Smits <jasper.smits@tig.nl>
Date: Wed, 26 Feb 2020 11:19:39 +0100
Subject: [PATCH 4/7] GLS2L7 fix voor altijd shopreturnlabel

---
 includes/api/label/class-gls-api-label-create.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/api/label/class-gls-api-label-create.php b/includes/api/label/class-gls-api-label-create.php
index 88c7e0a..57518ea 100644
--- a/includes/api/label/class-gls-api-label-create.php
+++ b/includes/api/label/class-gls-api-label-create.php
@@ -126,7 +126,7 @@ public function setBody()
     private function map_services($details, $type = null, $countryCode = 'NL')
     {
         $service = [
-            "shopReturnService" => (bool) ($this->options['shop_return'] && $countryCode == 'NL')
+            "shopReturnService" => (bool) ($this->options['shop_return'] == 'yes' && $countryCode == 'NL')
         ];
         switch ($type) {
             case 'ParcelShop':

From db11746a7b4e7cb721df67268dc3a87dcf1afb0e Mon Sep 17 00:00:00 2001
From: Daan van den Bergh <daan.van.den.bergh@tig.nl>
Date: Fri, 28 Feb 2020 16:06:22 +0100
Subject: [PATCH 5/7] GLS2L-8: Entire $_POST array was being cleaned, even when
 $clean was set to false. Now works as expected.

---
 includes/class-gls.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/includes/class-gls.php b/includes/class-gls.php
index 5c714a4..7079a52 100644
--- a/includes/class-gls.php
+++ b/includes/class-gls.php
@@ -305,7 +305,11 @@ public function ajax_url()
      */
     public function post($key = null, $clean = true)
     {
-        if (!$key) {
+        if (!$key && !$clean) {
+            return wp_unslash($_POST);
+        }
+
+        if (!$key && $clean) {
             return wc_clean(wp_unslash($_POST));
         }
 

From 1eeeda962011a8423054c425845dad39427aa8df Mon Sep 17 00:00:00 2001
From: Robert Grundeken <robert.grundeken@tig.nl>
Date: Fri, 6 Mar 2020 00:33:57 +0100
Subject: [PATCH 6/7] Fix for missing email when creating labels

---
 includes/api/label/class-gls-api-label-create.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/includes/api/label/class-gls-api-label-create.php b/includes/api/label/class-gls-api-label-create.php
index 57518ea..52cb34e 100644
--- a/includes/api/label/class-gls-api-label-create.php
+++ b/includes/api/label/class-gls-api-label-create.php
@@ -90,6 +90,13 @@ public function setBody()
         $labelType        = $this->get_label_type();
         $shipmentId       = $order->ID;
 
+        // @todo fix correct email when stored. This fixes that sometimes emailaddresses are empty or incomplete
+        // which stops the label creation
+        if ($delivery_address['email'] != $order->get_billing_email()) {
+            $delivery_address['email'] = $order->get_billing_email();
+            $delivery_address['phone'] = $order->get_billing_phone();
+        }
+
         $data                      = GLS_Api::add_shipping_information();
         $data["services"]          = $this->map_services($delivery_option['details'], $delivery_option['type'], $delivery_address['countryCode']);
         $data["trackingLinkType"]  = 'u';

From b6bfdbdb923ade9efc848c47dba251bfc0923696 Mon Sep 17 00:00:00 2001
From: Robert Grundeken <robert.grundeken@tig.nl>
Date: Mon, 9 Mar 2020 13:35:27 +0100
Subject: [PATCH 7/7] Version Bump, Updated ReadMe's, Updated language packs

---
 composer.json                      |   2 +-
 gls-woocommerce.php                |   2 +-
 includes/class-gls.php             |   2 +-
 languages/gls-woocommerce-nl_NL.mo | Bin 12742 -> 12742 bytes
 languages/gls-woocommerce-nl_NL.po |   6 +++---
 languages/gls-woocommerce.pot      |   4 ++--
 readme.md                          |   3 +++
 readme.txt                         |   5 ++++-
 8 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 0c230c8..ab92499 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
   },
   "type": "woocommerce-plugin",
   "license": "CC-BY-NC-ND-3.0",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "authors": [
     {
       "name": "TIG",
diff --git a/gls-woocommerce.php b/gls-woocommerce.php
index 2817b85..9b17a31 100644
--- a/gls-woocommerce.php
+++ b/gls-woocommerce.php
@@ -4,7 +4,7 @@
  * Plugin Name: GLS for WooCommerce
  * Plugin URI: https://gls-group.eu/NL/nl/home
  * Description: GLS offers shipping solutions nationally and internationally in Europe and worldwide. By using this plugin you can integrate GLS shipping methods in WooCommerce.
- * Version: 1.1.3
+ * Version: 1.2.0
  * Author: TIG
  * Author URI: https://tig.nl/
  * License: GPL2v2 or later
diff --git a/includes/class-gls.php b/includes/class-gls.php
index 7079a52..9c1612c 100644
--- a/includes/class-gls.php
+++ b/includes/class-gls.php
@@ -44,7 +44,7 @@ final class GLS
      *
      * @var string
      */
-    public $version = '1.1.3';
+    public $version = '1.2.0';
 
     /**
      * The single instance of the class.
diff --git a/languages/gls-woocommerce-nl_NL.mo b/languages/gls-woocommerce-nl_NL.mo
index 985c61e5981b6c3217fd5365c68908bed5dcce10..2e284c64c8d499c25c4ad41f038305892ac6ea92 100644
GIT binary patch
delta 23
ecmX?>d@Ol`ge;e_u7Rb3p|O>*$z~<lB_aS_bq3l1

delta 23
ecmX?>d@Ol`ge;elu92aFp{bRz#bzbhB_aS_N(R{g

diff --git a/languages/gls-woocommerce-nl_NL.po b/languages/gls-woocommerce-nl_NL.po
index 5faeef9..f973f98 100644
--- a/languages/gls-woocommerce-nl_NL.po
+++ b/languages/gls-woocommerce-nl_NL.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GLS for Woocommerce v1\n"
-"POT-Creation-Date: 2020-02-21 15:37+0100\n"
-"PO-Revision-Date: 2020-02-21 15:38+0100\n"
+"POT-Creation-Date: 2020-03-09 13:34+0100\n"
+"PO-Revision-Date: 2020-03-09 13:34+0100\n"
 "Last-Translator: \n"
 "Language-Team: TIG support@tig.nl\n"
 "Language: nl\n"
@@ -472,7 +472,7 @@ msgstr "Postcode en/of land niet opgegeven."
 msgid "No postcode specified."
 msgstr "Geen postcode opgegeven."
 
-#: includes/api/label/class-gls-api-label-create.php:178
+#: includes/api/label/class-gls-api-label-create.php:185
 msgid "Your order is sent."
 msgstr "Uw order is verstuurd."
 
diff --git a/languages/gls-woocommerce.pot b/languages/gls-woocommerce.pot
index 72fd70c..b190ad7 100644
--- a/languages/gls-woocommerce.pot
+++ b/languages/gls-woocommerce.pot
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-02-21 15:37+0100\n"
+"POT-Creation-Date: 2020-03-09 13:34+0100\n"
 "PO-Revision-Date: 2020-01-06 13:34+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -436,7 +436,7 @@ msgstr ""
 msgid "No postcode specified."
 msgstr ""
 
-#: includes/api/label/class-gls-api-label-create.php:178
+#: includes/api/label/class-gls-api-label-create.php:185
 msgid "Your order is sent."
 msgstr ""
 
diff --git a/readme.md b/readme.md
index b2d7d33..9620ea9 100644
--- a/readme.md
+++ b/readme.md
@@ -45,6 +45,9 @@ Tracking links and PDF Labels are automatically included in the WooCommerce orde
 ### ShopReturnService
 * Automatically include a return label with every requested shipping label.
 
+### Free Shipping
+* Setup free shipping above an order amount per shipping destination.
+
 ## Installation
 
 ### WordPress.org Repository
diff --git a/readme.txt b/readme.txt
index 4c35c6f..1d478ed 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Requires at least: 4.6
 Tested up to: 5.3
 WC Tested up to: 3.9
 Requires PHP: 7.1
-Stable tag: 1.1.3
+Stable tag: 1.2.0
 License: CC-BY-NC-ND-3.0
 License URI: http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
 
@@ -39,6 +39,9 @@ To use this plugin you need to be a business customer of [GLS Netherlands](https
 * **FlexDeliveryService**: The recipient can choose an alternative delivery option before the first delivery attempt.
 * **ShopReturnService**: Automatically include a return label with every requested shipping label.
 
+= Free Shipping =
+* Setup free shipping above an order amount per shipping destination.
+
 == Installation ==
 
 1. From your WordPress admin area, go to: *Plugins > Add new*.