Version Notes
improvements for multi shop environments
Download this release
Release Info
| Developer | Komfortkasse |
| Extension | Ltc_Komfortkasse |
| Version | 1.6.1 |
| Comparing to | |
| See all releases | |
Code changes from version 1.6.0 to 1.6.1
app/code/community/Ltc/Komfortkasse/Helper/Komfortkasse.php
CHANGED
|
@@ -69,7 +69,6 @@ class Komfortkasse
|
|
| 69 |
$ids = Komfortkasse_Order::getRefundIDs();
|
| 70 |
} else {
|
| 71 |
$ids = Komfortkasse_Order::getOpenIDs();
|
| 72 |
-
|
| 73 |
}
|
| 74 |
|
| 75 |
foreach ($ids as $id) {
|
| 69 |
$ids = Komfortkasse_Order::getRefundIDs();
|
| 70 |
} else {
|
| 71 |
$ids = Komfortkasse_Order::getOpenIDs();
|
|
|
|
| 72 |
}
|
| 73 |
|
| 74 |
foreach ($ids as $id) {
|
app/code/community/Ltc/Komfortkasse/Helper/Komfortkasse_Order.php
CHANGED
|
@@ -1,602 +1,610 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
|
| 4 |
-
/**
|
| 5 |
-
* Komfortkasse Order Class
|
| 6 |
-
* in KK, an Order is an Array providing the following members:
|
| 7 |
-
* number, date, email, customer_number, payment_method, amount, currency_code, exchange_rate, language_code, invoice_number, store_id
|
| 8 |
-
* status: data type according to the shop system
|
| 9 |
-
* delivery_ and billing_: _firstname, _lastname, _company, _street, _postcode, _city, _countrycode
|
| 10 |
-
* products: an Array of item numbers
|
| 11 |
-
* @version 1.
|
| 12 |
-
*/
|
| 13 |
-
$path = Mage::getModuleDir('', 'Ltc_Komfortkasse');
|
| 14 |
-
global $komfortkasse_order_extension;
|
| 15 |
-
$komfortkasse_order_extension = false;
|
| 16 |
-
if (file_exists("{$path}/Helper/Komfortkasse_Order_Extension.php") === true) {
|
| 17 |
-
$komfortkasse_order_extension = true;
|
| 18 |
-
include_once "{$path}/Helper/Komfortkasse_Order_Extension.php";
|
| 19 |
-
}
|
| 20 |
-
class Komfortkasse_Order
|
| 21 |
-
{
|
| 22 |
-
|
| 23 |
-
|
| 24 |
-
private static function createInClause($arr)
|
| 25 |
-
{
|
| 26 |
-
if (!is_array($arr)) {
|
| 27 |
-
$arr = explode(',', $arr);
|
| 28 |
-
}
|
| 29 |
-
$tmp = array ();
|
| 30 |
-
foreach ($arr as $item) {
|
| 31 |
-
$tmp [] = str_replace('\'', '', $item);
|
| 32 |
-
}
|
| 33 |
-
return '(\'' . implode('\', \'', $tmp) . '\')';
|
| 34 |
-
|
| 35 |
-
}
|
| 36 |
-
|
| 37 |
-
|
| 38 |
-
/**
|
| 39 |
-
* Get open order IDs.
|
| 40 |
-
*
|
| 41 |
-
* @return string all order IDs that are "open" and relevant for transfer to kk
|
| 42 |
-
*/
|
| 43 |
-
public static function getOpenIDs()
|
| 44 |
-
{
|
| 45 |
-
$ret = array ();
|
| 46 |
-
|
| 47 |
-
$resource = Mage::getSingleton('core/resource');
|
| 48 |
-
$readConnection = $resource->getConnection('core_read');
|
| 49 |
-
$tableOrder = $resource->getTableName('sales/order');
|
| 50 |
-
$tablePayment = $resource->getTableName('sales/order_payment');
|
| 51 |
-
|
| 52 |
-
$minDate = date('Y-m-d', time() - 31536000); // 1 Jahr
|
| 53 |
-
|
| 54 |
-
$m2e = Mage::getModel('M2ePro/Order');
|
| 55 |
-
|
| 56 |
-
|
| 57 |
-
|
| 58 |
-
|
| 59 |
-
|
| 60 |
-
|
| 61 |
-
|
| 62 |
-
|
| 63 |
-
|
| 64 |
-
|
| 65 |
-
|
| 66 |
-
|
| 67 |
-
|
| 68 |
-
$
|
| 69 |
-
|
| 70 |
-
|
| 71 |
-
|
| 72 |
-
|
| 73 |
-
|
| 74 |
-
|
| 75 |
-
|
| 76 |
-
|
| 77 |
-
|
| 78 |
-
|
| 79 |
-
|
| 80 |
-
|
| 81 |
-
|
| 82 |
-
$
|
| 83 |
-
|
| 84 |
-
|
| 85 |
-
|
| 86 |
-
|
| 87 |
-
|
| 88 |
-
|
| 89 |
-
|
| 90 |
-
|
| 91 |
-
|
| 92 |
-
|
| 93 |
-
|
| 94 |
-
|
| 95 |
-
|
| 96 |
-
|
| 97 |
-
|
| 98 |
-
$
|
| 99 |
-
|
| 100 |
-
|
| 101 |
-
|
| 102 |
-
|
| 103 |
-
|
| 104 |
-
|
| 105 |
-
|
| 106 |
-
|
| 107 |
-
|
| 108 |
-
|
| 109 |
-
|
| 110 |
-
|
| 111 |
-
|
| 112 |
-
|
| 113 |
-
|
| 114 |
-
|
| 115 |
-
$
|
| 116 |
-
|
| 117 |
-
|
| 118 |
-
|
| 119 |
-
|
| 120 |
-
|
| 121 |
-
|
| 122 |
-
|
| 123 |
-
|
| 124 |
-
|
| 125 |
-
|
| 126 |
-
|
| 127 |
-
|
| 128 |
-
|
| 129 |
-
|
| 130 |
-
|
| 131 |
-
|
| 132 |
-
|
| 133 |
-
|
| 134 |
-
|
| 135 |
-
|
| 136 |
-
|
| 137 |
-
|
| 138 |
-
|
| 139 |
-
|
| 140 |
-
|
| 141 |
-
|
| 142 |
-
|
| 143 |
-
|
| 144 |
-
|
| 145 |
-
|
| 146 |
-
|
| 147 |
-
|
| 148 |
-
|
| 149 |
-
|
| 150 |
-
|
| 151 |
-
|
| 152 |
-
|
| 153 |
-
|
| 154 |
-
|
| 155 |
-
|
| 156 |
-
|
| 157 |
-
|
| 158 |
-
|
| 159 |
-
|
| 160 |
-
|
| 161 |
-
|
| 162 |
-
|
| 163 |
-
|
| 164 |
-
|
| 165 |
-
|
| 166 |
-
|
| 167 |
-
|
| 168 |
-
$
|
| 169 |
-
|
| 170 |
-
$
|
| 171 |
-
|
| 172 |
-
|
| 173 |
-
|
| 174 |
-
|
| 175 |
-
|
| 176 |
-
|
| 177 |
-
|
| 178 |
-
|
| 179 |
-
|
| 180 |
-
|
| 181 |
-
|
| 182 |
-
|
| 183 |
-
|
| 184 |
-
|
| 185 |
-
|
| 186 |
-
|
| 187 |
-
|
| 188 |
-
|
| 189 |
-
|
| 190 |
-
|
| 191 |
-
|
| 192 |
-
|
| 193 |
-
|
| 194 |
-
|
| 195 |
-
|
| 196 |
-
|
| 197 |
-
|
| 198 |
-
|
| 199 |
-
|
| 200 |
-
|
| 201 |
-
|
| 202 |
-
|
| 203 |
-
|
| 204 |
-
|
| 205 |
-
|
| 206 |
-
|
| 207 |
-
|
| 208 |
-
|
| 209 |
-
|
| 210 |
-
|
| 211 |
-
|
| 212 |
-
|
| 213 |
-
|
| 214 |
-
|
| 215 |
-
|
| 216 |
-
|
| 217 |
-
$
|
| 218 |
-
$
|
| 219 |
-
|
| 220 |
-
|
| 221 |
-
|
| 222 |
-
$
|
| 223 |
-
|
| 224 |
-
|
| 225 |
-
|
| 226 |
-
|
| 227 |
-
$ret ['
|
| 228 |
-
$ret ['
|
| 229 |
-
$ret ['
|
| 230 |
-
|
| 231 |
-
|
| 232 |
-
|
| 233 |
-
|
| 234 |
-
|
| 235 |
-
|
| 236 |
-
$
|
| 237 |
-
$
|
| 238 |
-
$
|
| 239 |
-
|
| 240 |
-
|
| 241 |
-
|
| 242 |
-
|
| 243 |
-
|
| 244 |
-
|
| 245 |
-
|
| 246 |
-
|
| 247 |
-
|
| 248 |
-
|
| 249 |
-
|
| 250 |
-
|
| 251 |
-
|
| 252 |
-
|
| 253 |
-
|
| 254 |
-
|
| 255 |
-
|
| 256 |
-
|
| 257 |
-
|
| 258 |
-
|
| 259 |
-
|
| 260 |
-
|
| 261 |
-
|
| 262 |
-
$
|
| 263 |
-
|
| 264 |
-
|
| 265 |
-
|
| 266 |
-
|
| 267 |
-
|
| 268 |
-
|
| 269 |
-
|
| 270 |
-
|
| 271 |
-
|
| 272 |
-
|
| 273 |
-
|
| 274 |
-
|
| 275 |
-
|
| 276 |
-
|
| 277 |
-
|
| 278 |
-
|
| 279 |
-
|
| 280 |
-
|
| 281 |
-
|
| 282 |
-
|
| 283 |
-
|
| 284 |
-
$
|
| 285 |
-
|
| 286 |
-
|
| 287 |
-
|
| 288 |
-
|
| 289 |
-
|
| 290 |
-
|
| 291 |
-
|
| 292 |
-
|
| 293 |
-
|
| 294 |
-
|
| 295 |
-
|
| 296 |
-
|
| 297 |
-
|
| 298 |
-
|
| 299 |
-
|
| 300 |
-
|
| 301 |
-
|
| 302 |
-
|
| 303 |
-
|
| 304 |
-
|
| 305 |
-
|
| 306 |
-
|
| 307 |
-
|
| 308 |
-
|
| 309 |
-
$ret ['
|
| 310 |
-
|
| 311 |
-
|
| 312 |
-
|
| 313 |
-
|
| 314 |
-
|
| 315 |
-
$ret ['
|
| 316 |
-
$ret ['
|
| 317 |
-
$ret ['
|
| 318 |
-
$ret ['
|
| 319 |
-
$ret ['
|
| 320 |
-
|
| 321 |
-
|
| 322 |
-
|
| 323 |
-
|
| 324 |
-
$ret ['language_code'] = substr($conf_general ['locale'] ['code'], 0, 2);
|
| 325 |
-
|
| 326 |
-
|
| 327 |
-
|
| 328 |
-
$
|
| 329 |
-
|
| 330 |
-
|
| 331 |
-
|
| 332 |
-
|
| 333 |
-
|
| 334 |
-
}
|
| 335 |
-
|
| 336 |
-
$
|
| 337 |
-
|
| 338 |
-
|
| 339 |
-
|
| 340 |
-
|
| 341 |
-
$ret ['
|
| 342 |
-
}
|
| 343 |
-
}
|
| 344 |
-
|
| 345 |
-
|
| 346 |
-
if ($
|
| 347 |
-
$
|
| 348 |
-
|
| 349 |
-
|
| 350 |
-
|
| 351 |
-
|
| 352 |
-
|
| 353 |
-
|
| 354 |
-
|
| 355 |
-
|
| 356 |
-
|
| 357 |
-
|
| 358 |
-
|
| 359 |
-
|
| 360 |
-
|
| 361 |
-
|
| 362 |
-
|
| 363 |
-
|
| 364 |
-
|
| 365 |
-
|
| 366 |
-
|
| 367 |
-
|
| 368 |
-
|
| 369 |
-
|
| 370 |
-
|
| 371 |
-
|
| 372 |
-
|
| 373 |
-
|
| 374 |
-
|
| 375 |
-
$
|
| 376 |
-
|
| 377 |
-
|
| 378 |
-
$
|
| 379 |
-
$
|
| 380 |
-
|
| 381 |
-
|
| 382 |
-
|
| 383 |
-
|
| 384 |
-
|
| 385 |
-
|
| 386 |
-
|
| 387 |
-
|
| 388 |
-
|
| 389 |
-
|
| 390 |
-
|
| 391 |
-
|
| 392 |
-
|
| 393 |
-
|
| 394 |
-
|
| 395 |
-
|
| 396 |
-
|
| 397 |
-
|
| 398 |
-
|
| 399 |
-
|
| 400 |
-
|
| 401 |
-
|
| 402 |
-
|
| 403 |
-
|
| 404 |
-
|
| 405 |
-
|
| 406 |
-
|
| 407 |
-
|
| 408 |
-
))
|
| 409 |
-
|
| 410 |
-
|
| 411 |
-
|
| 412 |
-
|
| 413 |
-
$
|
| 414 |
-
|
| 415 |
-
|
| 416 |
-
|
| 417 |
-
|
| 418 |
-
|
| 419 |
-
|
| 420 |
-
|
| 421 |
-
|
| 422 |
-
|
| 423 |
-
|
| 424 |
-
|
| 425 |
-
|
| 426 |
-
|
| 427 |
-
|
| 428 |
-
|
| 429 |
-
|
| 430 |
-
|
| 431 |
-
|
| 432 |
-
|
| 433 |
-
$
|
| 434 |
-
|
| 435 |
-
|
| 436 |
-
|
| 437 |
-
|
| 438 |
-
|
| 439 |
-
|
| 440 |
-
|
| 441 |
-
|
| 442 |
-
|
| 443 |
-
|
| 444 |
-
|
| 445 |
-
|
| 446 |
-
|
| 447 |
-
|
| 448 |
-
|
| 449 |
-
|
| 450 |
-
|
| 451 |
-
|
| 452 |
-
|
| 453 |
-
|
| 454 |
-
|
| 455 |
-
|
| 456 |
-
|
| 457 |
-
|
| 458 |
-
|
| 459 |
-
|
| 460 |
-
|
| 461 |
-
|
| 462 |
-
|
| 463 |
-
|
| 464 |
-
|
| 465 |
-
|
| 466 |
-
|
| 467 |
-
|
| 468 |
-
|
| 469 |
-
|
| 470 |
-
|
| 471 |
-
|
| 472 |
-
|
| 473 |
-
|
| 474 |
-
|
| 475 |
-
|
| 476 |
-
|
| 477 |
-
|
| 478 |
-
|
| 479 |
-
|
| 480 |
-
|
| 481 |
-
|
| 482 |
-
|
| 483 |
-
|
| 484 |
-
|
| 485 |
-
|
| 486 |
-
|
| 487 |
-
|
| 488 |
-
|
| 489 |
-
|
| 490 |
-
|
| 491 |
-
|
| 492 |
-
|
| 493 |
-
|
| 494 |
-
|
| 495 |
-
|
| 496 |
-
|
| 497 |
-
|
| 498 |
-
|
| 499 |
-
|
| 500 |
-
|
| 501 |
-
|
| 502 |
-
|
| 503 |
-
|
| 504 |
-
|
| 505 |
-
|
| 506 |
-
|
| 507 |
-
|
| 508 |
-
|
| 509 |
-
|
| 510 |
-
|
| 511 |
-
|
| 512 |
-
|
| 513 |
-
|
| 514 |
-
|
| 515 |
-
|
| 516 |
-
|
| 517 |
-
|
| 518 |
-
|
| 519 |
-
|
| 520 |
-
|
| 521 |
-
|
| 522 |
-
|
| 523 |
-
|
| 524 |
-
|
| 525 |
-
|
| 526 |
-
|
| 527 |
-
|
| 528 |
-
|
| 529 |
-
|
| 530 |
-
|
| 531 |
-
|
| 532 |
-
|
| 533 |
-
|
| 534 |
-
|
| 535 |
-
|
| 536 |
-
|
| 537 |
-
|
| 538 |
-
|
| 539 |
-
|
| 540 |
-
|
| 541 |
-
|
| 542 |
-
|
| 543 |
-
|
| 544 |
-
|
| 545 |
-
|
| 546 |
-
|
| 547 |
-
|
| 548 |
-
|
| 549 |
-
|
| 550 |
-
|
| 551 |
-
|
| 552 |
-
|
| 553 |
-
|
| 554 |
-
|
| 555 |
-
|
| 556 |
-
|
| 557 |
-
|
| 558 |
-
|
| 559 |
-
|
| 560 |
-
|
| 561 |
-
|
| 562 |
-
|
| 563 |
-
|
| 564 |
-
|
| 565 |
-
|
| 566 |
-
|
| 567 |
-
|
| 568 |
-
|
| 569 |
-
|
| 570 |
-
|
| 571 |
-
|
| 572 |
-
|
| 573 |
-
|
| 574 |
-
|
| 575 |
-
|
| 576 |
-
|
| 577 |
-
|
| 578 |
-
|
| 579 |
-
|
| 580 |
-
|
| 581 |
-
|
| 582 |
-
|
| 583 |
-
|
| 584 |
-
|
| 585 |
-
|
| 586 |
-
|
| 587 |
-
|
| 588 |
-
|
| 589 |
-
|
| 590 |
-
|
| 591 |
-
|
| 592 |
-
|
| 593 |
-
|
| 594 |
-
|
| 595 |
-
|
| 596 |
-
|
| 597 |
-
|
| 598 |
-
|
| 599 |
-
|
| 600 |
-
|
| 601 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 602 |
}//end class
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
|
| 4 |
+
/**
|
| 5 |
+
* Komfortkasse Order Class
|
| 6 |
+
* in KK, an Order is an Array providing the following members:
|
| 7 |
+
* number, date, email, customer_number, payment_method, amount, currency_code, exchange_rate, language_code, invoice_number, store_id
|
| 8 |
+
* status: data type according to the shop system
|
| 9 |
+
* delivery_ and billing_: _firstname, _lastname, _company, _street, _postcode, _city, _countrycode
|
| 10 |
+
* products: an Array of item numbers
|
| 11 |
+
* @version 1.6.1-Magento1
|
| 12 |
+
*/
|
| 13 |
+
$path = Mage::getModuleDir('', 'Ltc_Komfortkasse');
|
| 14 |
+
global $komfortkasse_order_extension;
|
| 15 |
+
$komfortkasse_order_extension = false;
|
| 16 |
+
if (file_exists("{$path}/Helper/Komfortkasse_Order_Extension.php") === true) {
|
| 17 |
+
$komfortkasse_order_extension = true;
|
| 18 |
+
include_once "{$path}/Helper/Komfortkasse_Order_Extension.php";
|
| 19 |
+
}
|
| 20 |
+
class Komfortkasse_Order
|
| 21 |
+
{
|
| 22 |
+
|
| 23 |
+
|
| 24 |
+
private static function createInClause($arr)
|
| 25 |
+
{
|
| 26 |
+
if (!is_array($arr)) {
|
| 27 |
+
$arr = explode(',', $arr);
|
| 28 |
+
}
|
| 29 |
+
$tmp = array ();
|
| 30 |
+
foreach ($arr as $item) {
|
| 31 |
+
$tmp [] = str_replace('\'', '', $item);
|
| 32 |
+
}
|
| 33 |
+
return '(\'' . implode('\', \'', $tmp) . '\')';
|
| 34 |
+
|
| 35 |
+
}
|
| 36 |
+
|
| 37 |
+
|
| 38 |
+
/**
|
| 39 |
+
* Get open order IDs.
|
| 40 |
+
*
|
| 41 |
+
* @return string all order IDs that are "open" and relevant for transfer to kk
|
| 42 |
+
*/
|
| 43 |
+
public static function getOpenIDs()
|
| 44 |
+
{
|
| 45 |
+
$ret = array ();
|
| 46 |
+
|
| 47 |
+
$resource = Mage::getSingleton('core/resource');
|
| 48 |
+
$readConnection = $resource->getConnection('core_read');
|
| 49 |
+
$tableOrder = $resource->getTableName('sales/order');
|
| 50 |
+
$tablePayment = $resource->getTableName('sales/order_payment');
|
| 51 |
+
|
| 52 |
+
$minDate = date('Y-m-d', time() - 31536000); // 1 Jahr
|
| 53 |
+
|
| 54 |
+
$m2e = Mage::getModel('M2ePro/Order');
|
| 55 |
+
|
| 56 |
+
$shopIds = Komfortkasse_Config::getRequestParameter('s');
|
| 57 |
+
if ($shopIds)
|
| 58 |
+
$shopIds = Komfortkasse::kkdecrypt($shopIds);
|
| 59 |
+
$stores = $shopIds ? explode(',', $shopIds) : array ();
|
| 60 |
+
|
| 61 |
+
foreach (Mage::app()->getWebsites() as $website) {
|
| 62 |
+
foreach ($website->getGroups() as $group) {
|
| 63 |
+
$stores = $group->getStores();
|
| 64 |
+
foreach ($stores as $store) {
|
| 65 |
+
$store_code = $store->getCode();
|
| 66 |
+
if (is_empty($stores) || in_array($store_code, $stores)) {
|
| 67 |
+
|
| 68 |
+
$store_id = $store->getId();
|
| 69 |
+
$store_id_order = array ();
|
| 70 |
+
$store_id_order ['store_id'] = $store_id;
|
| 71 |
+
|
| 72 |
+
if (Komfortkasse_Config::getConfig(Komfortkasse_Config::activate_export, $store_id_order)) {
|
| 73 |
+
|
| 74 |
+
$m2e_active = $m2e && Komfortkasse_Config::getConfig('payment/m2epropayment/active', $store_id_order);
|
| 75 |
+
|
| 76 |
+
$query = 'SELECT o.increment_id FROM ' . $tableOrder . ' o join ' . $tablePayment . ' p on p.parent_id = o.entity_id';
|
| 77 |
+
if ($m2e_active)
|
| 78 |
+
$query .= ' left join ' . $resource->getTableName('M2ePro/Order') . ' m on m.magento_order_id=o.entity_id left join ' . $resource->getTableName('M2ePro/Ebay_Order') . ' e on e.order_id=m.id ';
|
| 79 |
+
|
| 80 |
+
$query .= ' where o.store_id=' . $store_id . ' and created_at > ' . $minDate . ' and (';
|
| 81 |
+
$first = true;
|
| 82 |
+
$m2e_used = false;
|
| 83 |
+
|
| 84 |
+
// PREPAYMENT
|
| 85 |
+
$openOrders = Komfortkasse_Config::getConfig(Komfortkasse_Config::status_open, $store_id_order);
|
| 86 |
+
$paymentMethods = Komfortkasse_Config::getConfig(Komfortkasse_Config::payment_methods, $store_id_order);
|
| 87 |
+
if ($openOrders && $paymentMethods) {
|
| 88 |
+
if (!$first)
|
| 89 |
+
$query .= ' or ';
|
| 90 |
+
$query .= '(o.status in ' . self::createInClause($openOrders) . ' and p.method in ' . self::createInClause($paymentMethods);
|
| 91 |
+
|
| 92 |
+
if ($m2e_active && !$m2e_used && strstr($paymentMethods, 'm2epropayment') !== false) {
|
| 93 |
+
$query .= ' and (p.method <> \'m2epropayment\' or e.payment_details like \'%"method":"%berweisung"%\') ';
|
| 94 |
+
$m2e_used = true;
|
| 95 |
+
}
|
| 96 |
+
|
| 97 |
+
$query .= ')';
|
| 98 |
+
$first = false;
|
| 99 |
+
}
|
| 100 |
+
|
| 101 |
+
// COD
|
| 102 |
+
$openOrders = Komfortkasse_Config::getConfig(Komfortkasse_Config::status_open_cod, $store_id_order);
|
| 103 |
+
$paymentMethods = Komfortkasse_Config::getConfig(Komfortkasse_Config::payment_methods_cod, $store_id_order);
|
| 104 |
+
if ($openOrders && $paymentMethods) {
|
| 105 |
+
if (!$first)
|
| 106 |
+
$query .= ' or ';
|
| 107 |
+
$query .= '(o.status in ' . self::createInClause($openOrders) . ' and p.method in ' . self::createInClause($paymentMethods);
|
| 108 |
+
|
| 109 |
+
if ($m2e_active && !$m2e_used && strstr($paymentMethods, 'm2epropayment') !== false) {
|
| 110 |
+
$query .= ' and (p.method <> \'m2epropayment\' or e.payment_details like \'%"method":"Nachnahme"%\') ';
|
| 111 |
+
$m2e_used = true;
|
| 112 |
+
}
|
| 113 |
+
|
| 114 |
+
$query .= ')';
|
| 115 |
+
$first = false;
|
| 116 |
+
}
|
| 117 |
+
|
| 118 |
+
// INVOICE
|
| 119 |
+
$openOrders = Komfortkasse_Config::getConfig(Komfortkasse_Config::status_open_invoice, $store_id_order);
|
| 120 |
+
$paymentMethods = Komfortkasse_Config::getConfig(Komfortkasse_Config::payment_methods_invoice, $store_id_order);
|
| 121 |
+
if ($openOrders && $paymentMethods) {
|
| 122 |
+
if (!$first)
|
| 123 |
+
$query .= ' or ';
|
| 124 |
+
$query .= '(o.status in ' . self::createInClause($openOrders) . ' and p.method in ' . self::createInClause($paymentMethods);
|
| 125 |
+
|
| 126 |
+
if ($m2e_active && !$m2e_used && strstr($paymentMethods, 'm2epropayment') !== false) {
|
| 127 |
+
$query .= ' and (p.method <> \'m2epropayment\' or e.payment_details like \'%"method":"Rechnung"%\') ';
|
| 128 |
+
$m2e_used = true;
|
| 129 |
+
}
|
| 130 |
+
|
| 131 |
+
$query .= ')';
|
| 132 |
+
$first = false;
|
| 133 |
+
}
|
| 134 |
+
|
| 135 |
+
$query .= ')';
|
| 136 |
+
|
| 137 |
+
$results = $readConnection->fetchAll($query);
|
| 138 |
+
foreach ($results as $result) {
|
| 139 |
+
$ret [] = $result ['increment_id'];
|
| 140 |
+
}
|
| 141 |
+
}
|
| 142 |
+
}
|
| 143 |
+
}
|
| 144 |
+
}
|
| 145 |
+
}
|
| 146 |
+
|
| 147 |
+
return $ret;
|
| 148 |
+
|
| 149 |
+
}
|
| 150 |
+
|
| 151 |
+
// end getOpenIDs()
|
| 152 |
+
|
| 153 |
+
|
| 154 |
+
/**
|
| 155 |
+
* Get refund IDS.
|
| 156 |
+
*
|
| 157 |
+
* @return string all refund IDs that are "open" and relevant for transfer to kk
|
| 158 |
+
*/
|
| 159 |
+
public static function getRefundIDs()
|
| 160 |
+
{
|
| 161 |
+
$ret = array ();
|
| 162 |
+
|
| 163 |
+
foreach (Mage::app()->getWebsites() as $website) {
|
| 164 |
+
foreach ($website->getGroups() as $group) {
|
| 165 |
+
$stores = $group->getStores();
|
| 166 |
+
foreach ($stores as $store) {
|
| 167 |
+
|
| 168 |
+
$store_id = $store->getId();
|
| 169 |
+
$store_id_order = array ();
|
| 170 |
+
$store_id_order ['store_id'] = $store_id;
|
| 171 |
+
|
| 172 |
+
if (!Komfortkasse_Config::getConfig(Komfortkasse_Config::activate_export, $store_id_order)) {
|
| 173 |
+
continue;
|
| 174 |
+
}
|
| 175 |
+
|
| 176 |
+
$paymentMethods = explode(',', Komfortkasse_Config::getConfig(Komfortkasse_Config::payment_methods, $store_id_order));
|
| 177 |
+
$paymentMethodsInvoice = explode(',', Komfortkasse_Config::getConfig(Komfortkasse_Config::payment_methods_invoice, $store_id_order));
|
| 178 |
+
|
| 179 |
+
$cmModel = Mage::getModel("sales/order_creditmemo");
|
| 180 |
+
$cmCollection = $cmModel->getCollection()->addFieldToFilter('store_id', $store_id);
|
| 181 |
+
|
| 182 |
+
foreach ($cmCollection as $creditMemo) {
|
| 183 |
+
if ($creditMemo->getTransactionId() == null) {
|
| 184 |
+
$order = $creditMemo->getOrder();
|
| 185 |
+
try {
|
| 186 |
+
$method = $order->getPayment()->getMethodInstance()->getCode();
|
| 187 |
+
} catch ( Exception $e ) {
|
| 188 |
+
// payment method has been deleted
|
| 189 |
+
$method = null;
|
| 190 |
+
}
|
| 191 |
+
if ($method && (in_array($method, $paymentMethods, true) === true || in_array($method, $paymentMethodsInvoice, true) === true)) {
|
| 192 |
+
$cmId = $creditMemo->getIncrementId();
|
| 193 |
+
$ret [] = $cmId;
|
| 194 |
+
}
|
| 195 |
+
}
|
| 196 |
+
}
|
| 197 |
+
}
|
| 198 |
+
}
|
| 199 |
+
}
|
| 200 |
+
|
| 201 |
+
return $ret;
|
| 202 |
+
|
| 203 |
+
}
|
| 204 |
+
|
| 205 |
+
// end getRefundIDs()
|
| 206 |
+
|
| 207 |
+
|
| 208 |
+
/**
|
| 209 |
+
* Get order.
|
| 210 |
+
*
|
| 211 |
+
* @param string $number order number
|
| 212 |
+
*
|
| 213 |
+
* @return array order
|
| 214 |
+
*/
|
| 215 |
+
public static function getOrder($number)
|
| 216 |
+
{
|
| 217 |
+
$order = Mage::getModel('sales/order')->loadByIncrementId($number);
|
| 218 |
+
if (empty($number) === true || empty($order) === true || $number != $order->getIncrementId()) {
|
| 219 |
+
return null;
|
| 220 |
+
}
|
| 221 |
+
|
| 222 |
+
$conf_general = Mage::getStoreConfig('general', $order->getStoreId());
|
| 223 |
+
|
| 224 |
+
$ret = array ();
|
| 225 |
+
$ret ['store_id'] = $order->getStoreId();
|
| 226 |
+
$ret ['invoice_date'] = null;
|
| 227 |
+
$ret ['number'] = $order->getIncrementId();
|
| 228 |
+
$ret ['status'] = $order->getStatus();
|
| 229 |
+
$ret ['date'] = date('d.m.Y', strtotime($order->getCreatedAtStoreDate()->get(Zend_Date::DATE_MEDIUM)));
|
| 230 |
+
$ret ['email'] = $order->getCustomerEmail();
|
| 231 |
+
$ret ['customer_number'] = $order->getCustomerId();
|
| 232 |
+
try {
|
| 233 |
+
$ret ['payment_method'] = $order->getPayment()->getMethodInstance()->getCode();
|
| 234 |
+
} catch ( Exception $e ) {
|
| 235 |
+
}
|
| 236 |
+
$ret ['amount'] = $order->getGrandTotal();
|
| 237 |
+
$ret ['currency_code'] = $order->getOrderCurrencyCode();
|
| 238 |
+
$ret ['exchange_rate'] = $order->getBaseToOrderRate();
|
| 239 |
+
|
| 240 |
+
// Rechnungsnummer und -datum, evtl. Rechnungsbetrag
|
| 241 |
+
$useInvoiceAmount = Komfortkasse::getOrderType($ret) == 'INVOICE' && Komfortkasse_Config::getConfig(Komfortkasse_Config::use_invoice_total, $ret);
|
| 242 |
+
$considerCreditnotes = $useInvoiceAmount && Komfortkasse_Config::getConfig(Komfortkasse_Config::consider_creditnotes, $ret);
|
| 243 |
+
$creditnotesAsInvoices = Komfortkasse_Config::getConfig(Komfortkasse_Config::creditnotes_as_invoices, $ret);
|
| 244 |
+
$lastOnly = Komfortkasse_Config::getConfig(Komfortkasse_Config::last_receipt_only, $ret);
|
| 245 |
+
$invoiceColl = $order->getInvoiceCollection();
|
| 246 |
+
$creditColl = $order->getCreditmemosCollection();
|
| 247 |
+
$invAmount = 0.0;
|
| 248 |
+
|
| 249 |
+
if ($lastOnly) {
|
| 250 |
+
// nur der letzte Beleg wird übertragen
|
| 251 |
+
$newestInvoice = null;
|
| 252 |
+
foreach ($invoiceColl as $invoice) {
|
| 253 |
+
if (!$invoice->isCanceled()) {
|
| 254 |
+
if ($newestInvoice == null || $newestInvoice->getCreatedAt() < $invoice->getCreatedAt()) {
|
| 255 |
+
$newestInvoice = $invoice;
|
| 256 |
+
}
|
| 257 |
+
}
|
| 258 |
+
}
|
| 259 |
+
$newestCredit = null;
|
| 260 |
+
if ($creditnotesAsInvoices) {
|
| 261 |
+
foreach ($creditColl as $credit) {
|
| 262 |
+
if ($newestCredit == null || $newestCredit->getCreatedAt() < $credit->getCreatedAt()) {
|
| 263 |
+
$newestCredit = $credit;
|
| 264 |
+
}
|
| 265 |
+
}
|
| 266 |
+
}
|
| 267 |
+
if ($newestCredit != null || $newestInvoice != null) {
|
| 268 |
+
if ($newestCredit == null || ($newestInvoice != null && $newestInvoice->getCreatedAt() > $newestCredit->getCreatedAt())) {
|
| 269 |
+
$ret ['invoice_number'] [] = $newestInvoice->getIncrementId();
|
| 270 |
+
$ret ['invoice_date'] = date('d.m.Y', strtotime($newestInvoice->getCreatedAt()));
|
| 271 |
+
$invAmount = $newestInvoice->getGrandTotal();
|
| 272 |
+
} else if ($newestCredit != null) {
|
| 273 |
+
$ret ['invoice_number'] [] = $newestCredit->getIncrementId();
|
| 274 |
+
$ret ['invoice_date'] = date('d.m.Y', strtotime($newestCredit->getCreatedAt()));
|
| 275 |
+
$invAmount = $newestCredit->getGrandTotal();
|
| 276 |
+
}
|
| 277 |
+
}
|
| 278 |
+
} else {
|
| 279 |
+
// alle Belege werden übertragen
|
| 280 |
+
if ($invoiceColl->getSize() > 0 || ($creditnotesAsInvoices && $creditColl->getSize() > 0)) {
|
| 281 |
+
foreach ($invoiceColl as $invoice) {
|
| 282 |
+
if (!$invoice->isCanceled()) {
|
| 283 |
+
$ret ['invoice_number'] [] = $invoice->getIncrementId();
|
| 284 |
+
$invoiceDate = date('d.m.Y', strtotime($invoice->getCreatedAt()));
|
| 285 |
+
if ($ret ['invoice_date'] == null || strtotime($ret ['invoice_date']) < strtotime($invoiceDate)) {
|
| 286 |
+
$ret ['invoice_date'] = $invoiceDate;
|
| 287 |
+
}
|
| 288 |
+
$invAmount = $invAmount + $invoice->getGrandTotal();
|
| 289 |
+
}
|
| 290 |
+
}
|
| 291 |
+
if (!$creditnotesAsInvoices && $considerCreditnotes) {
|
| 292 |
+
foreach ($creditColl as $credit) {
|
| 293 |
+
$invAmount = $invAmount - $credit->getGrandTotal();
|
| 294 |
+
}
|
| 295 |
+
}
|
| 296 |
+
if ($creditnotesAsInvoices) {
|
| 297 |
+
foreach ($creditColl as $credit) {
|
| 298 |
+
$ret ['invoice_number'] [] = $credit->getIncrementId();
|
| 299 |
+
$invoiceDate = date('d.m.Y', strtotime($credit->getCreatedAt()));
|
| 300 |
+
if ($ret ['invoice_date'] == null || strtotime($ret ['invoice_date']) < strtotime($invoiceDate)) {
|
| 301 |
+
$ret ['invoice_date'] = $invoiceDate;
|
| 302 |
+
}
|
| 303 |
+
$invAmount = $invAmount + $credit->getGrandTotal();
|
| 304 |
+
}
|
| 305 |
+
}
|
| 306 |
+
}
|
| 307 |
+
}
|
| 308 |
+
if ($useInvoiceAmount && $invAmount > 0)
|
| 309 |
+
$ret ['amount'] = $invAmount;
|
| 310 |
+
|
| 311 |
+
$shippingAddress = $order->getShippingAddress();
|
| 312 |
+
if ($shippingAddress) {
|
| 313 |
+
$ret ['delivery_firstname'] = utf8_encode($shippingAddress->getFirstname());
|
| 314 |
+
$ret ['delivery_lastname'] = utf8_encode($shippingAddress->getLastname());
|
| 315 |
+
$ret ['delivery_company'] = utf8_encode($shippingAddress->getCompany());
|
| 316 |
+
$ret ['delivery_street'] = utf8_encode($shippingAddress->getStreetFull());
|
| 317 |
+
$ret ['delivery_postcode'] = utf8_encode($shippingAddress->getPostcode());
|
| 318 |
+
$ret ['delivery_city'] = utf8_encode($shippingAddress->getCity());
|
| 319 |
+
$ret ['delivery_countrycode'] = utf8_encode($shippingAddress->getCountryId());
|
| 320 |
+
}
|
| 321 |
+
|
| 322 |
+
$billingAddress = $order->getBillingAddress();
|
| 323 |
+
if ($billingAddress) {
|
| 324 |
+
$ret ['language_code'] = substr($conf_general ['locale'] ['code'], 0, 2) . '-' . $billingAddress->getCountryId();
|
| 325 |
+
$ret ['billing_firstname'] = utf8_encode($billingAddress->getFirstname());
|
| 326 |
+
$ret ['billing_lastname'] = utf8_encode($billingAddress->getLastname());
|
| 327 |
+
$ret ['billing_company'] = utf8_encode($billingAddress->getCompany());
|
| 328 |
+
$ret ['billing_street'] = utf8_encode($billingAddress->getStreetFull());
|
| 329 |
+
$ret ['billing_postcode'] = utf8_encode($billingAddress->getPostcode());
|
| 330 |
+
$ret ['billing_city'] = utf8_encode($billingAddress->getCity());
|
| 331 |
+
$ret ['billing_countrycode'] = utf8_encode($billingAddress->getCountryId());
|
| 332 |
+
} else {
|
| 333 |
+
$ret ['language_code'] = substr($conf_general ['locale'] ['code'], 0, 2);
|
| 334 |
+
}
|
| 335 |
+
|
| 336 |
+
foreach ($order->getAllItems() as $itemId => $item) {
|
| 337 |
+
$sku = $item->getSku();
|
| 338 |
+
if ($sku) {
|
| 339 |
+
$ret ['products'] [] = $sku;
|
| 340 |
+
} else {
|
| 341 |
+
$ret ['products'] [] = $item->getName();
|
| 342 |
+
}
|
| 343 |
+
}
|
| 344 |
+
|
| 345 |
+
$m2e = Mage::getModel('M2ePro/Order');
|
| 346 |
+
if ($m2e && $m2e->load($order->getEntityId(), 'magento_order_id')) {
|
| 347 |
+
$ebay = Mage::getModel('M2ePro/Ebay_Order');
|
| 348 |
+
if ($ebay->load($m2e->getId(), 'order_id')) {
|
| 349 |
+
$ret ['marketplace_number'] = $ebay->getEbayOrderId();
|
| 350 |
+
$ret ['customer_number'] = $ebay->getBuyerUserId();
|
| 351 |
+
}
|
| 352 |
+
}
|
| 353 |
+
|
| 354 |
+
global $komfortkasse_order_extension;
|
| 355 |
+
if ($komfortkasse_order_extension && method_exists('Komfortkasse_Order_Extension', 'extendOrder') === true) {
|
| 356 |
+
$ret = Komfortkasse_Order_Extension::extendOrder($order, $ret);
|
| 357 |
+
}
|
| 358 |
+
|
| 359 |
+
return $ret;
|
| 360 |
+
|
| 361 |
+
}
|
| 362 |
+
|
| 363 |
+
// end getOrder()
|
| 364 |
+
|
| 365 |
+
|
| 366 |
+
/**
|
| 367 |
+
* Get refund.
|
| 368 |
+
*
|
| 369 |
+
* @param string $number refund number
|
| 370 |
+
*
|
| 371 |
+
* @return array refund
|
| 372 |
+
*/
|
| 373 |
+
public static function getRefund($number)
|
| 374 |
+
{
|
| 375 |
+
$resource = Mage::getSingleton('core/resource');
|
| 376 |
+
$id = $resource->getConnection('core_read')->fetchOne('SELECT `entity_id` FROM `' . $resource->getTableName('sales/creditmemo') . "` WHERE `increment_id` = '" . $number . "'");
|
| 377 |
+
|
| 378 |
+
$creditMemo = Mage::getModel('sales/order_creditmemo')->load($id);
|
| 379 |
+
if (empty($number) === true || empty($creditMemo) === true || $number != $creditMemo->getIncrementId()) {
|
| 380 |
+
return null;
|
| 381 |
+
}
|
| 382 |
+
|
| 383 |
+
$ret = array ();
|
| 384 |
+
$ret ['number'] = $creditMemo->getOrder()->getIncrementId();
|
| 385 |
+
// Number of the Creditmemo.
|
| 386 |
+
$ret ['customer_number'] = $creditMemo->getIncrementId();
|
| 387 |
+
$ret ['date'] = date('d.m.Y', strtotime($creditMemo->getCreatedAt()));
|
| 388 |
+
$ret ['amount'] = $creditMemo->getGrandTotal();
|
| 389 |
+
|
| 390 |
+
return $ret;
|
| 391 |
+
|
| 392 |
+
}
|
| 393 |
+
|
| 394 |
+
// end getRefund()
|
| 395 |
+
|
| 396 |
+
|
| 397 |
+
/**
|
| 398 |
+
* Update order.
|
| 399 |
+
*
|
| 400 |
+
* @param array $order order
|
| 401 |
+
* @param string $status status
|
| 402 |
+
* @param string $callbackid callback ID
|
| 403 |
+
*
|
| 404 |
+
* @return void
|
| 405 |
+
*/
|
| 406 |
+
public static function updateOrder($order, $status, $callbackid)
|
| 407 |
+
{
|
| 408 |
+
if (!Komfortkasse_Config::getConfig(Komfortkasse_Config::activate_update, $order)) {
|
| 409 |
+
return;
|
| 410 |
+
}
|
| 411 |
+
|
| 412 |
+
// Hint: PAID and CANCELLED are supported as of now.
|
| 413 |
+
$order = Mage::getModel('sales/order')->loadByIncrementId($order ['number']);
|
| 414 |
+
|
| 415 |
+
Mage::log('Komfortkasse: update order ' . $order->getIncrementId() . ' START', null, 'komfortkasse.log');
|
| 416 |
+
Mage::dispatchEvent('komfortkasse_change_order_status_before', array ('order' => $order,'status' => $status,'callbackid' => $callbackid
|
| 417 |
+
));
|
| 418 |
+
|
| 419 |
+
$stateCollection = Mage::getModel('sales/order_status')->getCollection()->joinStates();
|
| 420 |
+
$stateCollection->addFieldToFilter('main_table.status', array ('like' => $status
|
| 421 |
+
));
|
| 422 |
+
$state = $stateCollection->getFirstItem()->getState();
|
| 423 |
+
|
| 424 |
+
if ($state == 'processing' || $state == 'closed' || $state == 'complete') {
|
| 425 |
+
|
| 426 |
+
// If there is already an invoice, update the invoice, not the order.
|
| 427 |
+
$invoiceColl = $order->getInvoiceCollection();
|
| 428 |
+
if ($invoiceColl->getSize() > 0) {
|
| 429 |
+
foreach ($order->getInvoiceCollection() as $invoice) {
|
| 430 |
+
Mage::log('Komfortkasse: update order ' . $order->getIncrementId() . ' invoice ' . $invoice->getIncrementId() . ' pay', null, 'komfortkasse.log');
|
| 431 |
+
$invoice->pay();
|
| 432 |
+
Mage::log('Komfortkasse: update order ' . $order->getIncrementId() . ' invoice ' . $invoice->getIncrementId() . ' addComment ' . $callbackid, null, 'komfortkasse.log');
|
| 433 |
+
$invoice->addComment($callbackid, false, false);
|
| 434 |
+
self::mysave($invoice);
|
| 435 |
+
}
|
| 436 |
+
} else {
|
| 437 |
+
$payment = $order->getPayment();
|
| 438 |
+
Mage::log('Komfortkasse: update order ' . $order->getIncrementId() . ' payment capture', null, 'komfortkasse.log');
|
| 439 |
+
$payment->capture(null);
|
| 440 |
+
|
| 441 |
+
if ($callbackid) {
|
| 442 |
+
$payment->setTransactionId($callbackid);
|
| 443 |
+
Mage::log('Komfortkasse: update order ' . $order->getIncrementId() . ' addTransaction', null, 'komfortkasse.log');
|
| 444 |
+
$transaction = $payment->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE);
|
| 445 |
+
}
|
| 446 |
+
}
|
| 447 |
+
$order->save();
|
| 448 |
+
$order = Mage::getModel('sales/order')->loadByIncrementId($order->getIncrementId());
|
| 449 |
+
|
| 450 |
+
Mage::log('Komfortkasse: update order ' . $order->getIncrementId() . ' add status history ' . $status . ' / ' . $callbackid, null, 'komfortkasse.log');
|
| 451 |
+
$history = $order->addStatusHistoryComment('' . $callbackid, $status);
|
| 452 |
+
$order->setStatus($status);
|
| 453 |
+
$order->save();
|
| 454 |
+
} else if ($state == 'canceled') {
|
| 455 |
+
|
| 456 |
+
if ($callbackid) {
|
| 457 |
+
Mage::log('Komfortkasse: update order ' . $order->getIncrementId() . ' add status history ' . $status . ' / ' . $callbackid, null, 'komfortkasse.log');
|
| 458 |
+
$history = $order->addStatusHistoryComment('' . $callbackid, $status);
|
| 459 |
+
}
|
| 460 |
+
if ($order->canCancel()) {
|
| 461 |
+
Mage::log('Komfortkasse: update order ' . $order->getIncrementId() . ' cancel', null, 'komfortkasse.log');
|
| 462 |
+
$order->cancel();
|
| 463 |
+
}
|
| 464 |
+
Mage::log('Komfortkasse: update order ' . $order->getIncrementId() . ' set status ' . $status, null, 'komfortkasse.log');
|
| 465 |
+
$order->setStatus($status);
|
| 466 |
+
$order->save();
|
| 467 |
+
} else {
|
| 468 |
+
|
| 469 |
+
Mage::log('Komfortkasse: update order ' . $order->getIncrementId() . ' add status history ' . $status . ' / ' . $callbackid, null, 'komfortkasse.log');
|
| 470 |
+
$history = $order->addStatusHistoryComment('' . $callbackid, $status);
|
| 471 |
+
$order->save();
|
| 472 |
+
}
|
| 473 |
+
|
| 474 |
+
Mage::dispatchEvent('komfortkasse_change_order_status_after', array ('order' => $order,'status' => $status,'callbackid' => $callbackid
|
| 475 |
+
));
|
| 476 |
+
|
| 477 |
+
Mage::log('Komfortkasse: update order ' . $order->getIncrementId() . ' END. Status: ' . $order->getStatus, null, 'komfortkasse.log');
|
| 478 |
+
|
| 479 |
+
}
|
| 480 |
+
|
| 481 |
+
// end updateOrder()
|
| 482 |
+
|
| 483 |
+
|
| 484 |
+
/**
|
| 485 |
+
* Update order.
|
| 486 |
+
*
|
| 487 |
+
* @param string $refundIncrementId Increment ID of refund
|
| 488 |
+
* @param string $status status
|
| 489 |
+
* @param string $callbackid callback ID
|
| 490 |
+
*
|
| 491 |
+
* @return void
|
| 492 |
+
*/
|
| 493 |
+
public static function updateRefund($refundIncrementId, $status, $callbackid)
|
| 494 |
+
{
|
| 495 |
+
$resource = Mage::getSingleton('core/resource');
|
| 496 |
+
$id = $resource->getConnection('core_read')->fetchOne('SELECT `entity_id` FROM `' . $resource->getTableName('sales/creditmemo') . "` WHERE `increment_id` = '" . $refundIncrementId . "'");
|
| 497 |
+
|
| 498 |
+
$creditMemo = Mage::getModel('sales/order_creditmemo')->load($id);
|
| 499 |
+
|
| 500 |
+
$store_id = $creditMemo->getStoreId();
|
| 501 |
+
$store_id_order = array ();
|
| 502 |
+
$store_id_order ['store_id'] = $store_id;
|
| 503 |
+
|
| 504 |
+
if (!Komfortkasse_Config::getConfig(Komfortkasse_Config::activate_update, $store_id_order)) {
|
| 505 |
+
return;
|
| 506 |
+
}
|
| 507 |
+
|
| 508 |
+
if ($creditMemo->getTransactionId() == null) {
|
| 509 |
+
$creditMemo->setTransactionId($callbackid);
|
| 510 |
+
}
|
| 511 |
+
|
| 512 |
+
$history = $creditMemo->addComment($status . ' [' . $callbackid . ']', false, false);
|
| 513 |
+
|
| 514 |
+
$creditMemo->save();
|
| 515 |
+
|
| 516 |
+
}
|
| 517 |
+
|
| 518 |
+
// end updateRefund()
|
| 519 |
+
|
| 520 |
+
|
| 521 |
+
/**
|
| 522 |
+
* Call an object's save method
|
| 523 |
+
*
|
| 524 |
+
* @param unknown $object
|
| 525 |
+
*
|
| 526 |
+
* @return void
|
| 527 |
+
*/
|
| 528 |
+
private static function mysave($object)
|
| 529 |
+
{
|
| 530 |
+
$object->save();
|
| 531 |
+
|
| 532 |
+
}
|
| 533 |
+
|
| 534 |
+
|
| 535 |
+
public static function getInvoicePdfPrepare()
|
| 536 |
+
{
|
| 537 |
+
|
| 538 |
+
}
|
| 539 |
+
|
| 540 |
+
|
| 541 |
+
public static function getInvoicePdf($invoiceNumber, $orderNumber)
|
| 542 |
+
{
|
| 543 |
+
if ($invoiceNumber) {
|
| 544 |
+
|
| 545 |
+
$invoice = Mage::getModel('sales/order_invoice')->loadByIncrementId($invoiceNumber);
|
| 546 |
+
$fileName = $invoiceNumber . '.pdf';
|
| 547 |
+
|
| 548 |
+
if ($invoice && (!$orderNumber || $invoice->getOrderIncrementId() == $orderNumber)) {
|
| 549 |
+
|
| 550 |
+
$pdfGenerated = false;
|
| 551 |
+
|
| 552 |
+
// try easy pdf (www.easypdfinvoice.com)
|
| 553 |
+
if (!$pdfGenerated) {
|
| 554 |
+
$pdfProModel = Mage::getModel('pdfpro/order_invoice');
|
| 555 |
+
if ($pdfProModel !== false) {
|
| 556 |
+
$invoiceData = $pdfProModel->initInvoiceData($invoice);
|
| 557 |
+
$result = Mage::helper('pdfpro')->initPdf(array ($invoiceData
|
| 558 |
+
));
|
| 559 |
+
if ($result ['success']) {
|
| 560 |
+
$content = $result ['content'];
|
| 561 |
+
$pdfGenerated = true;
|
| 562 |
+
}
|
| 563 |
+
}
|
| 564 |
+
}
|
| 565 |
+
|
| 566 |
+
// try Magento Standard
|
| 567 |
+
if (!$pdfGenerated) {
|
| 568 |
+
$pdf = Mage::getModel('sales/order_pdf_invoice')->getPdf(array ($invoice
|
| 569 |
+
));
|
| 570 |
+
$content = $pdf->render();
|
| 571 |
+
}
|
| 572 |
+
} else if (Komfortkasse_Config::getConfig(Komfortkasse_Config::creditnotes_as_invoices, self::getOrder($orderNumber))) {
|
| 573 |
+
|
| 574 |
+
// try credit note
|
| 575 |
+
$collection = Mage::getResourceModel('sales/order_creditmemo_collection')->addFieldToFilter('increment_id', $invoiceNumber);
|
| 576 |
+
$credit = $collection->count() == 1 ? $collection->getFirstItem() : null;
|
| 577 |
+
|
| 578 |
+
if ($credit && (!$orderNumber || $credit->getOrder()->getIncrementId() == $orderNumber)) {
|
| 579 |
+
|
| 580 |
+
$pdfGenerated = false;
|
| 581 |
+
|
| 582 |
+
// try easy pdf (www.easypdfinvoice.com)
|
| 583 |
+
if (!$pdfGenerated) {
|
| 584 |
+
$pdfProModel = Mage::getModel('pdfpro/order_creditmemo');
|
| 585 |
+
if ($pdfProModel !== false) {
|
| 586 |
+
$creditData = $pdfProModel->initCreditmemoData($credit);
|
| 587 |
+
$result = Mage::helper('pdfpro')->initPdf(array ($creditData
|
| 588 |
+
));
|
| 589 |
+
if ($result ['success']) {
|
| 590 |
+
$content = $result ['content'];
|
| 591 |
+
// $pdfGenerated = true;
|
| 592 |
+
}
|
| 593 |
+
}
|
| 594 |
+
}
|
| 595 |
+
|
| 596 |
+
// try Magento Standard
|
| 597 |
+
if (!$pdfGenerated) {
|
| 598 |
+
$pdf = Mage::getModel('sales/order_pdf_creditmemo')->getPdf(array ($credit
|
| 599 |
+
));
|
| 600 |
+
$content = $pdf->render();
|
| 601 |
+
}
|
| 602 |
+
}
|
| 603 |
+
}
|
| 604 |
+
|
| 605 |
+
|
| 606 |
+
return $content;
|
| 607 |
+
}
|
| 608 |
+
|
| 609 |
+
}
|
| 610 |
}//end class
|
app/code/community/Ltc/Komfortkasse/etc/config.xml
CHANGED
|
@@ -3,7 +3,7 @@
|
|
| 3 |
<config>
|
| 4 |
<modules>
|
| 5 |
<Ltc_Komfortkasse>
|
| 6 |
-
<version>1.6.
|
| 7 |
</Ltc_Komfortkasse>
|
| 8 |
</modules>
|
| 9 |
<global>
|
| 3 |
<config>
|
| 4 |
<modules>
|
| 5 |
<Ltc_Komfortkasse>
|
| 6 |
+
<version>1.6.1</version>
|
| 7 |
</Ltc_Komfortkasse>
|
| 8 |
</modules>
|
| 9 |
<global>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Ltc_Komfortkasse</name>
|
| 4 |
-
<version>1.6.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://creativecommons.org/licenses/by-nd/4.0/">CC BY-ND 4.0</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -16,8 +16,8 @@ Es ist eine Anmeldung auf www.komfortkasse.eu erforderlich (kostenloses Paket ve
|
|
| 16 |
<notes>improvements for multi shop environments</notes>
|
| 17 |
<authors><author><name>Komfortkasse</name><user>komfortkasse</user><email>integration@komfortkasse.eu</email></author></authors>
|
| 18 |
<date>2016-10-14</date>
|
| 19 |
-
<time>
|
| 20 |
-
<contents><target name="magecommunity"><dir name="Ltc"><dir name="Komfortkasse"><dir name="Helper"><file name="Data.php" hash="42f1d168bb70725128e15daf305802ba"/><file name="Komfortkasse.php" hash="
|
| 21 |
<compatible/>
|
| 22 |
<dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
|
| 23 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Ltc_Komfortkasse</name>
|
| 4 |
+
<version>1.6.1</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://creativecommons.org/licenses/by-nd/4.0/">CC BY-ND 4.0</license>
|
| 7 |
<channel>community</channel>
|
| 16 |
<notes>improvements for multi shop environments</notes>
|
| 17 |
<authors><author><name>Komfortkasse</name><user>komfortkasse</user><email>integration@komfortkasse.eu</email></author></authors>
|
| 18 |
<date>2016-10-14</date>
|
| 19 |
+
<time>13:08:19</time>
|
| 20 |
+
<contents><target name="magecommunity"><dir name="Ltc"><dir name="Komfortkasse"><dir name="Helper"><file name="Data.php" hash="42f1d168bb70725128e15daf305802ba"/><file name="Komfortkasse.php" hash="00d57e02965e488bf37075d2ad42e512"/><file name="Komfortkasse.php.bak" hash="2a8cd73b832172bbbed17f2c062f7e4a"/><file name="Komfortkasse_Config.php" hash="991250ec3cdbc9b7b79ab38888e3a022"/><file name="Komfortkasse_Order.php" hash="a2276a8b7ff60e00693cd47fd8ad083e"/></dir><dir name="Model"><file name="Encryptionoptions.php" hash="1fbe2ffc43cc3c1489688d20f4c8af11"/><file name="Observer.php" hash="5b616b6d3651df44f8297c732dc478bb"/></dir><dir name="controllers"><file name="MainController.php" hash="b983fe60b2bbfa3aa1d57850cc6c045b"/></dir><dir name="etc"><file name="config.xml" hash="99f993acacbbd107da9a406f595c047d"/><file name="system.xml" hash="4477e69044c79edab2b70691b0236bd8"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Ltc_Komfortkasse.xml" hash="433066ef75047d9468dcea87888283d2"/></dir></target></contents>
|
| 21 |
<compatible/>
|
| 22 |
<dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
|
| 23 |
</package>
|
