Changeset 2415872

Timestamp:

11/10/2020 02:27:26 PM (5 years ago)

Author:

posturinn

Message:

Tagging version 1.0.8

Location:

posturinn

Files:

• tags/1.0.8 (copied) (copied from posturinn/trunk)
• tags/1.0.8/inc/admin.php (modified) (5 diffs)
• tags/1.0.8/inc/functions.php (modified) (1 diff)
• tags/1.0.8/languages/postis-is_IS.mo (modified) (previous)
• tags/1.0.8/languages/postis-is_IS.po (modified) (4 diffs)
• tags/1.0.8/languages/postis.pot (modified) (1 diff)
• tags/1.0.8/readme.txt (modified) (2 diffs)
• tags/1.0.8/wc-posturinn-shipping-api.php (modified) (3 diffs)
• trunk/inc/admin.php (modified) (5 diffs)
• trunk/inc/functions.php (modified) (1 diff)
• trunk/languages/postis-is_IS.mo (modified) (previous)
• trunk/languages/postis-is_IS.po (modified) (4 diffs)
• trunk/languages/postis.pot (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)
• trunk/wc-posturinn-shipping-api.php (modified) (3 diffs)

posturinn/tags/1.0.8/inc/admin.php

@@ -313 +313 @@
         
     }else{
-        // if (substr($customer_phone, 0, 1) === '6' || substr($customer_phone, 0, 1) === '7' || substr($customer_phone, 0, 1) === '8') {
-            
-        // } else {
-        //     $customer_phone = '';
-        // }
+        if ($shipping_service == 'DPP' OR $shipping_service == 'DPH') {
+            if (substr($customer_phone, 0, 1) === '6' || substr($customer_phone, 0, 1) === '7' || substr($customer_phone, 0, 1) === '8') {
+                // phoneNumber is valid
+            } else {
+                $valid_phonenumber = '';
+            }
+        }
         $recipeint = array( 'name'         => $shipping_customerName,
                             'addressLine1' => $shipping_address1,
@@ -454 +456 @@
     if ($automatic_printing == 'yes') {
         $print_response = wp_remote_post( $print_query, $print_headers );
-        // postis_pa($print_response);
-    }
+        
+        $print_response_code = wp_remote_retrieve_response_code( $print_response );
+        
+        if ($print_response_code == 204 ) {
+            update_post_meta( $order_id, 'postis_is_shipment_printed', 'printed' );
+        }else{
+            update_post_meta( $order_id, 'postis_is_shipment_printed', 'not_printed' );
+        }
+    }
+    
+    // postis_pa($print_response_code); exit;
     
     
@@ -572 +583 @@
             
             if ($shipment_status == true && $get_shipment_meta != '') {
-                echo '<a class="button button-primary" href="'.esc_url($pdf_url).'" target="'.esc_attr($open_pdf_status).'">'. __("Get PDF", "postis").'</a>';
+                
+                $print_status = get_post_meta( $order_id, 'postis_is_shipment_printed', true );
+                
+                if ($print_status == 'printed') {
+                    $tooltip = __('Shipment Printed', 'postis');
+                    $icon = '<span data-tip="'.esc_attr($tooltip).'" class="tips dashicons dashicons-yes" style="color:#00ff00;margin-top: 4px;"></span>';
+                }else{
+                    $icon = '';
+                }
+                
+                echo '<a class="button button-primary" href="'.esc_url($pdf_url).'" target="'.esc_attr($open_pdf_status).'">'. __("Get PDF", "postis"). $icon .'</a>';
             }else{
                 echo '--';
@@ -581 +602 @@
 
 
-function postis_get_shipment_data($order_id, $shipmet_key){
-    
-    $shipment_meta = get_post_meta($order_id, 'postis_shipment_meta', true );
+// function postis_get_shipment_data($order_id, $shipmet_key){
+    
+//     $shipment_meta = get_post_meta($order_id, 'postis_shipment_meta', true );
      
-    $postval       = isset($shipment_meta[$shipmet_key]) ? $shipment_meta[$shipmet_key] : '';
-    
-    return $postval;
-}
+//     $postval       = isset($shipment_meta[$shipmet_key]) ? $shipment_meta[$shipmet_key] : '';
+    
+//     return $postval;
+// }
 
 add_action( 'woocommerce_product_options_shipping', 'postis_product_custom_field' );
@@ -626 +647 @@
     update_post_meta($post_id, 'descriptionOfContents', sanitize_text_field($descContents));
 }
+
+add_filter( 'bulk_actions-edit-shop_order', 'postis_order_bulk_action_option', 20, 1 );
+function postis_order_bulk_action_option( $actions ) {
+    $actions['create_shipment'] = __( 'CreateShipment', 'postis' );
+    $actions['print_shipment'] = __( 'PrintShipments', 'postis' );
+    return $actions;
+}
+
+add_filter( 'handle_bulk_actions-edit-shop_order', 'postis_bulk_action_process', 10, 3 );
+function postis_bulk_action_process( $redirect_to, $action, $post_ids ) {
+    // if ( $action !== 'create_shipment' || $action !== 'print_shipment')
+    //     return $redirect_to;
+
+    $processed_ids = array();
+    $recipeint = array();
+    
+    $postis_apikey = postis_get_settings( 'apikey' );
+    $domain = $_SERVER['HTTP_HOST'];
+    $endpoint_url = postis_get_endpoints( 'create_shipment' );
+    
+    if ($action === 'create_shipment') {
+        
+        foreach ( $post_ids as $post_id ) {
+            
+            $order = wc_get_order( $post_id );
+            $ship_methods          = $order->get_shipping_methods(); 
+            $shipping_customerName = $order->get_formatted_shipping_full_name();
+            $shipping_address1     = $order->get_shipping_address_1();
+            $shipping_postcode     = $order->get_shipping_postcode();
+            $country_code          = $order->get_shipping_country();
+            $city                  = $order->get_shipping_city();
+            $customer_email        = $order->get_billing_email();
+            $customer_phone        = $order->get_billing_phone();
+            
+            $shipping_service      = get_post_meta( $post_id, 'postis_shipping_method', true );
+            
+            $recipeint = array( 'name'         => $shipping_customerName,
+                                'addressLine1' => $shipping_address1,
+                                "postcode"     => $shipping_postcode,
+                                "countryCode"  => $country_code,
+                                "mobilePhone"  => $customer_phone,
+                            );
+                            
+            $recipeint['email'] =  $customer_email;
+            $options = array('deliveryServiceId' => $shipping_service);
+            $params = array(
+                    'recipient'                => $recipeint,
+                    'options'                  => $options,
+                );
+            
+            $order_data = $order->get_data();
+            
+            $params = array_filter( $params );
+        
+            // postis_pa($params); exit;
+            
+            // Set Header
+            $headers = array(
+                    'headers'     => array('Content-Type' => 'application/json; charset=utf-8', 'x-api-key'=>$postis_apikey,'domain_name'=> $domain),
+                    'body'        => json_encode($params),
+                    'method'      => 'POST',
+                    'data_format' => 'body',
+                );
+                    
+            // Run the query
+            $response = wp_remote_post( $endpoint_url, $headers );
+            $get_shipment_meta = json_decode( $response['body'], true );
+            
+            
+            // postis_pa($get_shipment_meta); exit;
+            
+            if(  $response['response']['code'] != 400 && $response['response']['code'] != 401 ) {
+            
+                update_post_meta( $post_id, 'postis_shipment_meta', $get_shipment_meta );
+                
+                $ajax_response = array('status'=>'success', 'message'=> __('Shipment Created Successfully', 'postis'));
+                $res_msg = 'created';
+                
+            }else{
+                $resp_message  = sprintf( __("Shipment Not Created.\nServer Response: %s", "postis"), $get_shipment_meta['message'] );
+                $res_msg = 'failed';
+                
+                if (strpos($get_shipment_meta['message'], 'Ekki var hægt að skrá sendingu (Addressee.Gsm') !== false) {
+                    $ajax_response = array('status'=>'error', 'type'=>'phonenumber', 'message'=> $resp_message );
+                } else {
+                    $ajax_response = array('status'=>'error', 'type'=>'other', 'message'=> $resp_message );
+                }
+                
+            }
+            
+            $processed_ids[] = $post_id;
+        }
+    }else if($action === 'print_shipment'){
+        foreach ( $post_ids as $post_id ) {
+            
+            $shipmentId         =  postis_get_shipment_data($post_id, 'shipmentId');
+            
+            $print_endpoint = postis_get_endpoints( 'print' );
+            $print_params = array(
+                'shipmentId' => $shipmentId,
+                'outputFormat'      => 'poststod'
+            );
+            $print_params = array_filter( $print_params );
+            
+            
+            // Query format parameters.
+            $print_query = add_query_arg( $print_params, $print_endpoint );
+            
+            // Set Header
+            $print_headers = array(
+                    'headers'     => array('x-api-key'=>$postis_apikey, 'domain_name'=> $domain),
+                    //'body'        => json_encode($print_params),
+                    'method'      => 'POST',
+                    // 'data_format' => 'body',
+                );
+            // postis_pa($print_headers);   
+                    
+            // Run the query
+            $automatic_printing = postis_get_settings( 'pdf_print' );
+            if ($automatic_printing == 'yes') {
+                $print_response = wp_remote_post( $print_query, $print_headers );
+                
+                $print_response_code = wp_remote_retrieve_response_code( $print_response );
+                    
+                if ($print_response_code == 204 ) {
+                    update_post_meta( $post_id, 'postis_is_shipment_printed', 'printed' );
+                }else{
+                    update_post_meta( $post_id, 'postis_is_shipment_printed', 'not_printed' );
+                }
+                
+                // postis_pa($print_response); exit;
+            }
+            
+        }
+    }else{
+        return $redirect_to;
+    }
+
+    return $redirect_to = add_query_arg( array(
+        'processed_count' => count( $processed_ids ),
+        'status' => $res_msg,
+    ), $redirect_to );
+}
+
+if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
+
+    // adds the coupon filtering dropdown to the orders page
+    add_action( 'restrict_manage_posts', 'filter_orders_by_coupon_used' );
+
+    // makes coupons filterable
+//  add_filter( 'posts_join',  'add_order_items_join' );
+//  add_filter( 'posts_where', 'add_filterable_where' );
+
+    add_filter( 'request', 'filter_orders_by_payment_method_query' );   
+}
+
+function filter_orders_by_coupon_used() {
+    global $typenow;
+
+    if ( 'shop_order' === $typenow ) {
+
+        ?>
+        <select name="postis_shipment_print_status" id="postis_shipment_print_status">
+            <option value=""><?php esc_html_e( 'Shipment Print Status', 'postis' ); ?></option>
+            <option value="printed"><?php esc_html_e( 'Printed', 'postis' ); ?></option>
+            <option value="not_printed"><?php esc_html_e( 'Not printed', 'postis' ); ?></option>
+        </select>
+        <?php
+    }
+}
+
+function filter_orders_by_payment_method_query( $vars ) {
+    global $typenow;
+
+    if ( 'shop_order' === $typenow && isset( $_GET['postis_shipment_print_status'] ) && ! empty( $_GET['postis_shipment_print_status'] ) ) {
+
+        $vars['meta_key']   = 'postis_is_shipment_printed';
+        $vars['meta_value'] = wc_clean( $_GET['postis_shipment_print_status'] );
+    }
+
+    return $vars;
+}

posturinn/tags/1.0.8/inc/functions.php

@@ -390 +390 @@
    return apply_filters('postis_international_contents_fields',$options);
 }
+
+function postis_get_shipment_data($order_id, $shipmet_key){
+    
+    $shipment_meta = get_post_meta($order_id, 'postis_shipment_meta', true );
+     
+    $postval       = isset($shipment_meta[$shipmet_key]) ? $shipment_meta[$shipmet_key] : '';
+    
+    return $postval;
+}

posturinn/tags/1.0.8/languages/postis-is_IS.po

@@ -3 +3 @@
 "Project-Id-Version: Pósturinn's Shipping with WooCommerce\n"
 "POT-Creation-Date: 2020-06-24 12:20+0000\n"
-"PO-Revision-Date: 2020-07-01 08:38+0000\n"
+"PO-Revision-Date: 2020-11-10 13:33+0000\n"
 "Last-Translator: Aron Hallsson <[email protected]>\n"
 "Language-Team: Aron Hallsson <[email protected]>\n"
@@ -11 +11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n%10==1 && n%100!=11);\n"
-"X-Generator: Poedit 2.3.1\n"
+"X-Generator: Poedit 2.4.1\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-Flags-xgettext: --add-comments=translators:\n"
@@ -21 +21 @@
 "X-Poedit-SearchPathExcluded-0: *.min.js\n"
 
+#: inc/admin.php:813
+msgid "Shipment Print Status"
+msgstr "Prent staða"
+
+#: inc/admin.php:814
+msgid "Printed"
+msgstr "Prentað"
+
+#: inc/admin.php:815
+msgid "Not printed"
+msgstr "Ekki prentað"
+
+#: inc/admin.class.php:534
+msgid "Create Shipments"
+msgstr "Búa til sendingarmiða"
+
+#: inc/admin.class.php:535
+msgid "Print Shipment PDF"
+msgstr "Prenta sendingarmiða"
+
+#: inc/admin.class.php:536
+msgid "Mark as printed"
+msgstr "Merkja sem prentað"
+
+#: inc/admin.class.php:537
+msgid "Mark as not printed"
+msgstr "Merkja sem EKKI prentað"
+
+
+#: inc/admin.class.php:685
+msgid "Tarriff Number"
+msgstr "Tollnúmer"
+
+#: inc/admin.class.php:688
+msgid "Tarriff Number. Needs to be 6 or 8 numbers"
+msgstr "Tollnúmer. Þarf að vera 6 eða 8 tölustafir"
+
+#: inc/admin.class.php:694
+msgid "Description in english"
+msgstr "Lýsing tollvöru á ensku"
+
+#: inc/admin.class.php:697
+msgid "This needs to be written in english!"
+msgstr "Þetta þarf að vera skrifað á ensku!"
+
+
+
 #: inc/postis.class.php:125
 msgid "Use Shipping Price"
@@ -31 +78 @@
 #: inc/postis.class.php:133
 msgid "Include Woocommerce VAT"
-msgstr "Reikna með Woocommerce VSK útreikning."
+msgstr "Reikna með Woocommerce VSK útreikning"
 
 #: inc/postis.class.php:137

posturinn/tags/1.0.8/languages/postis.pot

@@ -23 +23 @@
 
 
+
+
+
+#: inc/admin.php:813
+msgid "Shipment Print Status"
+msgstr ""
+
+#: inc/admin.php:814
+msgid "Printed"
+msgstr ""
+
+#: inc/admin.php:815
+msgid "Not printed"
+msgstr ""
+
+
+
+#: inc/admin.class.php:534
+msgid "Create Shipments"
+msgstr ""
+
+#: inc/admin.class.php:535
+msgid "Print Shipment PDF"
+msgstr ""
+
+#: inc/admin.class.php:536
+msgid "Mark as printed"
+msgstr ""
+
+#: inc/admin.class.php:537
+msgid "Mark as not printed"
+msgstr ""
+
+
+
+
+
+#: inc/admin.class.php:685
+msgid "Tarriff Number"
+msgstr ""
+
+#: inc/admin.class.php:688
+msgid "Tarriff Number. Needs to be 6 or 8 numbers"
+msgstr ""
+
+#: inc/admin.class.php:694
+msgid "Description in english"
+msgstr ""
+
+#: inc/admin.class.php:697
+msgid "This needs to be written in english!"
+msgstr ""
+
+
+
+
+
+
 #: templates/shipment-options.php:58
 msgid "Extra Options"

posturinn/tags/1.0.8/readme.txt

@@ -3 +3 @@
 Tags: shipping, posturinn, icelandic post shipping, shipping rates, woocommerce
 Requires at least: 4.3
-Tested up to: 5.5.1
+Tested up to: 5.5.3
 Requires PHP: 5.6
 Stable tag: trunk
@@ -26 +26 @@
 
 == Changelog ==
+= 1.0.8 =
+Add bulk actions for createShipment
+Add bulk actions for printing shipments
+Add bulk actions for marking shipments as printed or not printed
+Add filter by printed or not printed
+Add admin class
+Fixed phoneNumber issue on DPP and DPH shipments
+
+
 = 1.0.7 =
 Add postbox sort by nearest postcode

posturinn/tags/1.0.8/wc-posturinn-shipping-api.php

@@ -3 +3 @@
  * Plugin Name: Pósturinn's Shipping with WooCommerce
  * Description: This plugin is an WooCommerce extension to extend shipping method with Pósturinn's - Iceland
- * Version: 1.0.7
+ * Version: 1.0.8
  * Author: Pósturinn
  * Author URI: https://postur.is
@@ -34 +34 @@
 include plugin_dir_path(__FILE__).'inc/functions.php';
 include plugin_dir_path(__FILE__).'inc/callbacks.php';
-include plugin_dir_path(__FILE__).'inc/admin.php';
+include plugin_dir_path(__FILE__).'inc/admin.class.php';
+// include plugin_dir_path(__FILE__).'inc/admin.php';
 include plugin_dir_path(__FILE__).'inc/checkout-fields.class.php';
 
@@ -131 +132 @@
     $pdf->Output();
 }
+
+function postis_merge_pdf_files($pdf_files, $pdf_path){
+    $pdf_width         = postis_get_settings( 'pdf_width' );
+    $pdf_height        = postis_get_settings( 'pdf_height' );
+    $pdf_rotate        = postis_get_settings( 'pdf_rotate' );
+    $pdf_orientation   = postis_get_settings( 'pdf_orientation' );
+    $pdf_moveright     = postis_get_settings( 'pdf_moveright' );
+    $pdf_movedown      = postis_get_settings( 'pdf_movedown' );
+    $pdf_biggerbarcode = postis_get_settings( 'pdf_biggerbarcode' );
+    $pdf_size   = array($pdf_width, $pdf_height, 'Rotate' => $pdf_rotate);
+    
+    $pdf = new FPDI();
+
+    foreach ($pdf_files as $file) {
+        
+        if (!empty($file)) {
+            
+            $pageCount = $pdf->setSourceFile($file);
+            
+            for ($pageNo = 1; $pageNo <= $pageCount; $pageNo++) {
+                
+                // import a page
+                $templateId = $pdf->importPage($pageNo);
+                
+                $pdf->AddPage($pdf_orientation,$pdf_size);
+        
+                $pdf->useTemplate($templateId, $pdf_moveright, $pdf_movedown, $pdf_biggerbarcode);
+            }
+        }
+    }
+    
+    $pdf->Output($pdf_path,"F");
+}

posturinn/trunk/inc/admin.php

@@ -313 +313 @@
         
     }else{
-        // if (substr($customer_phone, 0, 1) === '6' || substr($customer_phone, 0, 1) === '7' || substr($customer_phone, 0, 1) === '8') {
-            
-        // } else {
-        //     $customer_phone = '';
-        // }
+        if ($shipping_service == 'DPP' OR $shipping_service == 'DPH') {
+            if (substr($customer_phone, 0, 1) === '6' || substr($customer_phone, 0, 1) === '7' || substr($customer_phone, 0, 1) === '8') {
+                // phoneNumber is valid
+            } else {
+                $valid_phonenumber = '';
+            }
+        }
         $recipeint = array( 'name'         => $shipping_customerName,
                             'addressLine1' => $shipping_address1,
@@ -454 +456 @@
     if ($automatic_printing == 'yes') {
         $print_response = wp_remote_post( $print_query, $print_headers );
-        // postis_pa($print_response);
-    }
+        
+        $print_response_code = wp_remote_retrieve_response_code( $print_response );
+        
+        if ($print_response_code == 204 ) {
+            update_post_meta( $order_id, 'postis_is_shipment_printed', 'printed' );
+        }else{
+            update_post_meta( $order_id, 'postis_is_shipment_printed', 'not_printed' );
+        }
+    }
+    
+    // postis_pa($print_response_code); exit;
     
     
@@ -572 +583 @@
             
             if ($shipment_status == true && $get_shipment_meta != '') {
-                echo '<a class="button button-primary" href="'.esc_url($pdf_url).'" target="'.esc_attr($open_pdf_status).'">'. __("Get PDF", "postis").'</a>';
+                
+                $print_status = get_post_meta( $order_id, 'postis_is_shipment_printed', true );
+                
+                if ($print_status == 'printed') {
+                    $tooltip = __('Shipment Printed', 'postis');
+                    $icon = '<span data-tip="'.esc_attr($tooltip).'" class="tips dashicons dashicons-yes" style="color:#00ff00;margin-top: 4px;"></span>';
+                }else{
+                    $icon = '';
+                }
+                
+                echo '<a class="button button-primary" href="'.esc_url($pdf_url).'" target="'.esc_attr($open_pdf_status).'">'. __("Get PDF", "postis"). $icon .'</a>';
             }else{
                 echo '--';
@@ -581 +602 @@
 
 
-function postis_get_shipment_data($order_id, $shipmet_key){
-    
-    $shipment_meta = get_post_meta($order_id, 'postis_shipment_meta', true );
+// function postis_get_shipment_data($order_id, $shipmet_key){
+    
+//     $shipment_meta = get_post_meta($order_id, 'postis_shipment_meta', true );
      
-    $postval       = isset($shipment_meta[$shipmet_key]) ? $shipment_meta[$shipmet_key] : '';
-    
-    return $postval;
-}
+//     $postval       = isset($shipment_meta[$shipmet_key]) ? $shipment_meta[$shipmet_key] : '';
+    
+//     return $postval;
+// }
 
 add_action( 'woocommerce_product_options_shipping', 'postis_product_custom_field' );
@@ -626 +647 @@
     update_post_meta($post_id, 'descriptionOfContents', sanitize_text_field($descContents));
 }
+
+add_filter( 'bulk_actions-edit-shop_order', 'postis_order_bulk_action_option', 20, 1 );
+function postis_order_bulk_action_option( $actions ) {
+    $actions['create_shipment'] = __( 'CreateShipment', 'postis' );
+    $actions['print_shipment'] = __( 'PrintShipments', 'postis' );
+    return $actions;
+}
+
+add_filter( 'handle_bulk_actions-edit-shop_order', 'postis_bulk_action_process', 10, 3 );
+function postis_bulk_action_process( $redirect_to, $action, $post_ids ) {
+    // if ( $action !== 'create_shipment' || $action !== 'print_shipment')
+    //     return $redirect_to;
+
+    $processed_ids = array();
+    $recipeint = array();
+    
+    $postis_apikey = postis_get_settings( 'apikey' );
+    $domain = $_SERVER['HTTP_HOST'];
+    $endpoint_url = postis_get_endpoints( 'create_shipment' );
+    
+    if ($action === 'create_shipment') {
+        
+        foreach ( $post_ids as $post_id ) {
+            
+            $order = wc_get_order( $post_id );
+            $ship_methods          = $order->get_shipping_methods(); 
+            $shipping_customerName = $order->get_formatted_shipping_full_name();
+            $shipping_address1     = $order->get_shipping_address_1();
+            $shipping_postcode     = $order->get_shipping_postcode();
+            $country_code          = $order->get_shipping_country();
+            $city                  = $order->get_shipping_city();
+            $customer_email        = $order->get_billing_email();
+            $customer_phone        = $order->get_billing_phone();
+            
+            $shipping_service      = get_post_meta( $post_id, 'postis_shipping_method', true );
+            
+            $recipeint = array( 'name'         => $shipping_customerName,
+                                'addressLine1' => $shipping_address1,
+                                "postcode"     => $shipping_postcode,
+                                "countryCode"  => $country_code,
+                                "mobilePhone"  => $customer_phone,
+                            );
+                            
+            $recipeint['email'] =  $customer_email;
+            $options = array('deliveryServiceId' => $shipping_service);
+            $params = array(
+                    'recipient'                => $recipeint,
+                    'options'                  => $options,
+                );
+            
+            $order_data = $order->get_data();
+            
+            $params = array_filter( $params );
+        
+            // postis_pa($params); exit;
+            
+            // Set Header
+            $headers = array(
+                    'headers'     => array('Content-Type' => 'application/json; charset=utf-8', 'x-api-key'=>$postis_apikey,'domain_name'=> $domain),
+                    'body'        => json_encode($params),
+                    'method'      => 'POST',
+                    'data_format' => 'body',
+                );
+                    
+            // Run the query
+            $response = wp_remote_post( $endpoint_url, $headers );
+            $get_shipment_meta = json_decode( $response['body'], true );
+            
+            
+            // postis_pa($get_shipment_meta); exit;
+            
+            if(  $response['response']['code'] != 400 && $response['response']['code'] != 401 ) {
+            
+                update_post_meta( $post_id, 'postis_shipment_meta', $get_shipment_meta );
+                
+                $ajax_response = array('status'=>'success', 'message'=> __('Shipment Created Successfully', 'postis'));
+                $res_msg = 'created';
+                
+            }else{
+                $resp_message  = sprintf( __("Shipment Not Created.\nServer Response: %s", "postis"), $get_shipment_meta['message'] );
+                $res_msg = 'failed';
+                
+                if (strpos($get_shipment_meta['message'], 'Ekki var hægt að skrá sendingu (Addressee.Gsm') !== false) {
+                    $ajax_response = array('status'=>'error', 'type'=>'phonenumber', 'message'=> $resp_message );
+                } else {
+                    $ajax_response = array('status'=>'error', 'type'=>'other', 'message'=> $resp_message );
+                }
+                
+            }
+            
+            $processed_ids[] = $post_id;
+        }
+    }else if($action === 'print_shipment'){
+        foreach ( $post_ids as $post_id ) {
+            
+            $shipmentId         =  postis_get_shipment_data($post_id, 'shipmentId');
+            
+            $print_endpoint = postis_get_endpoints( 'print' );
+            $print_params = array(
+                'shipmentId' => $shipmentId,
+                'outputFormat'      => 'poststod'
+            );
+            $print_params = array_filter( $print_params );
+            
+            
+            // Query format parameters.
+            $print_query = add_query_arg( $print_params, $print_endpoint );
+            
+            // Set Header
+            $print_headers = array(
+                    'headers'     => array('x-api-key'=>$postis_apikey, 'domain_name'=> $domain),
+                    //'body'        => json_encode($print_params),
+                    'method'      => 'POST',
+                    // 'data_format' => 'body',
+                );
+            // postis_pa($print_headers);   
+                    
+            // Run the query
+            $automatic_printing = postis_get_settings( 'pdf_print' );
+            if ($automatic_printing == 'yes') {
+                $print_response = wp_remote_post( $print_query, $print_headers );
+                
+                $print_response_code = wp_remote_retrieve_response_code( $print_response );
+                    
+                if ($print_response_code == 204 ) {
+                    update_post_meta( $post_id, 'postis_is_shipment_printed', 'printed' );
+                }else{
+                    update_post_meta( $post_id, 'postis_is_shipment_printed', 'not_printed' );
+                }
+                
+                // postis_pa($print_response); exit;
+            }
+            
+        }
+    }else{
+        return $redirect_to;
+    }
+
+    return $redirect_to = add_query_arg( array(
+        'processed_count' => count( $processed_ids ),
+        'status' => $res_msg,
+    ), $redirect_to );
+}
+
+if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
+
+    // adds the coupon filtering dropdown to the orders page
+    add_action( 'restrict_manage_posts', 'filter_orders_by_coupon_used' );
+
+    // makes coupons filterable
+//  add_filter( 'posts_join',  'add_order_items_join' );
+//  add_filter( 'posts_where', 'add_filterable_where' );
+
+    add_filter( 'request', 'filter_orders_by_payment_method_query' );   
+}
+
+function filter_orders_by_coupon_used() {
+    global $typenow;
+
+    if ( 'shop_order' === $typenow ) {
+
+        ?>
+        <select name="postis_shipment_print_status" id="postis_shipment_print_status">
+            <option value=""><?php esc_html_e( 'Shipment Print Status', 'postis' ); ?></option>
+            <option value="printed"><?php esc_html_e( 'Printed', 'postis' ); ?></option>
+            <option value="not_printed"><?php esc_html_e( 'Not printed', 'postis' ); ?></option>
+        </select>
+        <?php
+    }
+}
+
+function filter_orders_by_payment_method_query( $vars ) {
+    global $typenow;
+
+    if ( 'shop_order' === $typenow && isset( $_GET['postis_shipment_print_status'] ) && ! empty( $_GET['postis_shipment_print_status'] ) ) {
+
+        $vars['meta_key']   = 'postis_is_shipment_printed';
+        $vars['meta_value'] = wc_clean( $_GET['postis_shipment_print_status'] );
+    }
+
+    return $vars;
+}

posturinn/trunk/inc/functions.php

@@ -390 +390 @@
    return apply_filters('postis_international_contents_fields',$options);
 }
+
+function postis_get_shipment_data($order_id, $shipmet_key){
+    
+    $shipment_meta = get_post_meta($order_id, 'postis_shipment_meta', true );
+     
+    $postval       = isset($shipment_meta[$shipmet_key]) ? $shipment_meta[$shipmet_key] : '';
+    
+    return $postval;
+}

posturinn/trunk/languages/postis-is_IS.po

@@ -3 +3 @@
 "Project-Id-Version: Pósturinn's Shipping with WooCommerce\n"
 "POT-Creation-Date: 2020-06-24 12:20+0000\n"
-"PO-Revision-Date: 2020-07-01 08:38+0000\n"
+"PO-Revision-Date: 2020-11-10 13:33+0000\n"
 "Last-Translator: Aron Hallsson <[email protected]>\n"
 "Language-Team: Aron Hallsson <[email protected]>\n"
@@ -11 +11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n%10==1 && n%100!=11);\n"
-"X-Generator: Poedit 2.3.1\n"
+"X-Generator: Poedit 2.4.1\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-Flags-xgettext: --add-comments=translators:\n"
@@ -21 +21 @@
 "X-Poedit-SearchPathExcluded-0: *.min.js\n"
 
+#: inc/admin.php:813
+msgid "Shipment Print Status"
+msgstr "Prent staða"
+
+#: inc/admin.php:814
+msgid "Printed"
+msgstr "Prentað"
+
+#: inc/admin.php:815
+msgid "Not printed"
+msgstr "Ekki prentað"
+
+#: inc/admin.class.php:534
+msgid "Create Shipments"
+msgstr "Búa til sendingarmiða"
+
+#: inc/admin.class.php:535
+msgid "Print Shipment PDF"
+msgstr "Prenta sendingarmiða"
+
+#: inc/admin.class.php:536
+msgid "Mark as printed"
+msgstr "Merkja sem prentað"
+
+#: inc/admin.class.php:537
+msgid "Mark as not printed"
+msgstr "Merkja sem EKKI prentað"
+
+
+#: inc/admin.class.php:685
+msgid "Tarriff Number"
+msgstr "Tollnúmer"
+
+#: inc/admin.class.php:688
+msgid "Tarriff Number. Needs to be 6 or 8 numbers"
+msgstr "Tollnúmer. Þarf að vera 6 eða 8 tölustafir"
+
+#: inc/admin.class.php:694
+msgid "Description in english"
+msgstr "Lýsing tollvöru á ensku"
+
+#: inc/admin.class.php:697
+msgid "This needs to be written in english!"
+msgstr "Þetta þarf að vera skrifað á ensku!"
+
+
+
 #: inc/postis.class.php:125
 msgid "Use Shipping Price"
@@ -31 +78 @@
 #: inc/postis.class.php:133
 msgid "Include Woocommerce VAT"
-msgstr "Reikna með Woocommerce VSK útreikning."
+msgstr "Reikna með Woocommerce VSK útreikning"
 
 #: inc/postis.class.php:137

posturinn/trunk/languages/postis.pot

@@ -23 +23 @@
 
 
+
+
+
+#: inc/admin.php:813
+msgid "Shipment Print Status"
+msgstr ""
+
+#: inc/admin.php:814
+msgid "Printed"
+msgstr ""
+
+#: inc/admin.php:815
+msgid "Not printed"
+msgstr ""
+
+
+
+#: inc/admin.class.php:534
+msgid "Create Shipments"
+msgstr ""
+
+#: inc/admin.class.php:535
+msgid "Print Shipment PDF"
+msgstr ""
+
+#: inc/admin.class.php:536
+msgid "Mark as printed"
+msgstr ""
+
+#: inc/admin.class.php:537
+msgid "Mark as not printed"
+msgstr ""
+
+
+
+
+
+#: inc/admin.class.php:685
+msgid "Tarriff Number"
+msgstr ""
+
+#: inc/admin.class.php:688
+msgid "Tarriff Number. Needs to be 6 or 8 numbers"
+msgstr ""
+
+#: inc/admin.class.php:694
+msgid "Description in english"
+msgstr ""
+
+#: inc/admin.class.php:697
+msgid "This needs to be written in english!"
+msgstr ""
+
+
+
+
+
+
 #: templates/shipment-options.php:58
 msgid "Extra Options"

posturinn/trunk/readme.txt

@@ -3 +3 @@
 Tags: shipping, posturinn, icelandic post shipping, shipping rates, woocommerce
 Requires at least: 4.3
-Tested up to: 5.5.1
+Tested up to: 5.5.3
 Requires PHP: 5.6
 Stable tag: trunk
@@ -26 +26 @@
 
 == Changelog ==
+= 1.0.8 =
+Add bulk actions for createShipment
+Add bulk actions for printing shipments
+Add bulk actions for marking shipments as printed or not printed
+Add filter by printed or not printed
+Add admin class
+Fixed phoneNumber issue on DPP and DPH shipments
+
+
 = 1.0.7 =
 Add postbox sort by nearest postcode

posturinn/trunk/wc-posturinn-shipping-api.php

@@ -3 +3 @@
  * Plugin Name: Pósturinn's Shipping with WooCommerce
  * Description: This plugin is an WooCommerce extension to extend shipping method with Pósturinn's - Iceland
- * Version: 1.0.7
+ * Version: 1.0.8
  * Author: Pósturinn
  * Author URI: https://postur.is
@@ -34 +34 @@
 include plugin_dir_path(__FILE__).'inc/functions.php';
 include plugin_dir_path(__FILE__).'inc/callbacks.php';
-include plugin_dir_path(__FILE__).'inc/admin.php';
+include plugin_dir_path(__FILE__).'inc/admin.class.php';
+// include plugin_dir_path(__FILE__).'inc/admin.php';
 include plugin_dir_path(__FILE__).'inc/checkout-fields.class.php';
 
@@ -131 +132 @@
     $pdf->Output();
 }
+
+function postis_merge_pdf_files($pdf_files, $pdf_path){
+    $pdf_width         = postis_get_settings( 'pdf_width' );
+    $pdf_height        = postis_get_settings( 'pdf_height' );
+    $pdf_rotate        = postis_get_settings( 'pdf_rotate' );
+    $pdf_orientation   = postis_get_settings( 'pdf_orientation' );
+    $pdf_moveright     = postis_get_settings( 'pdf_moveright' );
+    $pdf_movedown      = postis_get_settings( 'pdf_movedown' );
+    $pdf_biggerbarcode = postis_get_settings( 'pdf_biggerbarcode' );
+    $pdf_size   = array($pdf_width, $pdf_height, 'Rotate' => $pdf_rotate);
+    
+    $pdf = new FPDI();
+
+    foreach ($pdf_files as $file) {
+        
+        if (!empty($file)) {
+            
+            $pageCount = $pdf->setSourceFile($file);
+            
+            for ($pageNo = 1; $pageNo <= $pageCount; $pageNo++) {
+                
+                // import a page
+                $templateId = $pdf->importPage($pageNo);
+                
+                $pdf->AddPage($pdf_orientation,$pdf_size);
+        
+                $pdf->useTemplate($templateId, $pdf_moveright, $pdf_movedown, $pdf_biggerbarcode);
+            }
+        }
+    }
+    
+    $pdf->Output($pdf_path,"F");
+}