Version Notes
This extension can be used by the users of bluefishretail,by providing appropriate credentials,given to them by bluefishretail.
Download this release
Release Info
| Developer | J Doyle |
| Extension | Bluefish_Connection |
| Version | 1.1.6 |
| Comparing to | |
| See all releases | |
Code changes from version 1.1.5 to 1.1.6
- app/code/local/Bluefish/Connection/Model/Carrier/Bsaleshippingmethod.php +1 -2
- app/code/local/Bluefish/Connection/Model/Paymentmethod.php +1 -1
- app/code/local/Bluefish/Connection/controllers/Adminhtml/MyformController.php +30 -30
- app/code/local/Bluefish/Connection/controllers/Adminhtml/MyformexportController.php +23 -9
- app/code/local/Bluefish/Connection/controllers/Adminhtml/Xml.php +6 -2
- app/code/local/Bluefish/Connection/etc/config.xml +4 -4
- app/code/local/Bluefish/Connection/sql/connection_setup/{mysql4-upgrade-1.1.3-1.1.5.php → mysql4-upgrade-1.1.4-1.1.5.php} +0 -0
- package.xml +6 -6
app/code/local/Bluefish/Connection/Model/Carrier/Bsaleshippingmethod.php
CHANGED
|
@@ -5,8 +5,7 @@ implements Mage_Shipping_Model_Carrier_Interface {
|
|
| 5 |
|
| 6 |
public function collectRates(Mage_Shipping_Model_Rate_Request $request)
|
| 7 |
{
|
| 8 |
-
|
| 9 |
-
if((strpos($_SERVER['REQUEST_URI'] ,"/onestepcheckout/") !== false) || (strpos($_SERVER['REQUEST_URI'] ,"/checkout/cart/") !== false) || (strpos($_SERVER['PATH_INFO'] ,"/checkout/onepage/saveBilling/") !== false) || (strpos($_SERVER['PATH_INFO'] ,"/checkout/cart/") !== false)){
|
| 10 |
return false;
|
| 11 |
}
|
| 12 |
|
| 5 |
|
| 6 |
public function collectRates(Mage_Shipping_Model_Rate_Request $request)
|
| 7 |
{
|
| 8 |
+
if((strpos(@$_SERVER["REQUEST_URI"] ,"/onestepcheckout/") !== false) || (strpos(@$_SERVER["REQUEST_URI"] ,"/checkout/cart/") !== false) || (strpos(@$_SERVER["PATH_INFO"] ,"/checkout/onepage/saveBilling/") !== false) || (strpos(@$_SERVER["PATH_INFO"] ,"/checkout/cart/") !== false)){
|
|
|
|
| 9 |
return false;
|
| 10 |
}
|
| 11 |
|
app/code/local/Bluefish/Connection/Model/Paymentmethod.php
CHANGED
|
@@ -5,7 +5,7 @@
|
|
| 5 |
|
| 6 |
|
| 7 |
public function isAvailable($quote = null) {
|
| 8 |
-
if(
|
| 9 |
return false;
|
| 10 |
}
|
| 11 |
return true;
|
| 5 |
|
| 6 |
|
| 7 |
public function isAvailable($quote = null) {
|
| 8 |
+
if(@$_SERVER["PATH_INFO"] == "/checkout/onepage/saveShippingMethod/"){
|
| 9 |
return false;
|
| 10 |
}
|
| 11 |
return true;
|
app/code/local/Bluefish/Connection/controllers/Adminhtml/MyformController.php
CHANGED
|
@@ -325,10 +325,10 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 325 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 326 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 327 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 328 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 329 |
curl_setopt($tuCurl, CURLOPT_POST, 1);
|
| 330 |
curl_setopt($tuCurl, CURLOPT_POSTFIELDS, $xml);
|
| 331 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 332 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 333 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 334 |
curl_setopt($tuCurl, CURLINFO_HEADER_OUT, TRUE);
|
|
@@ -469,11 +469,11 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 469 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 470 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 471 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 472 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 473 |
curl_setopt($tuCurl, CURLOPT_POST, 1);
|
| 474 |
curl_setopt($tuCurl, CURLOPT_TIMEOUT, 0);
|
| 475 |
curl_setopt($tuCurl, CURLOPT_POSTFIELDS, $custXmlData);
|
| 476 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 477 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 478 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 479 |
curl_setopt($tuCurl, CURLINFO_HEADER_OUT, TRUE);
|
|
@@ -609,11 +609,11 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 609 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 610 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 611 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 612 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 613 |
curl_setopt($tuCurl, CURLOPT_POST, 1);
|
| 614 |
curl_setopt($tuCurl, CURLOPT_TIMEOUT, 0);
|
| 615 |
curl_setopt($tuCurl, CURLOPT_POSTFIELDS, $productXmlData);
|
| 616 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 617 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 618 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 619 |
curl_setopt($tuCurl, CURLINFO_HEADER_OUT, TRUE);
|
|
@@ -722,9 +722,9 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 722 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 723 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 724 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 725 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 726 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 727 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 728 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 729 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 730 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
|
@@ -741,9 +741,9 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 741 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 742 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 743 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 744 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 745 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 746 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 747 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 748 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 749 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
|
@@ -792,9 +792,9 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 792 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 793 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 794 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 795 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 796 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 797 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 798 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 799 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 800 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
|
@@ -843,9 +843,9 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 843 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 844 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 845 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 846 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 847 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 848 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 849 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 850 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 851 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
|
@@ -883,9 +883,9 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 883 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 884 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 885 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 886 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 887 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 888 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 889 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 890 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 891 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
|
@@ -968,9 +968,9 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 968 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 969 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 970 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 971 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 972 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 973 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 974 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 975 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 976 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
|
@@ -988,9 +988,9 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 988 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 989 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 990 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 991 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 992 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 993 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 994 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 995 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 996 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
|
@@ -1045,9 +1045,9 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 1045 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 1046 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 1047 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 1048 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 1049 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 1050 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 1051 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 1052 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 1053 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
|
@@ -1068,9 +1068,9 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 1068 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 1069 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 1070 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 1071 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 1072 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 1073 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 1074 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 1075 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 1076 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
|
@@ -1115,7 +1115,7 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 1115 |
if(isset($extra) && !empty($extra))
|
| 1116 |
{
|
| 1117 |
$array=array();
|
| 1118 |
-
$array=array('where'=>rawurlencode('storeCode
|
| 1119 |
$auth = build_auth_array($baseurl, $credentials['mycustom_code'],$permFile,$array);
|
| 1120 |
|
| 1121 |
$auth_query = _build_http_query($auth);
|
|
@@ -1124,9 +1124,9 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 1124 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 1125 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 1126 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 1127 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 1128 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 1129 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 1130 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 1131 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 1132 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
|
@@ -1137,7 +1137,7 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 1137 |
else
|
| 1138 |
{
|
| 1139 |
$array=array();
|
| 1140 |
-
$array=array('where'=>rawurlencode('storeCode
|
| 1141 |
$auth = build_auth_array($baseurl, $credentials['mycustom_code'],$permFile,$array);
|
| 1142 |
$auth_query = _build_http_query($auth);
|
| 1143 |
$auth_query = $baseurl."?".$auth_query;
|
|
@@ -1145,9 +1145,9 @@ class Bluefish_Connection_Adminhtml_MyformController extends Mage_Adminhtml_Cont
|
|
| 1145 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 1146 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 1147 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 1148 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 1149 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 1150 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 1151 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 1152 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 1153 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
| 325 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 326 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 327 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 328 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 329 |
curl_setopt($tuCurl, CURLOPT_POST, 1);
|
| 330 |
curl_setopt($tuCurl, CURLOPT_POSTFIELDS, $xml);
|
| 331 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 332 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 333 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 334 |
curl_setopt($tuCurl, CURLINFO_HEADER_OUT, TRUE);
|
| 469 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 470 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 471 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 472 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 473 |
curl_setopt($tuCurl, CURLOPT_POST, 1);
|
| 474 |
curl_setopt($tuCurl, CURLOPT_TIMEOUT, 0);
|
| 475 |
curl_setopt($tuCurl, CURLOPT_POSTFIELDS, $custXmlData);
|
| 476 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 477 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 478 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 479 |
curl_setopt($tuCurl, CURLINFO_HEADER_OUT, TRUE);
|
| 609 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 610 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 611 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 612 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 613 |
curl_setopt($tuCurl, CURLOPT_POST, 1);
|
| 614 |
curl_setopt($tuCurl, CURLOPT_TIMEOUT, 0);
|
| 615 |
curl_setopt($tuCurl, CURLOPT_POSTFIELDS, $productXmlData);
|
| 616 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 617 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 618 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 619 |
curl_setopt($tuCurl, CURLINFO_HEADER_OUT, TRUE);
|
| 722 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 723 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 724 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 725 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 726 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 727 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 728 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 729 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 730 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
| 741 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 742 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 743 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 744 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 745 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 746 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 747 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 748 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 749 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
| 792 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 793 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 794 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 795 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 796 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 797 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 798 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 799 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 800 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
| 843 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 844 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 845 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 846 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 847 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 848 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 849 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 850 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 851 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
| 883 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 884 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 885 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 886 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 887 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 888 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 889 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 890 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 891 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
| 968 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 969 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 970 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 971 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 972 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 973 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 974 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 975 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 976 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
| 988 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 989 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 990 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 991 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 992 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 993 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 994 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 995 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 996 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
| 1045 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 1046 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 1047 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 1048 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 1049 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 1050 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 1051 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 1052 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 1053 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
| 1068 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 1069 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 1070 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 1071 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 1072 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 1073 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 1074 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 1075 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 1076 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
| 1115 |
if(isset($extra) && !empty($extra))
|
| 1116 |
{
|
| 1117 |
$array=array();
|
| 1118 |
+
$array=array('where'=>rawurlencode('storeCode = '.$extraStoreCode.' and transactionCode = '.$extra.''));
|
| 1119 |
$auth = build_auth_array($baseurl, $credentials['mycustom_code'],$permFile,$array);
|
| 1120 |
|
| 1121 |
$auth_query = _build_http_query($auth);
|
| 1124 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 1125 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 1126 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 1127 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 1128 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 1129 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 1130 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 1131 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 1132 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
| 1137 |
else
|
| 1138 |
{
|
| 1139 |
$array=array();
|
| 1140 |
+
$array=array('where'=>rawurlencode('storeCode = '.$extraStoreCode.' and endDateTime >= '.'"'.$endDateTime.'"'.''));
|
| 1141 |
$auth = build_auth_array($baseurl, $credentials['mycustom_code'],$permFile,$array);
|
| 1142 |
$auth_query = _build_http_query($auth);
|
| 1143 |
$auth_query = $baseurl."?".$auth_query;
|
| 1145 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 1146 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 1147 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 1148 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 1149 |
curl_setopt($tuCurl, CURLOPT_HTTPGET, 1);
|
| 1150 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 1151 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 1152 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 1153 |
curl_setopt($tuCurl, CURLOPT_HTTPHEADER, array("Accept: application/xml"));
|
app/code/local/Bluefish/Connection/controllers/Adminhtml/MyformexportController.php
CHANGED
|
@@ -65,10 +65,10 @@ class Bluefish_Connection_Adminhtml_MyformexportController extends Mage_Adminhtm
|
|
| 65 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 66 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 67 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 68 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 69 |
curl_setopt($tuCurl, CURLOPT_POST, 1);
|
| 70 |
curl_setopt($tuCurl, CURLOPT_POSTFIELDS, $xml);
|
| 71 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 72 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 73 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 74 |
curl_setopt($tuCurl, CURLINFO_HEADER_OUT, TRUE);
|
|
@@ -184,11 +184,11 @@ class Bluefish_Connection_Adminhtml_MyformexportController extends Mage_Adminhtm
|
|
| 184 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 185 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 186 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 187 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 188 |
curl_setopt($tuCurl, CURLOPT_POST, 1);
|
| 189 |
curl_setopt($tuCurl, CURLOPT_TIMEOUT, 0);
|
| 190 |
curl_setopt($tuCurl, CURLOPT_POSTFIELDS, $custXmlData);
|
| 191 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 192 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 193 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 194 |
curl_setopt($tuCurl, CURLINFO_HEADER_OUT, TRUE);
|
|
@@ -289,11 +289,11 @@ class Bluefish_Connection_Adminhtml_MyformexportController extends Mage_Adminhtm
|
|
| 289 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 290 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 291 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 292 |
-
curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 293 |
curl_setopt($tuCurl, CURLOPT_POST, 1);
|
| 294 |
curl_setopt($tuCurl, CURLOPT_TIMEOUT, 0);
|
| 295 |
curl_setopt($tuCurl, CURLOPT_POSTFIELDS, $productXmlData);
|
| 296 |
-
curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 297 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 298 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 299 |
curl_setopt($tuCurl, CURLINFO_HEADER_OUT, TRUE);
|
|
@@ -751,7 +751,13 @@ class Bluefish_Connection_Adminhtml_MyformexportController extends Mage_Adminhtm
|
|
| 751 |
$unserielTaxClass = unserialize($taxClassSerialArr);
|
| 752 |
|
| 753 |
$credentialsExport = Mage::getStoreConfig('mycustom_section/mycustom_product_export_group');
|
| 754 |
-
$unitOfMeasureCode = $credentialsExport['mycustom_unitofmeasure'];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 755 |
|
| 756 |
$fileName = "product_dump_".date('Y-m-d').".csv";
|
| 757 |
$fileHandle = fopen($fileName, "w");
|
|
@@ -765,7 +771,7 @@ class Bluefish_Connection_Adminhtml_MyformexportController extends Mage_Adminhtm
|
|
| 765 |
$productObj = Mage::getModel('catalog/product')->getCollection()->addAttributeToSelect('*'); // you can add * or field name here eg. ('sku','product_name','description')
|
| 766 |
|
| 767 |
foreach ($productObj as $productRow) {
|
| 768 |
-
|
| 769 |
foreach($unserielTaxClass as $key => $valueTax)
|
| 770 |
{
|
| 771 |
if($productRow->getTaxClassId() == $valueTax['magentotaxclass'])
|
|
@@ -789,13 +795,21 @@ class Bluefish_Connection_Adminhtml_MyformexportController extends Mage_Adminhtm
|
|
| 789 |
|
| 790 |
$createdDate = date("d.m.Y",strtotime($productRow->getCreatedAt()));
|
| 791 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 792 |
$dataCollection = array(
|
| 793 |
"INSTANCE",
|
| 794 |
'',
|
| 795 |
"true",
|
| 796 |
$productCategory,
|
| 797 |
$productCode,
|
| 798 |
-
|
| 799 |
$bluestoreTaxclassCode,
|
| 800 |
$ProductStatus,
|
| 801 |
$unitOfMeasureCode,
|
| 65 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 66 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 67 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 68 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 69 |
curl_setopt($tuCurl, CURLOPT_POST, 1);
|
| 70 |
curl_setopt($tuCurl, CURLOPT_POSTFIELDS, $xml);
|
| 71 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 72 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 73 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 74 |
curl_setopt($tuCurl, CURLINFO_HEADER_OUT, TRUE);
|
| 184 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 185 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 186 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 187 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 188 |
curl_setopt($tuCurl, CURLOPT_POST, 1);
|
| 189 |
curl_setopt($tuCurl, CURLOPT_TIMEOUT, 0);
|
| 190 |
curl_setopt($tuCurl, CURLOPT_POSTFIELDS, $custXmlData);
|
| 191 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 192 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 193 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 194 |
curl_setopt($tuCurl, CURLINFO_HEADER_OUT, TRUE);
|
| 289 |
curl_setopt($tuCurl, CURLOPT_URL,$auth_query);
|
| 290 |
curl_setopt($tuCurl, CURLOPT_PORT , 9001);
|
| 291 |
curl_setopt($tuCurl, CURLOPT_VERBOSE, 0);
|
| 292 |
+
// curl_setopt($tuCurl, CURLOPT_SSLVERSION, 3);
|
| 293 |
curl_setopt($tuCurl, CURLOPT_POST, 1);
|
| 294 |
curl_setopt($tuCurl, CURLOPT_TIMEOUT, 0);
|
| 295 |
curl_setopt($tuCurl, CURLOPT_POSTFIELDS, $productXmlData);
|
| 296 |
+
// curl_setopt($tuCurl, CURLOPT_SSL_VERIFYPEER, false);
|
| 297 |
curl_setopt($tuCurl, CURLOPT_RETURNTRANSFER, 1);
|
| 298 |
curl_setopt($tuCurl, CURLOPT_FOLLOWLOCATION, 1);
|
| 299 |
curl_setopt($tuCurl, CURLINFO_HEADER_OUT, TRUE);
|
| 751 |
$unserielTaxClass = unserialize($taxClassSerialArr);
|
| 752 |
|
| 753 |
$credentialsExport = Mage::getStoreConfig('mycustom_section/mycustom_product_export_group');
|
| 754 |
+
$unitOfMeasureCode = $credentialsExport['mycustom_unitofmeasure'];
|
| 755 |
+
|
| 756 |
+
|
| 757 |
+
$productsMappingFlag = $credentialsExport['mycustom_magento_producttype'];
|
| 758 |
+
$unserielValProductType = unserialize($productsMappingFlag);
|
| 759 |
+
|
| 760 |
+
|
| 761 |
|
| 762 |
$fileName = "product_dump_".date('Y-m-d').".csv";
|
| 763 |
$fileHandle = fopen($fileName, "w");
|
| 771 |
$productObj = Mage::getModel('catalog/product')->getCollection()->addAttributeToSelect('*'); // you can add * or field name here eg. ('sku','product_name','description')
|
| 772 |
|
| 773 |
foreach ($productObj as $productRow) {
|
| 774 |
+
|
| 775 |
foreach($unserielTaxClass as $key => $valueTax)
|
| 776 |
{
|
| 777 |
if($productRow->getTaxClassId() == $valueTax['magentotaxclass'])
|
| 795 |
|
| 796 |
$createdDate = date("d.m.Y",strtotime($productRow->getCreatedAt()));
|
| 797 |
|
| 798 |
+
foreach($unserielValProductType as $keyproducttype => $valproducttype)
|
| 799 |
+
{
|
| 800 |
+
if($productRow->getTypeId() == $valproducttype['magentoproducttype'])
|
| 801 |
+
{
|
| 802 |
+
$productTypeCode = $valproducttype['bluestoreproducttype'];
|
| 803 |
+
}
|
| 804 |
+
}
|
| 805 |
+
|
| 806 |
$dataCollection = array(
|
| 807 |
"INSTANCE",
|
| 808 |
'',
|
| 809 |
"true",
|
| 810 |
$productCategory,
|
| 811 |
$productCode,
|
| 812 |
+
$productTypeCode,
|
| 813 |
$bluestoreTaxclassCode,
|
| 814 |
$ProductStatus,
|
| 815 |
$unitOfMeasureCode,
|
app/code/local/Bluefish/Connection/controllers/Adminhtml/Xml.php
CHANGED
|
@@ -1476,6 +1476,7 @@ function importBluestoreSales($transactionNumber)
|
|
| 1476 |
|
| 1477 |
if ($customerCode == "") {
|
| 1478 |
$customerGuest = Mage::getModel('customer/customer')->load($guestCustomerCode);
|
|
|
|
| 1479 |
$customerAddress = array();
|
| 1480 |
|
| 1481 |
foreach ($customerGuest->getAddresses() as $address)
|
|
@@ -2682,7 +2683,7 @@ function ExportProductData()
|
|
| 2682 |
{
|
| 2683 |
### For Product info
|
| 2684 |
$productInfo = $soap->call($sessionId,'catalog_product.info',$productList[$i][entity_id]);
|
| 2685 |
-
|
| 2686 |
$docNO = $zz+1;
|
| 2687 |
$typeCode = "";
|
| 2688 |
|
|
@@ -2704,6 +2705,7 @@ function ExportProductData()
|
|
| 2704 |
$ProductStatus = "";
|
| 2705 |
$startDate = "";
|
| 2706 |
$productDescription = "";
|
|
|
|
| 2707 |
|
| 2708 |
$resultCategory = $connection->query("select code from ".$prefix."bluefish_category WHERE category_id = '".$productInfo[categories]['0']."'");
|
| 2709 |
$dataCategory = $resultCategory->fetchAll(PDO::FETCH_ASSOC);
|
|
@@ -2748,7 +2750,8 @@ function ExportProductData()
|
|
| 2748 |
|
| 2749 |
|
| 2750 |
$xmlRequest .=
|
| 2751 |
-
"<
|
|
|
|
| 2752 |
<categoryCode>".$bluestoreCategoryCode."</categoryCode>
|
| 2753 |
<taxClassCode>".$taxClassCode."</taxClassCode>
|
| 2754 |
<active>".$ProductStatus."</active>
|
|
@@ -2768,6 +2771,7 @@ function ExportProductData()
|
|
| 2768 |
</product>
|
| 2769 |
</products>
|
| 2770 |
</batch>";
|
|
|
|
| 2771 |
$arrayXml[] = $xmlRequest;
|
| 2772 |
$zz++;
|
| 2773 |
}
|
| 1476 |
|
| 1477 |
if ($customerCode == "") {
|
| 1478 |
$customerGuest = Mage::getModel('customer/customer')->load($guestCustomerCode);
|
| 1479 |
+
|
| 1480 |
$customerAddress = array();
|
| 1481 |
|
| 1482 |
foreach ($customerGuest->getAddresses() as $address)
|
| 2683 |
{
|
| 2684 |
### For Product info
|
| 2685 |
$productInfo = $soap->call($sessionId,'catalog_product.info',$productList[$i][entity_id]);
|
| 2686 |
+
|
| 2687 |
$docNO = $zz+1;
|
| 2688 |
$typeCode = "";
|
| 2689 |
|
| 2705 |
$ProductStatus = "";
|
| 2706 |
$startDate = "";
|
| 2707 |
$productDescription = "";
|
| 2708 |
+
$barcode = "";
|
| 2709 |
|
| 2710 |
$resultCategory = $connection->query("select code from ".$prefix."bluefish_category WHERE category_id = '".$productInfo[categories]['0']."'");
|
| 2711 |
$dataCategory = $resultCategory->fetchAll(PDO::FETCH_ASSOC);
|
| 2750 |
|
| 2751 |
|
| 2752 |
$xmlRequest .=
|
| 2753 |
+
"<barcode>".$productInfo[barcode]."</barcode>
|
| 2754 |
+
<typeCode>".$typeCode."</typeCode>
|
| 2755 |
<categoryCode>".$bluestoreCategoryCode."</categoryCode>
|
| 2756 |
<taxClassCode>".$taxClassCode."</taxClassCode>
|
| 2757 |
<active>".$ProductStatus."</active>
|
| 2771 |
</product>
|
| 2772 |
</products>
|
| 2773 |
</batch>";
|
| 2774 |
+
|
| 2775 |
$arrayXml[] = $xmlRequest;
|
| 2776 |
$zz++;
|
| 2777 |
}
|
app/code/local/Bluefish/Connection/etc/config.xml
CHANGED
|
@@ -188,7 +188,7 @@
|
|
| 188 |
<crontab>
|
| 189 |
<jobs>
|
| 190 |
<bluefish_connection_category>
|
| 191 |
-
<schedule><cron_expr>
|
| 192 |
<run><model>connection/cronobserver::categoryImport</model></run>
|
| 193 |
</bluefish_connection_category>
|
| 194 |
<bluefish_connection_product>
|
|
@@ -200,7 +200,7 @@
|
|
| 200 |
<run><model>connection/cronobserver::productEmport</model></run>
|
| 201 |
</bluefish_connection_productexport>
|
| 202 |
<bluefish_connection_stock>
|
| 203 |
-
<schedule><cron_expr>0
|
| 204 |
<run><model>connection/cronobserver::stockImport</model></run>
|
| 205 |
</bluefish_connection_stock>
|
| 206 |
<bluefish_connection_customer>
|
|
@@ -212,11 +212,11 @@
|
|
| 212 |
<run><model>connection/cronobserver::customerExport</model></run>
|
| 213 |
</bluefish_connection_customerexport>
|
| 214 |
<bluefish_connection_orderimport>
|
| 215 |
-
<schedule><cron_expr>
|
| 216 |
<run><model>connection/cronobserver::salesImport</model></run>
|
| 217 |
</bluefish_connection_orderimport>
|
| 218 |
<bluefish_connection_orderexport>
|
| 219 |
-
<schedule><cron_expr>
|
| 220 |
<run><model>connection/cronobserver::salesExport</model></run>
|
| 221 |
</bluefish_connection_orderexport>
|
| 222 |
</jobs>
|
| 188 |
<crontab>
|
| 189 |
<jobs>
|
| 190 |
<bluefish_connection_category>
|
| 191 |
+
<schedule><cron_expr>38 15 * * *</cron_expr></schedule>
|
| 192 |
<run><model>connection/cronobserver::categoryImport</model></run>
|
| 193 |
</bluefish_connection_category>
|
| 194 |
<bluefish_connection_product>
|
| 200 |
<run><model>connection/cronobserver::productEmport</model></run>
|
| 201 |
</bluefish_connection_productexport>
|
| 202 |
<bluefish_connection_stock>
|
| 203 |
+
<schedule><cron_expr>0 * * * *</cron_expr></schedule>
|
| 204 |
<run><model>connection/cronobserver::stockImport</model></run>
|
| 205 |
</bluefish_connection_stock>
|
| 206 |
<bluefish_connection_customer>
|
| 212 |
<run><model>connection/cronobserver::customerExport</model></run>
|
| 213 |
</bluefish_connection_customerexport>
|
| 214 |
<bluefish_connection_orderimport>
|
| 215 |
+
<schedule><cron_expr>35 8 * * *</cron_expr></schedule>
|
| 216 |
<run><model>connection/cronobserver::salesImport</model></run>
|
| 217 |
</bluefish_connection_orderimport>
|
| 218 |
<bluefish_connection_orderexport>
|
| 219 |
+
<schedule><cron_expr>35 8 * * *</cron_expr></schedule>
|
| 220 |
<run><model>connection/cronobserver::salesExport</model></run>
|
| 221 |
</bluefish_connection_orderexport>
|
| 222 |
</jobs>
|
app/code/local/Bluefish/Connection/sql/connection_setup/{mysql4-upgrade-1.1.3-1.1.5.php → mysql4-upgrade-1.1.4-1.1.5.php}
RENAMED
|
File without changes
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Bluefish_Connection</name>
|
| 4 |
-
<version>1.1.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -18,10 +18,10 @@ http://support.bluefishretail.com/entries/30115203-Installation-and-set-up
|
|
| 18 |

|
| 19 |
We are on hand to help you get setup, contact us through our website www.bluefishretail.com</description>
|
| 20 |
<notes>This extension can be used by the users of bluefishretail,by providing appropriate credentials,given to them by bluefishretail.</notes>
|
| 21 |
-
<authors><author><name>
|
| 22 |
-
<date>2015-04
|
| 23 |
-
<time>
|
| 24 |
-
<contents><target name="
|
| 25 |
<compatible/>
|
| 26 |
-
<dependencies><required><php><min>5.1.0</min><max>5.6.
|
| 27 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Bluefish_Connection</name>
|
| 4 |
+
<version>1.1.6</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 18 |

|
| 19 |
We are on hand to help you get setup, contact us through our website www.bluefishretail.com</description>
|
| 20 |
<notes>This extension can be used by the users of bluefishretail,by providing appropriate credentials,given to them by bluefishretail.</notes>
|
| 21 |
+
<authors><author><name>J Doyle</name><user>jdoyle</user><email>jdoyle@bluefishretail.com</email></author></authors>
|
| 22 |
+
<date>2015-11-04</date>
|
| 23 |
+
<time>18:45:22</time>
|
| 24 |
+
<contents><target name="magelocal"><dir name="Bluefish"><dir name="Connection"><dir name="Block"><dir name="Adminhtml"><dir name="Bluestorecron"><file name="Grid.php" hash="607f11628693a178bf3b24a1fa00d186"/></dir><file name="Bluestorecron.php" hash="9ed58d66971718270d9bedffe3f577fa"/><dir name="Bluestorescheduler"><file name="Grid.php" hash="5c86b64f9af2a02ea9e9a64111274b72"/></dir><file name="Bluestorescheduler.php" hash="15aaa462a00aea87da5c7606767c7d26"/><dir name="Errorsaleimport"><file name="Grid.php" hash="a70ff1d4899e013d7c08480f15be87e7"/></dir><file name="Errorsaleimport.php" hash="3968634c28963ec4f87854b1dfbcbbf1"/></dir><file name="Bluestoreproducttype.php" hash="4ea7535123b172c7467b66134d08f167"/><file name="Bluestoretaxclass.php" hash="d1777a291e91fef8d23ace0de9e68921"/><file name="Bluestoretaxcode.php" hash="a969e969aab9846a9019072162d215ab"/><file name="Cronschedule.php" hash="4062fd7c8fac5605670b559734767188"/><file name="Databasemapping.php" hash="e1f41279da9fbb1a79eb5184a5ee769e"/><file name="Outofstocksale.php" hash="7e0d652af931910dff6d808ce3295dd7"/><file name="Paymentmethodcode.php" hash="fd4c33ee96330ee1d75841aa09de8774"/><file name="Productdatabasemapping.php" hash="946ad48493133aecf13adc56a6a8f389"/><file name="Salesmapping.php" hash="a842151ccde98cd5bd072038925872c6"/></dir><dir name="Helper"><file name="Data.php" hash="2cd2e9cf9728228d68be3280bbebf7ff"/></dir><dir name="Model"><file name="Bluestoreschedule.php" hash="840d1c3dadd60eeb4787a43b4d870d66"/><dir name="Carrier"><file name="Bsaleshippingmethod.php" hash="2223e8692e7389340fb09d6be7f4c8d8"/></dir><dir name="CatalogInventory"><dir name="Stock"><file name="Item.php" hash="fac3729dd265ce1857e03c4c2e2f5f94"/></dir></dir><dir name="Checkout"><dir name="Cart"><file name="Api.php" hash="031771c7af6a9ac668e6a545957bdeeb"/></dir></dir><dir name="Collection"><file name="Crons.php" hash="86aba02a88fc122f9641c89a4fcd434c"/></dir><file name="Configuration.php" hash="7dd9b00e905b7f260c4a9becc82438ff"/><file name="Connection.php" hash="76da5fa34acfb6294ca712e76b22e223"/><file name="Cronobserver.php" hash="5184d3827ec55aa9eb93ba84fc8d2616"/><file name="Errorsaleimport.php" hash="a332ee81b77c2852ce50743b2f5dfcd1"/><dir name="Mysql4"><dir name="Connection"><file name="Collection.php" hash="0c9166e76131a7092872871b2444754b"/></dir><file name="Connection.php" hash="2c982c25bb2dc863a2693433063a0050"/><dir name="Errorsaleimport"><file name="Collection.php" hash="2717a8f56f9bdef64543bfb1ae6d094c"/></dir><file name="Errorsaleimport.php" hash="3aa550d191ae384d7d263b27e6118fa3"/></dir><file name="Observer.php" hash="b374e815b000f34b77baf16bacccf9fc"/><file name="Paymentmethod.php" hash="4649334553c6fccb045dfdb7d535e31f"/><file name="Status.php" hash="4fdeede680b4420331aae6fda74d36d9"/><file name="Store.php" hash="7b829fe08727d0d7ac2c59abcd34c4b2"/><file name="Validationcrontime.php" hash="525b215224b7e42c945c2b53d3b00c20"/><file name="Validationpaymentmap.php" hash="34eca47cafbe547e9cbb019f61e3de83"/><file name="Validationtaxclass.php" hash="52ef2ddc4cc6e1a7c146c664e2b88ed3"/><file name="Validationtaxcode.php" hash="42f2fc5dcecfb65ce3a56ed167f41266"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="Bluefish_API.php" hash="c07d056ffe4561dc211cc4a946807770"/><file name="Bluefish_Error_Reporting.php" hash="ae152b9b57c4dfee907a4e7f2b7fec1f"/><file name="BluestorecronController.php" hash="371f55c62d4d19151ee11211e82e85c2"/><file name="BluestoreschedulerController.php" hash="3995ffe7faf68619a09509c9192943cf"/><file name="CategorydataController.php" hash="7dc83d091cba0bf402f0d8d5c349859f"/><file name="ErrorsaleimportController.php" hash="17a0b262ac68095083ba6180b5c85a1b"/><file name="MyformController.php" hash="cbc14da1b95133b1651554f6a738c628"/><file name="MyformexportController.php" hash="2ecc27a870ab7e140c2689ce4944de27"/><file name="ProductdataController.php" hash="9bdedff5d6650a71aafa0cd4195cc002"/><file name="Xml.php" hash="f41fe419c9c40677a15fad0af4ecb1f5"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="f958df2fe25675db0cfa466a13d21317"/><file name="config.xml" hash="699b81a1cecf7bc04226347597edd599"/><file name="system.xml" hash="db078d0901f0f76151ae04f8488d7091"/></dir><dir name="sql"><dir name="connection_setup"><file name="mysql4-install-0.1.0.php" hash="6badacdb48b9a868da95e2c1761732c4"/><file name="mysql4-upgrade-0.1.0-1.1.1.php" hash="f4d1a592ab45d034f6b40c3712accb63"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="e32a7745adad592cd3fb9a64257d1359"/><file name="mysql4-upgrade-1.1.2-1.1.3.php" hash="a418dfa877ade09191aa57a6a7178933"/><file name="mysql4-upgrade-1.1.4-1.1.5.php" hash="2fd1948687bf0f1ff53bcd032e0dd636"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="connection.xml" hash="ae5bb64dd8522cda5c87a075dcdf070c"/></dir><dir name="template"><dir name="connection"><file name="array_dropdown.phtml" hash="a7570dbb97b61c7f55d40bca280043b8"/><file name="cronschedule.phtml" hash="c503011206bc0b7ca2b7e6fe2fef401c"/><file name="custom_product_radioinput.phtml" hash="50acd5bf82b7926e56f91246cbefb3cf"/><file name="custom_radioinput.phtml" hash="203c94df69e858acdc776d4b10fa812c"/><file name="myform.phtml" hash="016a79f18b4483c697bfbe57ee27e5ee"/><file name="myformexport.phtml" hash="c6b1c7d578d12da74a0622f5264a08ba"/><file name="outofstocksale.phtml" hash="e3c1641d1ff1362f3f1845bdd161f3bf"/><file name="salesmapping_radioinput.phtml" hash="e3c1641d1ff1362f3f1845bdd161f3bf"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Bluefish_Connection.xml" hash="3bc6e3ec98be70ee60a5ffa08ffb4f86"/></dir></target></contents>
|
| 25 |
<compatible/>
|
| 26 |
+
<dependencies><required><php><min>5.1.0</min><max>5.6.14</max></php></required></dependencies>
|
| 27 |
</package>
|
