Changeset 2503287
- Timestamp:
- 03/25/2021 01:47:41 PM (5 years ago)
- Location:
- transdirect-shipping
- Files:
-
- 36 added
- 8 edited
-
tags/7.6 (added)
-
tags/7.6/ItemGrouping.php (added)
-
tags/7.6/README.md (added)
-
tags/7.6/ajax-loader-bg.gif (added)
-
tags/7.6/ajax-loader.gif (added)
-
tags/7.6/assets (added)
-
tags/7.6/assets/css (added)
-
tags/7.6/assets/css/countrySelect.css (added)
-
tags/7.6/assets/css/style.css (added)
-
tags/7.6/assets/images (added)
-
tags/7.6/assets/images/ajax-loader-bg.gif (added)
-
tags/7.6/assets/images/ajax-loader.gif (added)
-
tags/7.6/assets/images/countryflags.png (added)
-
tags/7.6/assets/images/logo-transdirect.png (added)
-
tags/7.6/assets/js (added)
-
tags/7.6/assets/js/countrySelect.js (added)
-
tags/7.6/assets/js/transdirect.js (added)
-
tags/7.6/countrySelect.css (added)
-
tags/7.6/countrySelect.js (added)
-
tags/7.6/countryflags.png (added)
-
tags/7.6/includes (added)
-
tags/7.6/includes/locations.php (added)
-
tags/7.6/includes/order_sync.php (added)
-
tags/7.6/includes/product_sync.php (added)
-
tags/7.6/includes/quotes.php (added)
-
tags/7.6/includes/scripts.php (added)
-
tags/7.6/locations.php (added)
-
tags/7.6/logo-transdirect.png (added)
-
tags/7.6/part_htm.php (added)
-
tags/7.6/readme.txt (added)
-
tags/7.6/templates (added)
-
tags/7.6/templates/part_htm.php (added)
-
tags/7.6/templates/transdirect-calculator.php (added)
-
tags/7.6/transdirect-calculator.php (added)
-
tags/7.6/transdirect.js (added)
-
tags/7.6/transdirect_shipping.php (added)
-
trunk/includes/order_sync.php (modified) (6 diffs)
-
trunk/includes/product_sync.php (modified) (1 diff)
-
trunk/includes/quotes.php (modified) (1 diff)
-
trunk/includes/scripts.php (modified) (1 diff)
-
trunk/readme.txt (modified) (1 diff)
-
trunk/templates/part_htm.php (modified) (1 diff)
-
trunk/templates/transdirect-calculator.php (modified) (1 diff)
-
trunk/transdirect_shipping.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
transdirect-shipping/trunk/includes/order_sync.php
r2352210 r2503287 4 4 * 5 5 * @author Transdirect 6 * @version 7. 56 * @version 7.6 7 7 */ 8 8 … … 62 62 } 63 63 64 if(empty(get_post_meta($order->id,'_shipping_company',true))) 65 { 66 $buyer_name = $order->shipping_first_name .' '. $order->shipping_last_name; 67 } 68 else 69 { 70 $buyer_name = get_post_meta($order->id,'_shipping_company',true); 71 } 72 if(empty($order->completed_date)) 73 { 74 $date = $order->get_date_paid(); 75 if(!empty($date)) 76 { 77 $paid_date = $date->format('Y-m-d H:i:s'); 78 } 79 } 80 else 81 { 82 $paid_date = $order->completed_date; 83 } 84 64 85 $sku = substr($sku, 1); 65 86 $item_des = substr($item_des, 1); … … 78 99 $api_array['selected_courier'] = strtolower($selected_courier); 79 100 $api_array['courier_price'] = $order->get_total_shipping(); 80 $api_array['paid_time'] = $ order->completed_date;81 $api_array['buyer_name'] = get_post_meta($order->id,'_shipping_company',true);101 $api_array['paid_time'] = $paid_date; 102 $api_array['buyer_name'] = $buyer_name; 82 103 // $api_array['buyer_name'] = $order->billing_first_name .' '. $order->billing_last_name; 83 104 $api_array['buyer_email'] = $order->billing_email; … … 135 156 } 136 157 158 if(empty(get_post_meta($order->id,'_shipping_company',true))) 159 { 160 $buyer_name = $order->shipping_first_name .' '. $order->shipping_last_name; 161 } 162 else 163 { 164 $buyer_name = get_post_meta($order->id,'_shipping_company',true); 165 } 166 if(empty($order->completed_date)) 167 { 168 $date = $order->get_date_paid(); 169 if(!empty($date)) 170 { 171 $paid_date = $date->format('Y-m-d H:i:s'); 172 } 173 } 174 else 175 { 176 $paid_date = $order->completed_date; 177 } 178 137 179 $api_array['order_id'] = $order->id; 138 180 $api_array['imported_from'] = 'Woocommerce'; … … 140 182 $api_array['sale_price'] = number_format($sale_price, 2); 141 183 $api_array['courier_price'] = $order->get_total_shipping(); 142 $api_array['paid_time'] = $order->completed_date;143 $api_array['buyer_name'] = get_post_meta($order->id,'_shipping_company',true);184 $api_array['paid_time'] = $paid_date; 185 $api_array['buyer_name'] = $buyer_name; 144 186 // $api_array['buyer_name'] = $order->billing_first_name .' '. $order->billing_last_name; 145 187 $api_array['buyer_email'] = $order->billing_email; … … 161 203 // Sync new order in transdirect when cron running 162 204 public function td_create_order(){ 163 205 164 206 if((isset(td_getApiDetails()->enable_sync) && td_getApiDetails()->enable_sync == 'on') || (isset(td_getApiDetails()->sync_all_order) && td_getApiDetails()->sync_all_order == 'on' || td_getApiDetails()->mode == 'no_display_mode')){ 165 207 -
transdirect-shipping/trunk/includes/product_sync.php
r2352210 r2503287 4 4 * 5 5 * @author Transdirect 6 * @version 7. 56 * @version 7.6 7 7 */ 8 8 -
transdirect-shipping/trunk/includes/quotes.php
r2352210 r2503287 4 4 * 5 5 * @author Transdirect 6 * @version 7. 56 * @version 7.6 7 7 */ 8 8 -
transdirect-shipping/trunk/includes/scripts.php
r2352210 r2503287 4 4 * 5 5 * @author Transdirect 6 * @version 7. 56 * @version 7.6 7 7 */ 8 8 -
transdirect-shipping/trunk/readme.txt
r2314894 r2503287 3 3 Tags: transdirect, quote, quotes, quick quotes, courier, couriers, freight, freights, shipping, delivery, toll, toll ipec, fastway, couriers please, toll priority, northline, cart, checkout, configurable, woocommerce, woo-commerce, ecommerce, e-commerce, commerce, wordpress ecommerce 4 4 Requires at least: 4.2 5 Tested up to: 5. 4.15 Tested up to: 5.7 6 6 License: GPLv3 7 7 License URI: http://www.gnu.org/licenses/gpl-3.0.html -
transdirect-shipping/trunk/templates/part_htm.php
r2352210 r2503287 5 5 * 6 6 * @author Transdirect 7 * @version 7. 57 * @version 7.6 8 8 */ 9 9 -
transdirect-shipping/trunk/templates/transdirect-calculator.php
r2352210 r2503287 4 4 * 5 5 * @author Transdirect 6 * @version 7. 56 * @version 7.6 7 7 */ 8 8 -
transdirect-shipping/trunk/transdirect_shipping.php
r2352210 r2503287 6 6 * Description: This plugin allows you to calculate shipping as per your delivery location. 7 7 * FAQ: https://www.transdirect.com.au/e-commerce/woo-commerce/ 8 * Version: 7. 58 * Version: 7.6 9 9 * Author: Transdirect 10 10 * Author URI: https://transdirect.com.au/ … … 188 188 189 189 $rate = array( 190 'id' => $this->id,190 'id' => $this->id, 191 191 'label' => $label, 192 192 'cost' => $_COOKIE['price'],
Note: See TracChangeset
for help on using the changeset viewer.