Version Notes
New features :
- Fixed order_flat shipping bug
Download this release
Release Info
Developer | BeezUP |
Extension | BeezUP_Module_feed_and_tracker |
Version | 4.7.3 |
Comparing to | |
See all releases |
Code changes from version 4.7.2 to 4.7.3
app/code/community/BeezUp/Block/Order.php
CHANGED
@@ -576,6 +576,7 @@ class Beezup_Block_Order extends Mage_core_block_text {
|
|
576 |
|
577 |
|
578 |
$addressData = array(
|
|
|
579 |
'billing_firstname' => ($data['order_customer']) ? $data['order_customer'] : "empty",
|
580 |
'billing_lastname' => ($data['order_lastname']) ? $data['order_lastname'] : "empty",
|
581 |
'billing_street' => ($data['order_address']) ? $data['order_address'] : "empty",
|
@@ -591,6 +592,7 @@ class Beezup_Block_Order extends Mage_core_block_text {
|
|
591 |
'shipping_postcode' => ($data['shipping_postalCode']) ? $data['shipping_postalCode'] : "empty",
|
592 |
'shipping_telephone' => ($data['shipping_phone']) ? $data['shipping_phone'] : "empty",
|
593 |
'shipping_country_id' => ($data['shipping_country_iso']) ? $data['shipping_country_iso'] : "empty",
|
|
|
594 |
'shipping_region_id' => ($data['shipping_region']) ? substr($data['shipping_region'], 0, 2) : "EM" // id from directory_country_region table
|
595 |
);
|
596 |
|
@@ -961,6 +963,7 @@ class Beezup_Block_Order extends Mage_core_block_text {
|
|
961 |
'postcode' => ($data['order_postalCode']) ? $data['order_postalCode'] : "empty",
|
962 |
'telephone' => ($data['order_customer_phone']) ? $data['order_customer_phone'] : "empty",
|
963 |
'country_id' => ($data['order_country_iso']) ? $data['order_country_iso'] : "empty",
|
|
|
964 |
'region_id' => ($data['order_region ']) ? substr($data['order_region '], 0,2) : "EM"// id from directory_country_region table
|
965 |
);
|
966 |
|
@@ -972,6 +975,7 @@ class Beezup_Block_Order extends Mage_core_block_text {
|
|
972 |
'postcode' => ($data['shipping_postalCode']) ? $data['shipping_postalCode'] : "empty",
|
973 |
'telephone' => ($data['shipping_phone']) ? $data['shipping_phone'] : "empty",
|
974 |
'country_id' => ($data['shipping_country_iso']) ? $data['shipping_country_iso'] : "empty",
|
|
|
975 |
'region_id' => ($data['shipping_region']) ? substr($data['shipping_region'], 0, 2) : "EM" // id from directory_country_region table
|
976 |
);
|
977 |
|
576 |
|
577 |
|
578 |
$addressData = array(
|
579 |
+
'billing_company' => ($data['order_company']) ? $data['order_company'] : "",
|
580 |
'billing_firstname' => ($data['order_customer']) ? $data['order_customer'] : "empty",
|
581 |
'billing_lastname' => ($data['order_lastname']) ? $data['order_lastname'] : "empty",
|
582 |
'billing_street' => ($data['order_address']) ? $data['order_address'] : "empty",
|
592 |
'shipping_postcode' => ($data['shipping_postalCode']) ? $data['shipping_postalCode'] : "empty",
|
593 |
'shipping_telephone' => ($data['shipping_phone']) ? $data['shipping_phone'] : "empty",
|
594 |
'shipping_country_id' => ($data['shipping_country_iso']) ? $data['shipping_country_iso'] : "empty",
|
595 |
+
'shipping_company' => ($data['shipping_company']) ? $data['shipping_company'] : "",
|
596 |
'shipping_region_id' => ($data['shipping_region']) ? substr($data['shipping_region'], 0, 2) : "EM" // id from directory_country_region table
|
597 |
);
|
598 |
|
963 |
'postcode' => ($data['order_postalCode']) ? $data['order_postalCode'] : "empty",
|
964 |
'telephone' => ($data['order_customer_phone']) ? $data['order_customer_phone'] : "empty",
|
965 |
'country_id' => ($data['order_country_iso']) ? $data['order_country_iso'] : "empty",
|
966 |
+
'company' => ($data['order_company']) ? $data['order_company'] : "",
|
967 |
'region_id' => ($data['order_region ']) ? substr($data['order_region '], 0,2) : "EM"// id from directory_country_region table
|
968 |
);
|
969 |
|
975 |
'postcode' => ($data['shipping_postalCode']) ? $data['shipping_postalCode'] : "empty",
|
976 |
'telephone' => ($data['shipping_phone']) ? $data['shipping_phone'] : "empty",
|
977 |
'country_id' => ($data['shipping_country_iso']) ? $data['shipping_country_iso'] : "empty",
|
978 |
+
'shipping_company' => ($data['shipping_company']) ? $data['shipping_company'] : "",
|
979 |
'region_id' => ($data['shipping_region']) ? substr($data['shipping_region'], 0, 2) : "EM" // id from directory_country_region table
|
980 |
);
|
981 |
|
app/code/community/BeezUp/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<BeezUp>
|
5 |
-
<version>4.7.
|
6 |
</BeezUp>
|
7 |
</modules>
|
8 |
<global>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<BeezUp>
|
5 |
+
<version>4.7.3</version>
|
6 |
</BeezUp>
|
7 |
</modules>
|
8 |
<global>
|
app/code/community/BeezUp/etc/system.xml
CHANGED
@@ -44,7 +44,7 @@
|
|
44 |
<tracking translate="label">
|
45 |
<label>Tracking</label>
|
46 |
<frontend_type>text</frontend_type>
|
47 |
-
<comment><![CDATA[<div style="font-size:11px;padding:3px;margin-bottom:20px;background:#FFF9E9;border:1px solid #EEE2BE">Support BeezUP : <a href="mailto:help@beezup.com">help@beezup.com</a> (Magento BeezUP v4.7.
|
48 |
<sort_order>1</sort_order>
|
49 |
<show_in_default>1</show_in_default>
|
50 |
<show_in_website>1</show_in_website>
|
@@ -108,7 +108,7 @@
|
|
108 |
<marketplace tanslate="label">
|
109 |
<label>Marketplace</label>
|
110 |
<frontend_type>text</frontend_type>
|
111 |
-
<comment><![CDATA[<div style="font-size:11px;padding:3px;margin-bottom:20px;background:#FFF9E9;border:1px solid #EEE2BE">Support BeezUP : <a href="mailto:help@beezup.com">help@beezup.com</a> (Magento BeezUP v4.7.
|
112 |
<sort_order>2</sort_order>
|
113 |
<show_in_default>1</show_in_default>
|
114 |
<show_in_website>1</show_in_website>
|
@@ -496,7 +496,7 @@
|
|
496 |
<flux translate="label">
|
497 |
<label>Catalog Flow</label>
|
498 |
<frontend_type>text</frontend_type>
|
499 |
-
<comment><![CDATA[<div style="font-size:11px;padding:3px;margin-bottom:20px;background:#FFF9E9;border:1px solid #EEE2BE">Support BeezUP : <a href="mailto:help@beezup.com">help@beezup.com</a> (Magento BeezUP v4.7.
|
500 |
<sort_order>2</sort_order>
|
501 |
<show_in_default>1</show_in_default>
|
502 |
<show_in_website>1</show_in_website>
|
44 |
<tracking translate="label">
|
45 |
<label>Tracking</label>
|
46 |
<frontend_type>text</frontend_type>
|
47 |
+
<comment><![CDATA[<div style="font-size:11px;padding:3px;margin-bottom:20px;background:#FFF9E9;border:1px solid #EEE2BE">Support BeezUP : <a href="mailto:help@beezup.com">help@beezup.com</a> (Magento BeezUP v4.7.3) - <a href="http://go.beezup.com" target="_blank">My BeezUP Account</a></div>]]></comment>
|
48 |
<sort_order>1</sort_order>
|
49 |
<show_in_default>1</show_in_default>
|
50 |
<show_in_website>1</show_in_website>
|
108 |
<marketplace tanslate="label">
|
109 |
<label>Marketplace</label>
|
110 |
<frontend_type>text</frontend_type>
|
111 |
+
<comment><![CDATA[<div style="font-size:11px;padding:3px;margin-bottom:20px;background:#FFF9E9;border:1px solid #EEE2BE">Support BeezUP : <a href="mailto:help@beezup.com">help@beezup.com</a> (Magento BeezUP v4.7.3) - <a href="http://go.beezup.com" target="_blank">My BeezUP Account</a></div>]]></comment>
|
112 |
<sort_order>2</sort_order>
|
113 |
<show_in_default>1</show_in_default>
|
114 |
<show_in_website>1</show_in_website>
|
496 |
<flux translate="label">
|
497 |
<label>Catalog Flow</label>
|
498 |
<frontend_type>text</frontend_type>
|
499 |
+
<comment><![CDATA[<div style="font-size:11px;padding:3px;margin-bottom:20px;background:#FFF9E9;border:1px solid #EEE2BE">Support BeezUP : <a href="mailto:help@beezup.com">help@beezup.com</a> (Magento BeezUP v4.7.3) - <a href="http://go.beezup.com" target="_blank">My BeezUP Account</a></div>]]></comment>
|
500 |
<sort_order>2</sort_order>
|
501 |
<show_in_default>1</show_in_default>
|
502 |
<show_in_website>1</show_in_website>
|
app/code/community/BeezUp/lib/BeezupMageOrders.php
CHANGED
@@ -1,313 +1,260 @@
|
|
1 |
-
<?php
|
2 |
|
3 |
class BeezupMageOrders {
|
4 |
-
|
5 |
public $id_order;
|
6 |
public $data = array();
|
7 |
public $Mageresource = null;
|
8 |
public $conection = null;
|
9 |
-
|
10 |
public function __construct($id_order) {
|
11 |
$this->id_order = $id_order;
|
|
|
12 |
}
|
13 |
-
|
14 |
public function setData($data) {
|
15 |
$this->data = $data;
|
16 |
}
|
17 |
-
|
18 |
-
|
19 |
public function updateShippingInfo() {
|
20 |
-
$this->
|
21 |
-
$
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
22 |
}
|
23 |
-
|
24 |
-
|
25 |
public function escape($string) {
|
26 |
return Mage::getSingleton('core/resource')->getConnection('default_write')->quote($string);
|
27 |
}
|
28 |
-
|
29 |
public function updateBeezupInfo() {
|
30 |
if(!empty($this->data)) {
|
31 |
$this->getConnection();
|
32 |
$table = $this->getTableName("sales/order_grid");
|
33 |
$query = "select * from ".$table." where entity_id = '".$this->id_order."' ";
|
34 |
$results = $this->connection->fetchAll($query);
|
35 |
-
if(!empty($results)) {
|
36 |
$result = $results[0];
|
37 |
$query = $this->updateInfoTab($result, $table);
|
38 |
if($query) {
|
39 |
$this->getConnection("core_write");
|
40 |
-
$this->connection->query($query);
|
41 |
}
|
42 |
}
|
43 |
}
|
44 |
-
|
45 |
}
|
46 |
-
|
47 |
private function updateInfoTab($result, $table) {
|
48 |
$query = "update {$table} set ";
|
49 |
$blndentro = false;
|
50 |
-
|
51 |
if($this->data['beezup_status'] != $result['beezup_status']) {
|
52 |
-
$blndentro = true;
|
53 |
$query .= " beezup_status = '{$this->data['beezup_status'] }' ,";
|
54 |
-
}
|
55 |
-
|
56 |
if($this->data['beezup_last_modification_date'] != $result['beezup_last_modification_date']) {
|
57 |
-
$blndentro = true;
|
58 |
$query .= " beezup_last_modification_date = '{$this->data['beezup_last_modification_date'] }' ,";
|
59 |
-
}
|
60 |
-
|
61 |
if($this->data['beezup_marketplace_last_modification_date'] != $result['beezup_marketplace_last_modification_date']) {
|
62 |
-
$blndentro = true;
|
63 |
$query .= " beezup_marketplace_last_modification_date = '{$this->data['beezup_marketplace_last_modification_date'] }' ,";
|
64 |
}
|
65 |
-
|
66 |
if($this->data['beezup_total_paid'] != $result['beezup_total_paid']) {
|
67 |
-
$blndentro = true;
|
68 |
$query .= " beezup_total_paid = '{$this->data['beezup_total_paid'] }' ,";
|
69 |
-
}
|
70 |
-
|
71 |
if($this->data['beezup_comission'] != $result['beezup_comission']) {
|
72 |
-
$blndentro = true;
|
73 |
$query .= " beezup_comission = '{$this->data['beezup_comission'] }' ,";
|
74 |
-
}
|
75 |
-
|
76 |
if($this->data['beezup_marketplace_status'] != $result['beezup_marketplace_status']) {
|
77 |
-
$blndentro = true;
|
78 |
$query .= " beezup_marketplace_status = '{$this->data['beezup_marketplace_status'] }' ,";
|
79 |
-
}
|
80 |
if($blndentro) {
|
81 |
$query = substr($query, 0, -1);
|
82 |
$query .= " where entity_id = '{$this->id_order}' ";
|
83 |
return $query;
|
84 |
-
|
85 |
}
|
86 |
return false;
|
87 |
}
|
88 |
-
|
89 |
-
|
90 |
-
public function updateAdresses() {
|
91 |
-
if(!empty($this->data)) {
|
92 |
-
$this->getConnection();
|
93 |
-
$table = $this->getTableName("sales/order_address");
|
94 |
-
$query = "select * from ".$table." where parent_id = '".$this->id_order."' ";
|
95 |
-
$results = $this->connection->fetchAll($query);
|
96 |
-
foreach($results as $result) {
|
97 |
-
if($result['address_type'] == "billing") {
|
98 |
-
//update billing
|
99 |
-
$query = $this->updateBilling($result, $table);
|
100 |
-
if($query) {
|
101 |
-
$this->getConnection("core_write");
|
102 |
-
$this->connection->query($query);
|
103 |
-
}
|
104 |
-
} else {
|
105 |
-
//update shipping
|
106 |
-
$query = $this->updateShipping($result, $table);
|
107 |
|
108 |
-
|
109 |
-
|
110 |
-
|
111 |
-
|
112 |
-
|
113 |
-
|
114 |
-
}
|
115 |
}
|
116 |
-
|
117 |
}
|
118 |
|
119 |
-
|
120 |
-
|
|
|
121 |
$blndentro = false;
|
122 |
-
|
123 |
-
|
124 |
-
|
125 |
-
|
126 |
-
|
127 |
-
|
128 |
-
|
129 |
-
$query .= " postcode = '{$this->data['shipping_postcode'] }' ,";
|
130 |
}
|
131 |
-
|
132 |
-
|
133 |
-
|
134 |
-
$query .= " lastname = {$this->escape($this->data['shipping_lastname']) } ,";
|
135 |
}
|
136 |
-
if($this->data['shipping_street'] != $
|
137 |
-
|
138 |
-
$
|
139 |
}
|
140 |
-
if($this->data['shipping_city'] != $
|
141 |
-
|
142 |
-
$
|
143 |
}
|
144 |
-
if($this->data['shipping_telephone'] != $
|
145 |
-
|
146 |
-
$
|
|
|
|
|
|
|
|
|
|
|
147 |
}
|
148 |
-
|
149 |
-
$
|
150 |
-
|
|
|
|
|
151 |
}
|
152 |
-
|
153 |
if($blndentro) {
|
154 |
-
$
|
155 |
-
$query .= " where parent_id = '{$this->id_order}' and address_type = 'shipping'";
|
156 |
-
return $query;
|
157 |
-
|
158 |
}
|
159 |
-
|
160 |
-
|
161 |
-
|
162 |
-
|
163 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
164 |
$blndentro = false;
|
165 |
-
|
166 |
-
|
167 |
-
$
|
168 |
-
$query .= " country_id = '{$this->data['billing_country'] }' ,";
|
169 |
-
}
|
170 |
-
if($this->data['billing_postcode'] != $result['postcode']) {
|
171 |
-
$blndentro = true;
|
172 |
-
$query .= " postcode = '{$this->data['billing_postcode'] }' ,";
|
173 |
}
|
174 |
-
|
175 |
-
|
176 |
-
$
|
177 |
-
$query .= " lastname = {$this->escape($this->data['billing_lastname'] )} ,";
|
178 |
}
|
179 |
-
if($this->data['
|
180 |
-
$blndentro = true;
|
181 |
-
|
182 |
}
|
183 |
-
if($this->data['
|
184 |
-
$blndentro = true;
|
185 |
-
|
186 |
}
|
187 |
-
if($this->data['
|
188 |
-
$blndentro = true;
|
189 |
-
|
190 |
}
|
191 |
-
if($this->data['
|
192 |
-
$blndentro = true;
|
193 |
-
|
194 |
}
|
195 |
-
|
196 |
-
|
197 |
-
|
198 |
-
$query .= " where parent_id = '{$this->id_order}' and address_type = 'billing'";
|
199 |
-
return $query;
|
200 |
-
|
201 |
-
}
|
202 |
-
return false;
|
203 |
-
|
204 |
-
}
|
205 |
-
|
206 |
-
private function updateSalesInvoice() {
|
207 |
-
if(!empty($this->data)) {
|
208 |
-
$this->getConnection();
|
209 |
-
$table = $this->getTableName("sales/invoice");
|
210 |
-
$query = "select * from ".$table." where transaction_id = '".$this->id_order."' ";
|
211 |
-
|
212 |
-
$results = $this->connection->fetchAll($query);
|
213 |
-
|
214 |
-
if(!empty($results)) {
|
215 |
-
$result = $results[0];
|
216 |
-
// if($result['shipping_amount'] != $this->data['shipping']) {
|
217 |
-
$query = $this->getSalesInvoiceWriteQuery($result, $table);
|
218 |
-
$this->getConnection("core_write");
|
219 |
-
$this->connection->query($query);
|
220 |
-
// }
|
221 |
-
}
|
222 |
-
|
223 |
}
|
224 |
-
|
225 |
-
}
|
226 |
-
|
227 |
-
private function getSalesInvoiceWriteQuery($result, $table) {
|
228 |
-
$query = "update {$table} set base_shipping_amount = '{$this->data['shipping']}', shipping_amount = '{$this->data['shipping']}'" ;
|
229 |
-
$query .= $this->setQueryParameters($result, "shipping_incl_tax");
|
230 |
-
$query .= $this->setQueryParameters($result, "base_shipping_incl_tax");
|
231 |
-
$query .= $this->setQueryParameters($result, "base_grand_total", true);
|
232 |
-
$query .= $this->setQueryParameters($result, "grand_total", true);
|
233 |
-
$query .= " where transaction_id = '{$this->id_order}'";
|
234 |
-
return $query;
|
235 |
-
}
|
236 |
-
|
237 |
-
|
238 |
-
|
239 |
-
|
240 |
-
|
241 |
-
private function updateSalesFlat() {
|
242 |
-
if(!empty($this->data)) {
|
243 |
-
$this->getConnection();
|
244 |
-
$table = $this->getTableName("sales/order");
|
245 |
-
$query = "select * from ".$table." where entity_id = '".$this->id_order."' ";
|
246 |
-
$results = $this->connection->fetchAll($query);
|
247 |
|
248 |
-
|
249 |
-
if(!empty($results)) {
|
250 |
-
$result = $results[0];
|
251 |
|
252 |
-
|
253 |
-
|
254 |
-
|
255 |
|
256 |
-
$this->getConnection("core_write");
|
257 |
-
$this->connection->query($query);
|
258 |
-
}
|
259 |
}
|
260 |
-
|
261 |
-
|
262 |
-
|
263 |
-
}
|
264 |
-
|
265 |
-
|
266 |
-
private function getSalesFlatWriteQuery($result, $table) {
|
267 |
-
$query = "update {$table} set base_shipping_amount = '{$this->data['shipping']}', shipping_amount = '{$this->data['shipping']}'" ;
|
268 |
-
$query .= $this->setQueryParameters($result, "base_shipping_invoiced");
|
269 |
-
$query .= $this->setQueryParameters($result, "shipping_invoiced");
|
270 |
-
$query .= $this->setQueryParameters($result, "base_grand_total", true);
|
271 |
-
$query .= $this->setQueryParameters($result, "base_total_invoiced", true);
|
272 |
-
$query .= $this->setQueryParameters($result, "base_total_paid", true);
|
273 |
-
$query .= $this->setQueryParameters($result, "grand_total", true);
|
274 |
-
$query .= $this->setQueryParameters($result, "total_invoiced", true);
|
275 |
-
$query .= $this->setQueryParameters($result, "total_paid", true);
|
276 |
-
$query .= $this->setQueryParameters($result, "base_total_paid", true);
|
277 |
-
$query .= $this->setQueryParameters($result, "total_paid", true);
|
278 |
-
$query .= $this->setQueryParameters($result, "shipping_incl_tax");
|
279 |
-
$query .= $this->setQueryParameters($result, "base_shipping_incl_tax");
|
280 |
-
$query .= " where entity_id = '{$this->id_order}'";
|
281 |
-
return $query;
|
282 |
-
}
|
283 |
-
|
284 |
-
|
285 |
-
private function setQueryParameters($result, $column, $isTotal = false) {
|
286 |
-
$query = "";
|
287 |
-
if( !empty($result[$column])) {
|
288 |
-
if($isTotal) {
|
289 |
-
$data = ($result[$column] - $result['shipping_amount']) + $this->data['shipping'];
|
290 |
-
$query = " , ".$column." = '{$data}'";
|
291 |
-
} else {
|
292 |
-
$query = " , ".$column." = '{$this->data['shipping']}'";
|
293 |
-
}
|
294 |
-
|
295 |
}
|
296 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
297 |
}
|
298 |
-
|
299 |
-
|
300 |
-
|
|
|
|
|
301 |
private function getConnection($connection = "core_read") {
|
302 |
$this->Mageresource = Mage::getSingleton('core/resource');
|
303 |
$this->connection = $this->Mageresource->getConnection($connection);
|
304 |
}
|
305 |
-
|
306 |
private function getTableName($table) {
|
307 |
return $this->Mageresource->getTableName($table);
|
308 |
}
|
309 |
-
|
310 |
-
|
311 |
-
|
312 |
-
|
313 |
-
}
|
1 |
+
<?php
|
2 |
|
3 |
class BeezupMageOrders {
|
4 |
+
|
5 |
public $id_order;
|
6 |
public $data = array();
|
7 |
public $Mageresource = null;
|
8 |
public $conection = null;
|
9 |
+
public $order = null;
|
10 |
public function __construct($id_order) {
|
11 |
$this->id_order = $id_order;
|
12 |
+
$this->order = Mage::getModel('sales/order')->load($this->id_order);
|
13 |
}
|
14 |
+
|
15 |
public function setData($data) {
|
16 |
$this->data = $data;
|
17 |
}
|
18 |
+
|
19 |
+
|
20 |
public function updateShippingInfo() {
|
21 |
+
$order = $this->order;
|
22 |
+
if($order->getShippingInclTax() == $this->data['shipping']) { return; }
|
23 |
+
$order_total = ($order->getGrandTotal() - $order->getShippingInclTax()) + $this->data['shipping'];
|
24 |
+
$order->setGrandTotal((float) $order_total);
|
25 |
+
$order->setBaseGrandTotal((float) $order_total);
|
26 |
+
$diff = (((float) $order_total) - $order->getGrandTotal());
|
27 |
+
$order->setTaxAmount($order->getTaxAmount() + $diff);
|
28 |
+
$order->setShippingAmount($this->data['shipping']);
|
29 |
+
$order->setBaseShippingAmount($this->data['shipping']);
|
30 |
+
$order->setShippingInclTax($this->data['shipping']);
|
31 |
+
$order->setBaseShippingInclTax($this->data['shipping']);
|
32 |
+
$order->setSubtotalInclTax($order->getSubtotalInclTax() + $this->data['shipping']);
|
33 |
+
$order->setBaseSubtotalInclTax($order->getSubtotalInclTax() + $this->data['shipping']);
|
34 |
+
$order->setSubtotal($order->getSubtotal() + $this->data['shipping']);
|
35 |
+
$order->setBaseSubtotal($order->getSubtotal() + $this->data['shipping']);
|
36 |
+
$order->setTotalPaid($order->getTotalPaid() + $this->data['shipping']);
|
37 |
+
$order->save();
|
38 |
+
$order->setBaseTaxAmount($order->getTaxAmount());
|
39 |
+
$order->setBaseTaxInvoiced($order->getTaxAmount());
|
40 |
+
$order->setBaseTotalInvoiced($order->getTotalPaid());
|
41 |
+
$order->setBaseTotalPaid($order->getTotalPaid());
|
42 |
+
$order->setBaseGrandTotal($order->getTotalPaid());
|
43 |
+
$order->setBaseSubtotalInclTax($order->getSubtotalInclTax());
|
44 |
+
$order->save();
|
45 |
+
|
46 |
}
|
47 |
+
|
48 |
+
|
49 |
public function escape($string) {
|
50 |
return Mage::getSingleton('core/resource')->getConnection('default_write')->quote($string);
|
51 |
}
|
52 |
+
|
53 |
public function updateBeezupInfo() {
|
54 |
if(!empty($this->data)) {
|
55 |
$this->getConnection();
|
56 |
$table = $this->getTableName("sales/order_grid");
|
57 |
$query = "select * from ".$table." where entity_id = '".$this->id_order."' ";
|
58 |
$results = $this->connection->fetchAll($query);
|
59 |
+
if(!empty($results)) {
|
60 |
$result = $results[0];
|
61 |
$query = $this->updateInfoTab($result, $table);
|
62 |
if($query) {
|
63 |
$this->getConnection("core_write");
|
64 |
+
$this->connection->query($query);
|
65 |
}
|
66 |
}
|
67 |
}
|
68 |
+
|
69 |
}
|
70 |
+
|
71 |
private function updateInfoTab($result, $table) {
|
72 |
$query = "update {$table} set ";
|
73 |
$blndentro = false;
|
74 |
+
|
75 |
if($this->data['beezup_status'] != $result['beezup_status']) {
|
76 |
+
$blndentro = true;
|
77 |
$query .= " beezup_status = '{$this->data['beezup_status'] }' ,";
|
78 |
+
}
|
79 |
+
|
80 |
if($this->data['beezup_last_modification_date'] != $result['beezup_last_modification_date']) {
|
81 |
+
$blndentro = true;
|
82 |
$query .= " beezup_last_modification_date = '{$this->data['beezup_last_modification_date'] }' ,";
|
83 |
+
}
|
84 |
+
|
85 |
if($this->data['beezup_marketplace_last_modification_date'] != $result['beezup_marketplace_last_modification_date']) {
|
86 |
+
$blndentro = true;
|
87 |
$query .= " beezup_marketplace_last_modification_date = '{$this->data['beezup_marketplace_last_modification_date'] }' ,";
|
88 |
}
|
89 |
+
|
90 |
if($this->data['beezup_total_paid'] != $result['beezup_total_paid']) {
|
91 |
+
$blndentro = true;
|
92 |
$query .= " beezup_total_paid = '{$this->data['beezup_total_paid'] }' ,";
|
93 |
+
}
|
94 |
+
|
95 |
if($this->data['beezup_comission'] != $result['beezup_comission']) {
|
96 |
+
$blndentro = true;
|
97 |
$query .= " beezup_comission = '{$this->data['beezup_comission'] }' ,";
|
98 |
+
}
|
99 |
+
|
100 |
if($this->data['beezup_marketplace_status'] != $result['beezup_marketplace_status']) {
|
101 |
+
$blndentro = true;
|
102 |
$query .= " beezup_marketplace_status = '{$this->data['beezup_marketplace_status'] }' ,";
|
103 |
+
}
|
104 |
if($blndentro) {
|
105 |
$query = substr($query, 0, -1);
|
106 |
$query .= " where entity_id = '{$this->id_order}' ";
|
107 |
return $query;
|
108 |
+
|
109 |
}
|
110 |
return false;
|
111 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
112 |
|
113 |
+
|
114 |
+
|
115 |
+
public function updateAdresses() {
|
116 |
+
if(!empty($this->data)) {
|
117 |
+
$this->updateBilling();
|
118 |
+
$this->updateShipping();
|
|
|
119 |
}
|
|
|
120 |
}
|
121 |
|
122 |
+
|
123 |
+
private function updateShipping() {
|
124 |
+
$shippingAddress = Mage::getModel('sales/order_address')->load($this->order->getShippingAddress()->getId());
|
125 |
$blndentro = false;
|
126 |
+
if($this->data['shipping_country'] != $shippingAddress->getCountry_id()) {
|
127 |
+
$blndentro = true;
|
128 |
+
$shippingAddress->setCountry_id($this->data['shipping_country']);
|
129 |
+
}
|
130 |
+
if($this->data['shipping_postcode'] != $shippingAddress->getPostcode()) {
|
131 |
+
$blndentro = true;
|
132 |
+
$shippingAddress->setPostcode($this->data['shipping_postcode']);
|
|
|
133 |
}
|
134 |
+
if($this->data['shipping_lastname'] != $shippingAddress->getLastname()) {
|
135 |
+
$blndentro = true;
|
136 |
+
$shippingAddress->setLastname($this->data['shipping_lastname']);
|
|
|
137 |
}
|
138 |
+
if($this->data['shipping_street'] != $shippingAddress->getStreet()) {
|
139 |
+
$blndentro = true;
|
140 |
+
$shippingAddress->setStreet($this->data['shipping_street']);
|
141 |
}
|
142 |
+
if($this->data['shipping_city'] != $shippingAddress->getCity()) {
|
143 |
+
$blndentro = true;
|
144 |
+
$shippingAddress->setCity($this->data['shipping_city']);
|
145 |
}
|
146 |
+
if($this->data['shipping_telephone'] != $shippingAddress->getTelephone()) {
|
147 |
+
$blndentro = true;
|
148 |
+
$shippingAddress->setTelephone($this->data['shipping_telephone']);
|
149 |
+
}
|
150 |
+
if($this->data['shipping_firstname'] !=$shippingAddress->getFirstname()) {
|
151 |
+
$blndentro = true;
|
152 |
+
$shippingAddress->setFirstname($this->data['shipping_firstname']);
|
153 |
+
|
154 |
}
|
155 |
+
|
156 |
+
if($this->data['shipping_company'] !=$shippingAddress->getCompany()) {
|
157 |
+
$blndentro = true;
|
158 |
+
$shippingAddress->setCompany($this->data['shipping_company']);
|
159 |
+
|
160 |
}
|
161 |
+
|
162 |
if($blndentro) {
|
163 |
+
$shippingAddress->save();
|
|
|
|
|
|
|
164 |
}
|
165 |
+
/*
|
166 |
+
$shippingAddress
|
167 |
+
->setFirstname("value")
|
168 |
+
->setMiddlename("value")
|
169 |
+
->setLastname("value")
|
170 |
+
->setSuffix("value")
|
171 |
+
->setCompany("value")
|
172 |
+
->setStreet("value"))
|
173 |
+
->setCity("value")
|
174 |
+
->setCountry_id("value")
|
175 |
+
->setRegion("value")
|
176 |
+
->setRegion_id("value")
|
177 |
+
->setPostcode("value")
|
178 |
+
->setTelephone("value")
|
179 |
+
->setFax("value")->save();
|
180 |
+
*/
|
181 |
+
}
|
182 |
+
|
183 |
+
|
184 |
+
|
185 |
+
private function updateBilling() {
|
186 |
+
$billingAddress = Mage::getModel('sales/order_address')->load($this->order->getBillingAddress()->getId());
|
187 |
$blndentro = false;
|
188 |
+
if($this->data['billing_country'] != $billingAddress->getCountry_id()) {
|
189 |
+
$blndentro = true;
|
190 |
+
$billingAddress->setCountry_id();
|
|
|
|
|
|
|
|
|
|
|
191 |
}
|
192 |
+
if($this->data['billing_postcode'] != $billingAddress->getPostcode()) {
|
193 |
+
$blndentro = true;
|
194 |
+
$billingAddress->setPostcode($this->data['billing_postcode']);
|
|
|
195 |
}
|
196 |
+
if($this->data['billing_lastname'] != $billingAddress->getLastname()) {
|
197 |
+
$blndentro = true;
|
198 |
+
$billingAddress->setLastname($this->data['billing_lastname']);
|
199 |
}
|
200 |
+
if($this->data['billing_street'] != $billingAddress->getStreet()) {
|
201 |
+
$blndentro = true;
|
202 |
+
$billingAddress->setStreet($this->data['billing_street']);
|
203 |
}
|
204 |
+
if($this->data['billing_city'] != $billingAddress->getCity()) {
|
205 |
+
$blndentro = true;
|
206 |
+
$billingAddress->setCity($this->data['billing_city']);
|
207 |
}
|
208 |
+
if($this->data['billing_telephone'] != $billingAddress->getTelephone()) {
|
209 |
+
$blndentro = true;
|
210 |
+
$billingAddress->setTelephone($this->data['billing_telephone']);
|
211 |
}
|
212 |
+
if($this->data['billing_firstname'] != $billingAddress->getFirstname()) {
|
213 |
+
$blndentro = true;
|
214 |
+
$billingAddress->setFirstname($this->data['billing_firstname']);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
215 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
216 |
|
|
|
|
|
|
|
217 |
|
218 |
+
if($this->data['billing_company'] !=$billingAddress->getCompany()) {
|
219 |
+
$blndentro = true;
|
220 |
+
$billingAddress->setCompany($this->data['billing_company']);
|
221 |
|
|
|
|
|
|
|
222 |
}
|
223 |
+
if($blndentro) {
|
224 |
+
$billingAddress->save();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
225 |
}
|
226 |
+
/*
|
227 |
+
$billingAddress
|
228 |
+
->setFirstname("value")
|
229 |
+
->setMiddlename("value")
|
230 |
+
->setLastname("value")
|
231 |
+
->setSuffix("value")
|
232 |
+
->setCompany("value")
|
233 |
+
->setStreet("value"))
|
234 |
+
->setCity("value")
|
235 |
+
->setCountry_id("value")
|
236 |
+
->setRegion("value")
|
237 |
+
->setRegion_id("value")
|
238 |
+
->setPostcode("value")
|
239 |
+
->setTelephone("value")
|
240 |
+
->setFax("value")->save();
|
241 |
+
*/
|
242 |
}
|
243 |
+
|
244 |
+
|
245 |
+
|
246 |
+
|
247 |
+
|
248 |
private function getConnection($connection = "core_read") {
|
249 |
$this->Mageresource = Mage::getSingleton('core/resource');
|
250 |
$this->connection = $this->Mageresource->getConnection($connection);
|
251 |
}
|
252 |
+
|
253 |
private function getTableName($table) {
|
254 |
return $this->Mageresource->getTableName($table);
|
255 |
}
|
256 |
+
|
257 |
+
|
258 |
+
|
259 |
+
|
260 |
+
}
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>BeezUP_Module_feed_and_tracker</name>
|
4 |
-
<version>4.7.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License</license>
|
7 |
<channel>community</channel>
|
@@ -42,11 +42,11 @@ After Set-up, the following files are added :</p>
|
|
42 |

|
43 |
<p>By BeezUP & Magentix</p></description>
|
44 |
<notes>New features :
|
45 |
-
-
|
46 |
<authors><author><name>BeezUP</name><user>BeezUP</user><email>charles@beezup.com</email></author></authors>
|
47 |
-
<date>2016-11-
|
48 |
-
<time>
|
49 |
-
<contents><target name="magecommunity"><dir name="BeezUp"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="e18c65bc83cab8795b4ffd0d46e04c8a"/><dir name="Invoice"><file name="Totals.php" hash="ac065cd586fd2534de7e12762ab9b335"/></dir><file name="Totals.php" hash="5972281aa467d63da56a297a8df3da55"/><dir name="View"><dir name="Tab"><file name="Custom.php" hash="a60f500d604038645b826fa74e9b6619"/></dir></dir></dir><file name="Order.php" hash="c038c302f2c86f79431b49c7282c3f5c"/></dir><dir name="System"><dir name="Config"><file name="Attributes.php" hash="a504265fe4dc2df69b311d8219c88fbf"/><file name="Autoship.php" hash="29a12f9ec87f4e4a8a6d0719aab4a4f6"/><file name="Button.php" hash="476b33034b0c7d36e1bbd85f38b841db"/><file name="Childgroup.php" hash="388d3dee8f9d66a56c43c2790a44b45a"/><file name="Credentials.php" hash="b86f361800bebfd6fcf3564d9fe87c95"/><file name="Cron.php" hash="e1d47b095623593beb7f166d2ad7fecc"/><file name="Filter.php" hash="ad7ba55e18c080e25a08309dc428402a"/><file name="Log.php" hash="86221765980c0aee2381d5efd740949d"/><file name="Manualcron.php" hash="cbac01f15d256a43f0388f58449bffd0"/><file name="Orderlink.php" hash="9b9242ea9ccc4cfa746036b72aed2cc1"/><file name="Stores.php" hash="4297f4c94f136bb9778c9ddcd0cb336c"/><file name="Syncstatus.php" hash="49164eb19331aadabc0581472cd3c567"/><file name="Time.php" hash="ac5c2e4a40e9c6ff68cea1097dfa1e7b"/></dir></dir></dir><file name="Omstatus.php" hash="061d861d973e232a18acea0387a4a290"/><file name="Order.php" hash="a305db75dba76f06f9d2320fcd8e38c1"/><file name="Tracking.php" hash="e6dcd6b89e782b2eb6cb83abfb1b7f56"/><file name="Xml.php" hash="dbaed2a7dfb2ea57f932865a09ae9760"/></dir><dir name="Helper"><file name="Data.php" hash="867a2562b255beaf3faa047d4130304f"/></dir><dir name="Model"><file name="Carrier.php" hash="4a8f63e7cab3145ab679fbe0eff9a0bd"/><file name="Observer.php" hash="e067e82f0a86088ad5dc062074caea51"/><file name="Products.php" hash="e2ffaec55b84d4c1923547fc2aad47b6"/><dir name="Quote"><file name="Item.php" hash="13cef88e165932990fa032b57e8905a0"/></dir><dir name="Sales"><dir name="Order"><dir name="Pdf"><file name="Invoice.php" hash="9eaf28084db176b41c6007da3d529d18"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Attributes.php" hash="174aee475c6a6a8b0b4f2e8e076c6a25"/><file name="Autoship.php" hash="7e14eb34edffeb1f42fa372874922c84"/><file name="Credentials.php" hash="09ef9fab57f64eb6415d71ba8aec2412"/><file name="Time.php" hash="a70e4d748a9b300ec7b718168fa4d5f8"/><file name="Token.php" hash="60247c8b4d5889433ae1f92e998cc889"/></dir><dir name="Source"><file name="Attributes.php" hash="8f57313a41349c7a8132b8d8e2de275e"/><file name="Autoshipcarriers.php" hash="8d630c9bff8db63b4fb30f11768ce443"/><file name="Availableproducts.php" hash="d9d4b3705f5fbd98efbae0289a1b6d6d"/><file name="Cache.php" hash="0ca6ccc2fed56e2c602d76880d062053"/><file name="Carriers.php" hash="2aa4edae4a91dfd0bbb752aa2f4c0073"/><file name="Categories.php" hash="c4e9f0a54f1d9c688543f26f02f99142"/><file name="Countries.php" hash="b6f1a9a75d5368d6365f06b42524e002"/><file name="Customercreate.php" hash="ca5d2b2d1ad4e18f9a1135af21b10bc2"/><file name="Debug.php" hash="6538ebc0cd0d61c124e5adc806e71aff"/><file name="Description.php" hash="1746e688692fc99524f02fb18e707dcf"/><file name="Images.php" hash="78fb5e2054bbfaa2e76263b1aa9197cc"/><file name="Montant.php" hash="3a46b8d564f1c2f0ed3b62354ac8964f"/><file name="Payment.php" hash="4bebe8e6ab0f980c1ada872b46e86503"/><file name="Position.php" hash="f1d6f89f5db5bfeedc506c539e76e3a8"/><file name="Price.php" hash="71707a69106cdd4990767351ab78fc04"/><file name="Shipping.php" hash="93401afc4fe0fb60824b778a26a24cdd"/><file name="Status.php" hash="d32004ad97adac6de361703a403a6a97"/><file name="Userid.php" hash="3d028bc3bfcaf7541b57676c014c94db"/><file name="Visibility.php" hash="91c69e8f967c13162eb38306c0391080"/></dir></dir></dir></dir><dir name="controllers"><file name="CacheController.php" hash="512cc26abd39d556104d5e69c0ac8a0d"/><file name="CatalogController.php" hash="0b65f6951e26283ea8c60bffa397186d"/><file name="CronController.php" hash="026ddcd6df9a51a41037687ca8d53a0b"/><file name="LogController.php" hash="5eff0d0a2c5621456e580e214d05c745"/><file name="OmstatusController.php" hash="95ae171ef21f861a7eaf74931b62a9db"/><file name="OrderController.php" hash="a2b8df2fb01fb4df8e7f04bcd7689bb3"/></dir><dir name="etc"><file name="adminhtml.xml" hash="e50ed10cb5025ff3a6dd7c90a6f7e0a4"/><file name="config.xml" hash="131035357771caf0c7c0c5c934837e2e"/><file name="system.xml" hash="ad69d215a4a8bb8b4fd90a576d550623"/></dir><dir name="img"><file name="ajax-loader.gif" hash="2a6692973429d7a74513bfa8bcb5be20"/></dir><dir name="lib"><file name="BeezupMageOrders.php" hash="537cfce31df19f4decda5e876ec74b5d"/><file name="BeezupOMDataHandler.php" hash="cf738987179f3125fc0f4626fd70f1a0"/><file name="BeezupOMOrderService.php" hash="47c09c14dce66f914023ff09374cd674"/><file name="BeezupOMOrderServiceInterface.php" hash="9b18485ae224c32f46ae5a2ec5966e5b"/><file name="BeezupOMRepositoryInterface.php" hash="c2a8267c01c3e5def25ed41f715fa4b4"/><file name="BeezupOMRequestData.php" hash="162196502ecc6078ac6b7dec6f068c80"/><file name="BeezupOMResponseData.php" hash="955ce5316129e837190f2ccf9962d74f"/><file name="BeezupOMServiceClientProxy.php" hash="5e3a1759aabfb0349f270ce4cfd80725"/><file name="BeezupOMStatus.php" hash="91622de51c7d8b9f53f1b9ccdafbb24c"/><file name="BeezupRepository.php" hash="4a4eaabcd0a5d7427154e93757c3733d"/><dir name="Common"><file name="BeezupOMCredential.php" hash="7f45272d16860058af07005dda39672e"/><file name="BeezupOMErrorSummary.php" hash="418db7b85beb030b2d28aee6c8b35bf1"/><file name="BeezupOMExpectedOrderChangeMetaInfo.php" hash="be802f69a3474d6cc6a5899711c7018c"/><file name="BeezupOMInfoSummaries.php" hash="cdece780cf38e3f09ce2d5550b93a567"/><file name="BeezupOMInfoSummary.php" hash="3b0d49f22882e239c87060aa58beb643"/><file name="BeezupOMLink.php" hash="9fa99dce0b51e235e101259b2f0304f8"/><file name="BeezupOMOrderIdentifier.php" hash="334f410bf0794cb2ce02b4b1e6d3e0f4"/><file name="BeezupOMProcessingStatus.php" hash="b70c4c23a75360b5bee4d9ddec9e7915"/><file name="BeezupOMRequest.php" hash="2497b1ed30c12d179a5629479aee418d"/><file name="BeezupOMResponse.php" hash="690688115873ac9a3172bf67a0d62b50"/><file name="BeezupOMResult.php" hash="5cb890ce4ad4205114dd94cd1f28222d"/><file name="BeezupOMSuccessSummary.php" hash="791c6c186ed15ec1b872905b820cd03c"/><file name="BeezupOMSummary.php" hash="6cc3712480eff9f19b80b0ab887155f0"/><file name="BeezupOMWarningSummary.php" hash="03cfd6a98901b6b460b974b8e938a659"/></dir><dir name="Harvest"><file name="BeezupOMHarvestAbstractReporting.php" hash="3d499a69ea7b646eaeef5b80f0a919f3"/><file name="BeezupOMHarvestClientReporting.php" hash="1e40eca349352912e408718f3b218777"/><file name="BeezupOMHarvestOrderReporting.php" hash="778ba93a7673f35b2072003e3510ba6b"/></dir><file name="KLogger.php" hash="fe1d31bbfdf4d59a858ffd43453536c2"/><dir name="LOV"><file name="BeezupOMLOVRequest.php" hash="165c873b3fea4201a3b35596d24ffe36"/><file name="BeezupOMLOVResponse.php" hash="586749fb17b16d5ff9f07909e516b3c7"/><file name="BeezupOMLOVResult.php" hash="c0e3cc917a1d625ac6094917481a7b52"/><file name="BeezupOMLOVValue.php" hash="0dd13ae88e99c2537df8804f3af248b9"/></dir><dir name="Marketplaces"><file name="BeezupOMMarketplace.php" hash="b85f1c977258ebc70c206a4ff461cb9a"/><file name="BeezupOMMarketplacesRequest.php" hash="5d1b27434872ed04210b9af795f5e464"/><file name="BeezupOMMarketplacesResponse.php" hash="0837f9ba0a610492362d73cd54ed4123"/><file name="BeezupOMMarketplacesResult.php" hash="369a2bf6e4c4134636ddeb849c6a8945"/></dir><dir name="Order"><file name="BeezupOMOrderItem.php" hash="a770b90ae4fcb6535563be6ff59f7528"/><file name="BeezupOMOrderRequest.php" hash="9afa0f18fc0aef344c3f71d054db23a0"/><file name="BeezupOMOrderResponse.php" hash="e8793a8754ec75a92ca6266357462307"/><file name="BeezupOMOrderResult.php" hash="b82fd5d86b578f2eb1d162a1169f3a9b"/></dir><dir name="OrderChange"><file name="BeezupOMOrderChangeMetaInfo.php" hash="abdbdfd6c3bf291fd38f9b3ddc419405"/><file name="BeezupOMOrderChangeRequest.php" hash="f43b9c0a052fe5346a1b309c6d96ae9c"/><file name="BeezupOMOrderChangeResponse.php" hash="bbb4e49e5ddb90991e763daa439a5642"/><file name="BeezupOMOrderChangeResult.php" hash="e7314addf6c2e51196577055d583f350"/></dir><dir name="OrderHistory"><file name="BeezupOMOrderChangeReporting.php" hash="fc7a7d7ee8bc53f8c5b7ed19793a911a"/><file name="BeezupOMOrderHarvestReporting.php" hash="e4cb500ef347d8e8543e0bf278d3d77c"/><file name="BeezupOMOrderHistoryRequest.php" hash="2e39c26d8d9dd4d5a92a2cde06c41353"/><file name="BeezupOMOrderHistoryResponse.php" hash="dc6a0c6dc89bf1f376d1ecfebd052a4b"/><file name="BeezupOMOrderHistoryResult.php" hash="d85d9b4ecf6c0456b5c8453cc3b9cfdd"/></dir><dir name="OrderList"><file name="BeezupOMOrderHeader.php" hash="af366bc39855f1315678f01b53859c1c"/><file name="BeezupOMOrderListRequest.php" hash="817c20c7c82fd5f05e0efb19ee19ec4b"/><file name="BeezupOMOrderListResponse.php" hash="b1b0ed33ba495f6e2c2f3a39ade2a5cd"/><file name="BeezupOMOrderListResult.php" hash="8befe82305a6c6fe3cacf113b3722585"/><file name="BeezupOMPaginationResult.php" hash="1e1ef534ddef8ac43d98839b4ed7f941"/></dir><dir name="SetOrderId"><file name="BeezupOMSetOrderIdRequest.php" hash="40b4a05023396115f582c2e907834e3b"/><file name="BeezupOMSetOrderIdResponse.php" hash="c4cb1f9013ae32dfdff8ca80e4725282"/><file name="BeezupOMSetOrderIdResult.php" hash="8b35abb55c52f6acdfd55bf20b370bf0"/><file name="BeezupOMSetOrderIdValues.php" hash="978b41465512c15bfe160463ca23d24f"/></dir><dir name="Stores"><file name="BeezupOMStore.php" hash="0882efcae2eff339d6cdcceee83135a7"/><file name="BeezupOMStoresRequest.php" hash="a6b1391e306f2ed21fd5e2fcdbcbbec5"/><file name="BeezupOMStoresResponse.php" hash="21535a8957506ef7da343a0526b57b02"/><file name="BeezupOMStoresResult.php" hash="d4ceed947e9e8086638497e75bbd20e8"/></dir><file name="bootstrap.php" hash="9dba513402094fc02ec291e08583b419"/></dir><dir name="sql"><dir name="beezup_setup"><file name="mysql4-install-4.0.0.php" hash="75dacb26e3f96975a873c906eb37fbb0"/><file name="mysql4-upgrade-4.5.0-4.6.0.php" hash="34d1bc3a9b7658923a389fd6653ed4c9"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="BeezUp.xml" hash="78c53bf08b7a60920283c91fec9f18dd"/></dir></target><target name="magelocale"><dir name="fr_FR"><file name="BeezUp.csv" hash="3ae5819ffc7157b01772a15a9b16d2a2"/></dir><dir name="en_US"><file name="BeezUp.csv" hash="05b26592c14245824173936807731db4"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="beezup_salestab.xml" hash="784925d72538a1eeb0ca695417147a7a"/></dir><dir name="template"><dir name="beezup"><file name="custom.phtml" hash="ea83d17a2e8814c3a9ae9e056c7926a8"/></dir></dir></dir></dir></dir></target></contents>
|
50 |
<compatible/>
|
51 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
52 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>BeezUP_Module_feed_and_tracker</name>
|
4 |
+
<version>4.7.3</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License</license>
|
7 |
<channel>community</channel>
|
42 |

|
43 |
<p>By BeezUP & Magentix</p></description>
|
44 |
<notes>New features :
|
45 |
+
- Fixed order_flat shipping bug</notes>
|
46 |
<authors><author><name>BeezUP</name><user>BeezUP</user><email>charles@beezup.com</email></author></authors>
|
47 |
+
<date>2016-11-24</date>
|
48 |
+
<time>15:30:28</time>
|
49 |
+
<contents><target name="magecommunity"><dir name="BeezUp"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="e18c65bc83cab8795b4ffd0d46e04c8a"/><dir name="Invoice"><file name="Totals.php" hash="ac065cd586fd2534de7e12762ab9b335"/></dir><file name="Totals.php" hash="5972281aa467d63da56a297a8df3da55"/><dir name="View"><dir name="Tab"><file name="Custom.php" hash="a60f500d604038645b826fa74e9b6619"/></dir></dir></dir><file name="Order.php" hash="c038c302f2c86f79431b49c7282c3f5c"/></dir><dir name="System"><dir name="Config"><file name="Attributes.php" hash="a504265fe4dc2df69b311d8219c88fbf"/><file name="Autoship.php" hash="29a12f9ec87f4e4a8a6d0719aab4a4f6"/><file name="Button.php" hash="476b33034b0c7d36e1bbd85f38b841db"/><file name="Childgroup.php" hash="388d3dee8f9d66a56c43c2790a44b45a"/><file name="Credentials.php" hash="b86f361800bebfd6fcf3564d9fe87c95"/><file name="Cron.php" hash="e1d47b095623593beb7f166d2ad7fecc"/><file name="Filter.php" hash="ad7ba55e18c080e25a08309dc428402a"/><file name="Log.php" hash="86221765980c0aee2381d5efd740949d"/><file name="Manualcron.php" hash="cbac01f15d256a43f0388f58449bffd0"/><file name="Orderlink.php" hash="9b9242ea9ccc4cfa746036b72aed2cc1"/><file name="Stores.php" hash="4297f4c94f136bb9778c9ddcd0cb336c"/><file name="Syncstatus.php" hash="49164eb19331aadabc0581472cd3c567"/><file name="Time.php" hash="ac5c2e4a40e9c6ff68cea1097dfa1e7b"/></dir></dir></dir><file name="Omstatus.php" hash="061d861d973e232a18acea0387a4a290"/><file name="Order.php" hash="8a65a03758ce742462782bc58f16e0fa"/><file name="Tracking.php" hash="e6dcd6b89e782b2eb6cb83abfb1b7f56"/><file name="Xml.php" hash="dbaed2a7dfb2ea57f932865a09ae9760"/></dir><dir name="Helper"><file name="Data.php" hash="867a2562b255beaf3faa047d4130304f"/></dir><dir name="Model"><file name="Carrier.php" hash="4a8f63e7cab3145ab679fbe0eff9a0bd"/><file name="Observer.php" hash="e067e82f0a86088ad5dc062074caea51"/><file name="Products.php" hash="e2ffaec55b84d4c1923547fc2aad47b6"/><dir name="Quote"><file name="Item.php" hash="13cef88e165932990fa032b57e8905a0"/></dir><dir name="Sales"><dir name="Order"><dir name="Pdf"><file name="Invoice.php" hash="9eaf28084db176b41c6007da3d529d18"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Attributes.php" hash="174aee475c6a6a8b0b4f2e8e076c6a25"/><file name="Autoship.php" hash="7e14eb34edffeb1f42fa372874922c84"/><file name="Credentials.php" hash="09ef9fab57f64eb6415d71ba8aec2412"/><file name="Time.php" hash="a70e4d748a9b300ec7b718168fa4d5f8"/><file name="Token.php" hash="60247c8b4d5889433ae1f92e998cc889"/></dir><dir name="Source"><file name="Attributes.php" hash="8f57313a41349c7a8132b8d8e2de275e"/><file name="Autoshipcarriers.php" hash="8d630c9bff8db63b4fb30f11768ce443"/><file name="Availableproducts.php" hash="d9d4b3705f5fbd98efbae0289a1b6d6d"/><file name="Cache.php" hash="0ca6ccc2fed56e2c602d76880d062053"/><file name="Carriers.php" hash="2aa4edae4a91dfd0bbb752aa2f4c0073"/><file name="Categories.php" hash="c4e9f0a54f1d9c688543f26f02f99142"/><file name="Countries.php" hash="b6f1a9a75d5368d6365f06b42524e002"/><file name="Customercreate.php" hash="ca5d2b2d1ad4e18f9a1135af21b10bc2"/><file name="Debug.php" hash="6538ebc0cd0d61c124e5adc806e71aff"/><file name="Description.php" hash="1746e688692fc99524f02fb18e707dcf"/><file name="Images.php" hash="78fb5e2054bbfaa2e76263b1aa9197cc"/><file name="Montant.php" hash="3a46b8d564f1c2f0ed3b62354ac8964f"/><file name="Payment.php" hash="4bebe8e6ab0f980c1ada872b46e86503"/><file name="Position.php" hash="f1d6f89f5db5bfeedc506c539e76e3a8"/><file name="Price.php" hash="71707a69106cdd4990767351ab78fc04"/><file name="Shipping.php" hash="93401afc4fe0fb60824b778a26a24cdd"/><file name="Status.php" hash="d32004ad97adac6de361703a403a6a97"/><file name="Userid.php" hash="3d028bc3bfcaf7541b57676c014c94db"/><file name="Visibility.php" hash="91c69e8f967c13162eb38306c0391080"/></dir></dir></dir></dir><dir name="controllers"><file name="CacheController.php" hash="512cc26abd39d556104d5e69c0ac8a0d"/><file name="CatalogController.php" hash="0b65f6951e26283ea8c60bffa397186d"/><file name="CronController.php" hash="026ddcd6df9a51a41037687ca8d53a0b"/><file name="LogController.php" hash="5eff0d0a2c5621456e580e214d05c745"/><file name="OmstatusController.php" hash="95ae171ef21f861a7eaf74931b62a9db"/><file name="OrderController.php" hash="a2b8df2fb01fb4df8e7f04bcd7689bb3"/></dir><dir name="etc"><file name="adminhtml.xml" hash="e50ed10cb5025ff3a6dd7c90a6f7e0a4"/><file name="config.xml" hash="462a5f15bd9be24bc9d44af8da57ba2d"/><file name="system.xml" hash="6e3814eca5ef4986647ffea45a3a3faf"/></dir><dir name="img"><file name="ajax-loader.gif" hash="2a6692973429d7a74513bfa8bcb5be20"/></dir><dir name="lib"><file name="BeezupMageOrders.php" hash="6b690ddfb6ad93d98cf734925aef7121"/><file name="BeezupOMDataHandler.php" hash="cf738987179f3125fc0f4626fd70f1a0"/><file name="BeezupOMOrderService.php" hash="47c09c14dce66f914023ff09374cd674"/><file name="BeezupOMOrderServiceInterface.php" hash="9b18485ae224c32f46ae5a2ec5966e5b"/><file name="BeezupOMRepositoryInterface.php" hash="c2a8267c01c3e5def25ed41f715fa4b4"/><file name="BeezupOMRequestData.php" hash="162196502ecc6078ac6b7dec6f068c80"/><file name="BeezupOMResponseData.php" hash="955ce5316129e837190f2ccf9962d74f"/><file name="BeezupOMServiceClientProxy.php" hash="5e3a1759aabfb0349f270ce4cfd80725"/><file name="BeezupOMStatus.php" hash="91622de51c7d8b9f53f1b9ccdafbb24c"/><file name="BeezupRepository.php" hash="4a4eaabcd0a5d7427154e93757c3733d"/><dir name="Common"><file name="BeezupOMCredential.php" hash="7f45272d16860058af07005dda39672e"/><file name="BeezupOMErrorSummary.php" hash="418db7b85beb030b2d28aee6c8b35bf1"/><file name="BeezupOMExpectedOrderChangeMetaInfo.php" hash="be802f69a3474d6cc6a5899711c7018c"/><file name="BeezupOMInfoSummaries.php" hash="cdece780cf38e3f09ce2d5550b93a567"/><file name="BeezupOMInfoSummary.php" hash="3b0d49f22882e239c87060aa58beb643"/><file name="BeezupOMLink.php" hash="9fa99dce0b51e235e101259b2f0304f8"/><file name="BeezupOMOrderIdentifier.php" hash="334f410bf0794cb2ce02b4b1e6d3e0f4"/><file name="BeezupOMProcessingStatus.php" hash="b70c4c23a75360b5bee4d9ddec9e7915"/><file name="BeezupOMRequest.php" hash="2497b1ed30c12d179a5629479aee418d"/><file name="BeezupOMResponse.php" hash="690688115873ac9a3172bf67a0d62b50"/><file name="BeezupOMResult.php" hash="5cb890ce4ad4205114dd94cd1f28222d"/><file name="BeezupOMSuccessSummary.php" hash="791c6c186ed15ec1b872905b820cd03c"/><file name="BeezupOMSummary.php" hash="6cc3712480eff9f19b80b0ab887155f0"/><file name="BeezupOMWarningSummary.php" hash="03cfd6a98901b6b460b974b8e938a659"/></dir><dir name="Harvest"><file name="BeezupOMHarvestAbstractReporting.php" hash="3d499a69ea7b646eaeef5b80f0a919f3"/><file name="BeezupOMHarvestClientReporting.php" hash="1e40eca349352912e408718f3b218777"/><file name="BeezupOMHarvestOrderReporting.php" hash="778ba93a7673f35b2072003e3510ba6b"/></dir><file name="KLogger.php" hash="fe1d31bbfdf4d59a858ffd43453536c2"/><dir name="LOV"><file name="BeezupOMLOVRequest.php" hash="165c873b3fea4201a3b35596d24ffe36"/><file name="BeezupOMLOVResponse.php" hash="586749fb17b16d5ff9f07909e516b3c7"/><file name="BeezupOMLOVResult.php" hash="c0e3cc917a1d625ac6094917481a7b52"/><file name="BeezupOMLOVValue.php" hash="0dd13ae88e99c2537df8804f3af248b9"/></dir><dir name="Marketplaces"><file name="BeezupOMMarketplace.php" hash="b85f1c977258ebc70c206a4ff461cb9a"/><file name="BeezupOMMarketplacesRequest.php" hash="5d1b27434872ed04210b9af795f5e464"/><file name="BeezupOMMarketplacesResponse.php" hash="0837f9ba0a610492362d73cd54ed4123"/><file name="BeezupOMMarketplacesResult.php" hash="369a2bf6e4c4134636ddeb849c6a8945"/></dir><dir name="Order"><file name="BeezupOMOrderItem.php" hash="a770b90ae4fcb6535563be6ff59f7528"/><file name="BeezupOMOrderRequest.php" hash="9afa0f18fc0aef344c3f71d054db23a0"/><file name="BeezupOMOrderResponse.php" hash="e8793a8754ec75a92ca6266357462307"/><file name="BeezupOMOrderResult.php" hash="b82fd5d86b578f2eb1d162a1169f3a9b"/></dir><dir name="OrderChange"><file name="BeezupOMOrderChangeMetaInfo.php" hash="abdbdfd6c3bf291fd38f9b3ddc419405"/><file name="BeezupOMOrderChangeRequest.php" hash="f43b9c0a052fe5346a1b309c6d96ae9c"/><file name="BeezupOMOrderChangeResponse.php" hash="bbb4e49e5ddb90991e763daa439a5642"/><file name="BeezupOMOrderChangeResult.php" hash="e7314addf6c2e51196577055d583f350"/></dir><dir name="OrderHistory"><file name="BeezupOMOrderChangeReporting.php" hash="fc7a7d7ee8bc53f8c5b7ed19793a911a"/><file name="BeezupOMOrderHarvestReporting.php" hash="e4cb500ef347d8e8543e0bf278d3d77c"/><file name="BeezupOMOrderHistoryRequest.php" hash="2e39c26d8d9dd4d5a92a2cde06c41353"/><file name="BeezupOMOrderHistoryResponse.php" hash="dc6a0c6dc89bf1f376d1ecfebd052a4b"/><file name="BeezupOMOrderHistoryResult.php" hash="d85d9b4ecf6c0456b5c8453cc3b9cfdd"/></dir><dir name="OrderList"><file name="BeezupOMOrderHeader.php" hash="af366bc39855f1315678f01b53859c1c"/><file name="BeezupOMOrderListRequest.php" hash="817c20c7c82fd5f05e0efb19ee19ec4b"/><file name="BeezupOMOrderListResponse.php" hash="b1b0ed33ba495f6e2c2f3a39ade2a5cd"/><file name="BeezupOMOrderListResult.php" hash="8befe82305a6c6fe3cacf113b3722585"/><file name="BeezupOMPaginationResult.php" hash="1e1ef534ddef8ac43d98839b4ed7f941"/></dir><dir name="SetOrderId"><file name="BeezupOMSetOrderIdRequest.php" hash="40b4a05023396115f582c2e907834e3b"/><file name="BeezupOMSetOrderIdResponse.php" hash="c4cb1f9013ae32dfdff8ca80e4725282"/><file name="BeezupOMSetOrderIdResult.php" hash="8b35abb55c52f6acdfd55bf20b370bf0"/><file name="BeezupOMSetOrderIdValues.php" hash="978b41465512c15bfe160463ca23d24f"/></dir><dir name="Stores"><file name="BeezupOMStore.php" hash="0882efcae2eff339d6cdcceee83135a7"/><file name="BeezupOMStoresRequest.php" hash="a6b1391e306f2ed21fd5e2fcdbcbbec5"/><file name="BeezupOMStoresResponse.php" hash="21535a8957506ef7da343a0526b57b02"/><file name="BeezupOMStoresResult.php" hash="d4ceed947e9e8086638497e75bbd20e8"/></dir><file name="bootstrap.php" hash="9dba513402094fc02ec291e08583b419"/></dir><dir name="sql"><dir name="beezup_setup"><file name="mysql4-install-4.0.0.php" hash="75dacb26e3f96975a873c906eb37fbb0"/><file name="mysql4-upgrade-4.5.0-4.6.0.php" hash="34d1bc3a9b7658923a389fd6653ed4c9"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="BeezUp.xml" hash="78c53bf08b7a60920283c91fec9f18dd"/></dir></target><target name="magelocale"><dir name="fr_FR"><file name="BeezUp.csv" hash="3ae5819ffc7157b01772a15a9b16d2a2"/></dir><dir name="en_US"><file name="BeezUp.csv" hash="05b26592c14245824173936807731db4"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="beezup_salestab.xml" hash="784925d72538a1eeb0ca695417147a7a"/></dir><dir name="template"><dir name="beezup"><file name="custom.phtml" hash="ea83d17a2e8814c3a9ae9e056c7926a8"/></dir></dir></dir></dir></dir></target></contents>
|
50 |
<compatible/>
|
51 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
52 |
</package>
|