Changeset 2419894
- Timestamp:
- 11/17/2020 09:46:39 AM (5 years ago)
- Location:
- easify-server-woocommerce/trunk
- Files:
-
- 3 edited
-
easify.php (modified) (2 diffs)
-
includes/class-easify-wc-send-order-to-easify.php (modified) (8 diffs)
-
readme.txt (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
easify-server-woocommerce/trunk/easify.php
r2349123 r2419894 5 5 * Plugin URI: http://www.easify.co.uk/wordpress/ 6 6 * Description: Connects Easify Business Management, EPOS (Electronic Point of Sale) and invoicing software to your WooCommerce enabled WordPress website. Allowing you to keep your online and offline shop's orders and stock control synchronised. 7 * Version: 4.2 27 * Version: 4.23 8 8 * License: GPL2 9 9 * License URI: https://www.gnu.org/licenses/gpl-2.0.html … … 12 12 * Requires at least: 4.0 13 13 * Tested up to: 5.4 14 * WC tested up to: 4. 314 * WC tested up to: 4.6 15 15 */ 16 16 -
easify-server-woocommerce/trunk/includes/class-easify-wc-send-order-to-easify.php
r2349123 r2419894 31 31 * 32 32 * @class Easify_WC_Send_Order_To_Easify 33 * @version 4.2 233 * @version 4.23 34 34 * @package easify-woocommerce-connector 35 35 * @author Easify … … 126 126 // that reflected in the Easify order. 127 127 if ($this->easify_options->is_payment_method_enabled($this->woocommerce_order->payment_method)) { 128 $this->easify_order_model->Paid = true; 128 Easify_Logging::Log("Easify_WC_Send_Order_To_Easify.do_order() - payment method " . 129 $this->woocommerce_order->payment_method . " enabled, marking order as paid."); 130 131 $this->easify_order_model->Paid = 'true'; // Set as string otherwise true in PHP becomes 1 and the WebAPI mapper in CloudAPI thinks it's an int 129 132 $this->easify_order_model->DatePaid = $this->get_formatted_date(); 130 133 } else { … … 133 136 // Record payment method in internal notes to let Easify know how the 134 137 // customer intends to pay for the order... 135 $this->easify_order_model->Paid = false; 138 Easify_Logging::Log("Easify_WC_Send_Order_To_Easify.do_order() - payment method " . 139 $this->woocommerce_order->payment_method . " NOT enabled, NOT marking order as paid."); 140 141 $this->easify_order_model->Paid = 'false'; 136 142 $this->easify_order_model->DatePaid = NULL; 137 143 $this->easify_order_model->Notes = "Payment to follow - Payment method: " . $this->woocommerce_order->payment_method . ". "; … … 139 145 140 146 $this->easify_order_model->CustomerRef = ""; 141 $this->easify_order_model->Invoiced = true;147 $this->easify_order_model->Invoiced = 'true'; 142 148 $this->easify_order_model->DateInvoiced = $this->get_formatted_date(); 143 149 $this->easify_order_model->Comments = $this->easify_options->get_easify_order_comment() . " " . $this->woocommerce_order->order_no; … … 150 156 $this->easify_order_model->DueDate = $this->get_formatted_date(); 151 157 $this->easify_order_model->DueTime = $this->get_formatted_date(); 152 $this->easify_order_model->Scheduled = false;158 $this->easify_order_model->Scheduled = 'false'; 153 159 $this->easify_order_model->Duration = 0; 154 160 $this->easify_order_model->Priority = 0; 155 $this->easify_order_model->Recurring = false;161 $this->easify_order_model->Recurring = 'false'; 156 162 $this->easify_order_model->RecurTimePeriod = 0; 157 163 $this->easify_order_model->DueDate2 = $this->get_formatted_date(); … … 247 253 $easify_order_detail->ExtOrderDetailsId = $woocommerce_product['product_id']; 248 254 $easify_order_detail->ExtOrderNo = $this->woocommerce_order->order_no; 249 $easify_order_detail->AutoAllocateStock = true;255 $easify_order_detail->AutoAllocateStock = 'true'; 250 256 251 257 // Add the order detail to the Easify order model … … 277 283 $easify_order_detail->ExtParentId = 0; 278 284 $easify_order_detail->ExtOrderNo = $this->woocommerce_order->order_no; 279 $easify_order_detail->AutoAllocateStock = false;285 $easify_order_detail->AutoAllocateStock = 'false'; 280 286 281 287 // Add the order detail to the Easify order model … … 368 374 $easify_order_detail->ExtOrderDetailsId = 0; 369 375 $easify_order_detail->ExtOrderNo = $this->woocommerce_order->order_no; 370 $easify_order_detail->AutoAllocateStock = true;376 $easify_order_detail->AutoAllocateStock = 'true'; 371 377 372 378 // Add the order detail to the Easify order model -
easify-server-woocommerce/trunk/readme.txt
r2349123 r2419894 5 5 Requires at least: 4.0 6 6 Tested up to: 5.4 7 Stable tag: 4.2 27 Stable tag: 4.23 8 8 License: GPLv2 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html 10 WC tested up to: 4. 310 WC tested up to: 4.6 11 11 12 12 Connects Easify V4.x Small Business Software to your WooCommerce online shop, … … 101 101 102 102 == Changelog == 103 = 4.23 = 104 * Fixed issue whereby orders sent to Easify were not being marked as paid under 105 certain conditions. 103 106 = 4.22 = 104 107 * Fixed issue with default payment method not being sent to Easify when an order … … 172 175 173 176 == Upgrade Notice == 174 = 4.2 2=175 * Fixed issue w ith default payment method not being sent to Easify when an order176 is placed with a non standard payment method.177 = 4.23 = 178 * Fixed issue whereby orders sent to Easify were not being marked as paid under 179 certain conditions.
Note: See TracChangeset
for help on using the changeset viewer.