Changeset 2314035
- Timestamp:
- 05/28/2020 09:17:40 PM (6 years ago)
- Location:
- zsquared-connector-for-zoho-inventory
- Files:
-
- 8 edited
-
tags/1.0/include/ZsqConnectorOptions.php (modified) (2 diffs)
-
tags/1.0/templates/options.php (modified) (2 diffs)
-
tags/1.0/templates/scripts.php (modified) (1 diff)
-
tags/1.0/zsq-connector-inventory.php (modified) (1 diff)
-
trunk/include/ZsqConnectorOptions.php (modified) (2 diffs)
-
trunk/templates/options.php (modified) (2 diffs)
-
trunk/templates/scripts.php (modified) (1 diff)
-
trunk/zsq-connector-inventory.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
zsquared-connector-for-zoho-inventory/tags/1.0/include/ZsqConnectorOptions.php
r2310371 r2314035 45 45 $check = zsq_inv_sync_order($order_number, '', $this->hook_trigger); 46 46 if(false === $check) { 47 echo "<div class=\"notice notice-error is-dismissible\"><p>Order replay failed. Please see Slack output for details.</p></div>";47 echo "<div class=\"notice notice-error is-dismissible\"><p>Order replay failed. Please see Slack output or error output for details.</p></div>"; 48 48 } 49 49 else if(true === $check) { 50 echo "<div class=\"notice notice-success is-dismissible\"><p>Order replay succeeded.</p></div>";50 echo "<div class=\"notice notice-success is-dismissible\"><p>Order replay accepted. ZSquared will now attempt to transfer the order into Zoho Inventory again.</p></div>"; 51 51 } 52 52 else if(is_null($check)) { … … 225 225 array('sslverify' => FALSE)); 226 226 if(is_a($response, WP_Error::class)) { 227 echo "ERROR: " . $response->get_error_message();228 die;227 ZsqSlackNotifications::send('Error on taxes API call: '.$response->get_error_message()); 228 return []; 229 229 } 230 230 $output = json_decode($response['body'], true); -
zsquared-connector-for-zoho-inventory/tags/1.0/templates/options.php
r2305892 r2314035 77 77 <h2>Replay order submission</h2> 78 78 <p>Sometimes an order may not make it into Zoho for a variety of reasons. When this happens, you can replay the order submission to try again.</p> 79 <p>Enter the woocommerce sales order number to attempt to send it again to zoho inventory, regardless of status.</p>79 <p>Enter the Woocommerce sales order number to attempt to send it again to Zoho Inventory.</p> 80 80 <form method="post" action="options-general.php?page=zsq_inv.php&replay=1&show=replay"> 81 81 <table class="form-table"> … … 102 102 <h2>Tax Information Mapping</h2> 103 103 <?php if(empty($woo_taxes)) : ?> 104 <p>No Woocommerce taxes found; sales orders will be transferred to Zoho Inventory without any tax information applied.</p>104 <p>No Woocommerce or Zoho tax settings found; sales orders will be transferred to Zoho Inventory without any tax information applied.</p> 105 105 <?php elseif(!empty($woo_taxes) && empty($ex_taxes)) : ?> 106 106 <p>Woocommerce tax settings detected but no Zoho Inventory taxes detected. Please check your tax settings in Zoho Inventory, and confirm that your ZSquared API key has been added here. If you have set your taxes in Woocommerce and Zoho Inventory and you still see this message, please contact the ZSquared team.</p> -
zsquared-connector-for-zoho-inventory/tags/1.0/templates/scripts.php
r2305892 r2314035 22 22 }, 10000); 23 23 } 24 }, 25 error: function(error) { 26 $("#zsq_inv_manual_sync_message").text("ERROR: "+error); 24 27 } 25 28 }); -
zsquared-connector-for-zoho-inventory/tags/1.0/zsq-connector-inventory.php
r2305892 r2314035 56 56 } 57 57 $order = wc_get_order($order_id); 58 if($order == false) { 59 return "order $order_id not found"; 60 } 58 61 $obj = new \PCIS\ZSquared\Inventory\ZsqOrderSync($order); 59 62 if(!$obj->getState()) { -
zsquared-connector-for-zoho-inventory/trunk/include/ZsqConnectorOptions.php
r2310371 r2314035 45 45 $check = zsq_inv_sync_order($order_number, '', $this->hook_trigger); 46 46 if(false === $check) { 47 echo "<div class=\"notice notice-error is-dismissible\"><p>Order replay failed. Please see Slack output for details.</p></div>";47 echo "<div class=\"notice notice-error is-dismissible\"><p>Order replay failed. Please see Slack output or error output for details.</p></div>"; 48 48 } 49 49 else if(true === $check) { 50 echo "<div class=\"notice notice-success is-dismissible\"><p>Order replay succeeded.</p></div>";50 echo "<div class=\"notice notice-success is-dismissible\"><p>Order replay accepted. ZSquared will now attempt to transfer the order into Zoho Inventory again.</p></div>"; 51 51 } 52 52 else if(is_null($check)) { … … 225 225 array('sslverify' => FALSE)); 226 226 if(is_a($response, WP_Error::class)) { 227 echo "ERROR: " . $response->get_error_message();228 die;227 ZsqSlackNotifications::send('Error on taxes API call: '.$response->get_error_message()); 228 return []; 229 229 } 230 230 $output = json_decode($response['body'], true); -
zsquared-connector-for-zoho-inventory/trunk/templates/options.php
r2305892 r2314035 77 77 <h2>Replay order submission</h2> 78 78 <p>Sometimes an order may not make it into Zoho for a variety of reasons. When this happens, you can replay the order submission to try again.</p> 79 <p>Enter the woocommerce sales order number to attempt to send it again to zoho inventory, regardless of status.</p>79 <p>Enter the Woocommerce sales order number to attempt to send it again to Zoho Inventory.</p> 80 80 <form method="post" action="options-general.php?page=zsq_inv.php&replay=1&show=replay"> 81 81 <table class="form-table"> … … 102 102 <h2>Tax Information Mapping</h2> 103 103 <?php if(empty($woo_taxes)) : ?> 104 <p>No Woocommerce taxes found; sales orders will be transferred to Zoho Inventory without any tax information applied.</p>104 <p>No Woocommerce or Zoho tax settings found; sales orders will be transferred to Zoho Inventory without any tax information applied.</p> 105 105 <?php elseif(!empty($woo_taxes) && empty($ex_taxes)) : ?> 106 106 <p>Woocommerce tax settings detected but no Zoho Inventory taxes detected. Please check your tax settings in Zoho Inventory, and confirm that your ZSquared API key has been added here. If you have set your taxes in Woocommerce and Zoho Inventory and you still see this message, please contact the ZSquared team.</p> -
zsquared-connector-for-zoho-inventory/trunk/templates/scripts.php
r2305892 r2314035 22 22 }, 10000); 23 23 } 24 }, 25 error: function(error) { 26 $("#zsq_inv_manual_sync_message").text("ERROR: "+error); 24 27 } 25 28 }); -
zsquared-connector-for-zoho-inventory/trunk/zsq-connector-inventory.php
r2305892 r2314035 56 56 } 57 57 $order = wc_get_order($order_id); 58 if($order == false) { 59 return "order $order_id not found"; 60 } 58 61 $obj = new \PCIS\ZSquared\Inventory\ZsqOrderSync($order); 59 62 if(!$obj->getState()) {
Note: See TracChangeset
for help on using the changeset viewer.