Changeset 3092301

Timestamp:

05/24/2024 08:16:02 PM (20 months ago)

Author:

printerco

Message:

Update plugin version

Location:

cloud-printing-for-woocommerce/trunk

Files:

• includes/class-wc-iconnect.php (modified) (7 diffs)
• includes/printerco-settings.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)
• woocommerce-iconnect.php (modified) (2 diffs)

cloud-printing-for-woocommerce/trunk/includes/class-wc-iconnect.php

@@ -13 +13 @@
 require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/printerco-dokan.php';
 require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/printerco-plugins-support.php';
+require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/Store-OpenClose.php';
 
 if ( ! class_exists( 'WC_Iconnect' ) ) :
@@ -30 +31 @@
 
     const ICONNECT_DOMAIN = 'http://mypanel.printerco.net/';
-    // const ICONNECT_DOMAIN = 'https://dev.printerco.net/';
     
     const ICONNECT_RESERVATION_ORDER_URL = self::ICONNECT_DOMAIN . 'api/submitreservationext';
@@ -238 +238 @@
     }
 
-
+    // IF PRINTER IS INACTIVE THEN ORDER WILL NOT CREATE
+    public function check_printer_connection()
+    {
+        $params                        = array();
+        $params['req_api_key']         = $this->get_option( 'iconnect_api_key' );
+        $params['req_api_password']    = $this->get_option( 'iconnect_api_password' );
+        $params['req_printer_id']      = $this->get_option( 'iconnect_printer_id' );
+        if($params['req_api_key'] != "" && $params['req_api_password'] != "" && $params['req_printer_id'] != "" )
+        {
+        $response      = StoreOpenClose::find_shop_status($params);
+        $xml           = simplexml_load_string($response);
+        $printerStatus = (string)$xml->details->printer_status;
+        if($printerStatus != 'active')
+        {   
+            return $printerStatus;
+        }
+        return $printerStatus;
+        }
+    }
+    
     public function woocommerce_send_order_to_iconnect($order_id)
     {
+        $printerStatus   =   "active";
         $this->order = new WC_Order($order_id);
+        $printerStatus = $this->check_printer_connection();
 
         ob_start();
@@ -262 +283 @@
         print_r($this->items);
 
-        $this->set_items_info();
-        $this->order_processing();
+        if($printerStatus == "active")
+        {
+            $this->set_items_info();
+            $this->order_processing();
+        }
     }
 
@@ -507 +531 @@
 
         $baseOrder->currency = get_post_meta( $this->order->id, '_order_currency', true );
-
+        if($this->order->currency)
+        {
+            $baseOrder->currency = $this->order->currency;
+        }
+
+        
 
         $baseOrder->payment_method = $paymentmethod1 = get_post_meta( $this->order->id, '_payment_method_title', true );
         $paymentmethod2 = get_post_meta( $this->order->id, '_payment_method', true );
+        
+// updated code - start (19th Apr 2024)
+        if($this->order->payment_method_title)
+        {
+        $baseOrder->payment_method = $paymentmethod1  = $this->order->payment_method_title;    
+        }
+        
+        if($this->order->payment_method)
+        {
+        $paymentmethod2 = $this->order->payment_method;    
+        }
+// updated code - end 
         echo 'Payment method: '.esc_html($paymentmethod1).':'.esc_html($paymentmethod2);
 
@@ -756 +797 @@
         $baseOrder->tax_amount = null;
     }
+
+// VAT IS NOT ADDING THEREFORE ADD BELOW CODE(3rdMay2024):
+    if($this->order->total_tax)
+    {
+        $baseOrder->tax_amount = number_format($this->order->total_tax,2,'.','');   
+    }    
+    
 // VAT - END
 
@@ -859 +907 @@
                 $item_info_arr['cat'] = '';
             }
-            $item_meta = new WC_Order_Item_Meta($item['item_meta'], $product);
+            $item_meta = new WC_Order_Item_Meta($item, $product);
             $item_option_arr = $item_meta->get_formatted();
             $item_info_arr['item'] = $item['name'];

cloud-printing-for-woocommerce/trunk/includes/printerco-settings.php

@@ -166 +166 @@
                 'options'           => $all_gateway_list,
             ),
+
+            'iconnect_shopclose_action' => array(
+                'title'             => __( 'Allow checkout, if shop is closed?', 'woocommerce-iconnect-api-integration' ),
+                'type'              => 'select',
+                'description'       => __( 'Allow customers to checkout/place orders when the shop is closed. ', 'woocommerce-iconnect-api-integration' ),
+                'desc_tip'          => true,
+                'default'           => '',
+                'options'           => array(
+                    'no'=>'No',
+                    'yes'=>'Yes',
+
+                )
+            ),
+            'iconnect_shopclose_message' => array(
+                'title'             => __( 'Show message if shop is closed', 'woocommerce-iconnect-api-integration' ),
+                'type'              => 'text',
+                'description'       => __( 'If shop is closed then this message will show.', 'woocommerce-iconnect-api-integration' ),
+                'desc_tip'          => true,
+                'default'           => ''
+            ),
+            'iconnect_printer_disconnect' => array(
+                'title'             => __( 'Allow checkout, if printer is disconnected?', 'woocommerce-iconnect-api-integration' ),
+                'type'              => 'select',
+                'description'       => __( 'Allow customers to checkout/place orders when the printer is disconnected. ', 'woocommerce-iconnect-api-integration' ),
+                'desc_tip'          => true,
+                'default'           => '',
+                'options'           => array(
+                    'no'=>'No',
+                    'yes'=>'Yes',
+
+                )
+            ),
+            'iconnect_printerdisconnect_message' => array(
+                'title'             => __( 'Show message if printer is disconnect', 'woocommerce-iconnect-api-integration' ),
+                'type'              => 'text',
+                'description'       => __( 'If printer is disconnect then this message will show.', 'woocommerce-iconnect-api-integration' ),
+                'desc_tip'          => true,
+                'default'           => ''
+            ),
+
+
+
+            
             'iconnect_debug_mode' => array(
                 'title'             => __( 'Debug Mode?', 'woocommerce-iconnect-api-integration' ),

cloud-printing-for-woocommerce/trunk/readme.txt

@@ -1 +1 @@
 === Cloud Printing for WooCommerce ===
 Contributors:
-Tags: POS printer,Sunmi V2,thermal printer, POS system, WooCommerce POS, WooCommerce order printer, WooCommerce printer, PrinterCo, PrinterCo.net
+Tags: POS printer,Sunmi V2, Woocommerce automatic order printing, POS system, WooCommerce POS, WooCommerce order printer, WooCommerce printer, PrinterCo, PrinterCo.net, add print button to woocommerce checkout page,restaurant ticket printer
+
 Author: PrinterCo.net
 Requires at least: 4.1.1
 Requires PHP: 7.0
-Tested up to: 6.3
+Tested up to: 6.5.3
 Stable tag: 4.1.1
 License: GPLv2 or later License
 URI: http://www.gnu.org/licenses/gpl-2.0.html
 WC requires at least: 2.2.10
-WC tested up to: 6.0.10
-
-
-This plugin adds on-demand order printing features to the official WooCommerce plugin. Useful for restaurants and takeaways or online stores that need print on demand. It prints orders automatically from woocommerce. If you cancel an order from the printer app the order will be cancelled in woocommerce. An automatic refund can be set or cancelled orders. Compatible with popular restaurant ordering plugin.
-
+WC tested up to: 8.9.1
+
+
+The printing plugin allows orders to be printed manually, but this process is time-consuming and not suitable for restaurants and takeaways with short preparation times. However, the Automatic Order Printing Plugin for WooCommerce by PrinterCo solves this problem. To use it, you must have an account with PrinterCo. This plugin automatically prints orders from WooCommerce to the PrinterCo POS terminal or any POS printer you already have. The supported printers are listed here. It is compatible with popular restaurant ordering plugins and supports a variety of printers. With just a few clicks, this plugin enables automatic order printing for your WooCommerce store.
 == Description ==
 
-
-This plugin extends on top of the features provided by the official WooCommerce plugin.
-It enables your WooCommerce web store with cloud printing capabilities via a PrinterCo mini POS printer.
-It is the ideal solution for businesses that need their online orders printed out on demand!
+The printing plugin allows orders to be printed manually, but this process is time-consuming and not suitable for restaurants and takeaways with short preparation times. However, the Automatic Order Printing Plugin for WooCommerce by PrinterCo solves this problem. To use it, you must have an account with PrinterCo. This plugin automatically prints orders from WooCommerce to the PrinterCo POS terminal or any POS printer you already have. The supported printers are listed here. It is compatible with popular restaurant ordering plugins and supports a variety of printers. With just a few clicks, this plugin enables automatic order printing for your WooCommerce store.
 
 
@@ -26 +23 @@
 Cancel an order from the printer app and it will be automatically cancelled on your woo-commerce website and will issue a refund.
 Set a delivery or collection time while accepting an order
+Open/Close the shop from the printer app to allow or prevent the customer to checkout.
 Select and assign a driver to collect the item and deliver it.
 Set automated printing at a busy hour
@@ -284 +282 @@
 * Some known bugs and warnings were fixed
 
+= 2.8.0
+* Some known bugs were fixed.
+* Now you can disble the checkout when the shop is closed from the app.
+* Now you can prevent the checkout when the printer is disconnected.
+
 == Upgrade Notice ==
 

cloud-printing-for-woocommerce/trunk/woocommerce-iconnect.php

@@ -40 +40 @@
             require_once 'includes/PrintercoRefund.php';
             require_once 'includes/PrintercoOrderCallback.php';
+            require_once 'includes/Store-OpenClose.php';
             // Register the integration.
             add_filter( 'woocommerce_integrations', array( $this, 'add_integration' ) );
@@ -53 +54 @@
         $integrations[] = 'WC_Iconnect';
         $integrations[] = 'PrintercoEmailEditor';
+        $integrations[] = 'StoreOpenClose';                                        
         return $integrations;
     }