@@ -18,37 +18,37 @@ |
||
| 18 | 18 | ); |
| 19 | 19 | |
| 20 | 20 | |
| 21 | - $object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Coupon\Standard( $context, $mapping ); |
|
| 21 | + $object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Coupon\Standard($context, $mapping); |
|
| 22 | 22 | |
| 23 | - $invoice = $this->getInvoice( $context ); |
|
| 24 | - $order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->load( $invoice->getBaseId() ); |
|
| 23 | + $invoice = $this->getInvoice($context); |
|
| 24 | + $order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->load($invoice->getBaseId()); |
|
| 25 | 25 | |
| 26 | - $data = $object->process( $invoice, $order ); |
|
| 26 | + $data = $object->process($invoice, $order); |
|
| 27 | 27 | |
| 28 | 28 | |
| 29 | - $this->assertEquals( 2, count( $data ) ); |
|
| 29 | + $this->assertEquals(2, count($data)); |
|
| 30 | 30 | |
| 31 | - $this->assertEquals( 1, count( $data[0] ) ); |
|
| 32 | - $this->assertEquals( '5678', $data[0][0] ); |
|
| 31 | + $this->assertEquals(1, count($data[0])); |
|
| 32 | + $this->assertEquals('5678', $data[0][0]); |
|
| 33 | 33 | |
| 34 | - $this->assertEquals( 1, count( $data[1] ) ); |
|
| 35 | - $this->assertEquals( 'OPQR', $data[1][0] ); |
|
| 34 | + $this->assertEquals(1, count($data[1])); |
|
| 35 | + $this->assertEquals('OPQR', $data[1][0]); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | |
| 39 | - protected function getInvoice( $context ) |
|
| 39 | + protected function getInvoice($context) |
|
| 40 | 40 | { |
| 41 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
| 41 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
| 42 | 42 | |
| 43 | 43 | $search = $manager->createSearch(); |
| 44 | - $search->setConditions( $search->compare( '==', 'order.datepayment', '2008-02-15 12:34:56' ) ); |
|
| 44 | + $search->setConditions($search->compare('==', 'order.datepayment', '2008-02-15 12:34:56')); |
|
| 45 | 45 | |
| 46 | - $items = $manager->searchItems( $search ); |
|
| 46 | + $items = $manager->searchItems($search); |
|
| 47 | 47 | |
| 48 | - if( ( $item = reset( $items ) ) !== false ) { |
|
| 48 | + if (($item = reset($items)) !== false) { |
|
| 49 | 49 | return $item; |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - throw new \Exception( 'No order item found' ); |
|
| 52 | + throw new \Exception('No order item found'); |
|
| 53 | 53 | } |
| 54 | 54 | } |
@@ -38,77 +38,77 @@ |
||
| 38 | 38 | ); |
| 39 | 39 | |
| 40 | 40 | |
| 41 | - $object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Address\Standard( $context, $mapping ); |
|
| 42 | - |
|
| 43 | - $invoice = $this->getInvoice( $context ); |
|
| 44 | - $order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->load( $invoice->getBaseId() ); |
|
| 45 | - |
|
| 46 | - $data = $object->process( $invoice, $order ); |
|
| 47 | - |
|
| 48 | - |
|
| 49 | - $this->assertEquals( 2, count( $data ) ); |
|
| 50 | - |
|
| 51 | - $this->assertEquals( 21, count( $data[0] ) ); |
|
| 52 | - $this->assertEquals( 'payment', $data[0][0] ); |
|
| 53 | - $this->assertEquals( 'mr', $data[0][1] ); |
|
| 54 | - $this->assertEquals( '', $data[0][2] ); |
|
| 55 | - $this->assertEquals( '', $data[0][3] ); |
|
| 56 | - $this->assertEquals( '', $data[0][4] ); |
|
| 57 | - $this->assertEquals( 'Our', $data[0][5] ); |
|
| 58 | - $this->assertEquals( 'Unittest', $data[0][6] ); |
|
| 59 | - $this->assertEquals( 'Durchschnitt', $data[0][7] ); |
|
| 60 | - $this->assertEquals( '1', $data[0][8] ); |
|
| 61 | - $this->assertEquals( '', $data[0][9] ); |
|
| 62 | - $this->assertEquals( '20146', $data[0][10] ); |
|
| 63 | - $this->assertEquals( 'Hamburg', $data[0][11] ); |
|
| 64 | - $this->assertEquals( 'Hamburg', $data[0][12] ); |
|
| 65 | - $this->assertEquals( 'DE', $data[0][13] ); |
|
| 66 | - $this->assertEquals( 'de', $data[0][14] ); |
|
| 67 | - $this->assertEquals( '055544332211', $data[0][15] ); |
|
| 68 | - $this->assertEquals( '055544332213', $data[0][16] ); |
|
| 69 | - $this->assertEquals( '[email protected]', $data[0][17] ); |
|
| 70 | - $this->assertEquals( 'www.metaways.net', $data[0][18] ); |
|
| 71 | - $this->assertEquals( '11.000000', $data[0][19] ); |
|
| 72 | - $this->assertEquals( '52.000000', $data[0][20] ); |
|
| 73 | - |
|
| 74 | - $this->assertEquals( 21, count( $data[1] ) ); |
|
| 75 | - $this->assertEquals( 'delivery', $data[1][0] ); |
|
| 76 | - $this->assertEquals( 'mr', $data[1][1] ); |
|
| 77 | - $this->assertEquals( 'Example company', $data[1][2] ); |
|
| 78 | - $this->assertEquals( 'DE999999999', $data[1][3] ); |
|
| 79 | - $this->assertEquals( 'Dr.', $data[1][4] ); |
|
| 80 | - $this->assertEquals( 'Our', $data[1][5] ); |
|
| 81 | - $this->assertEquals( 'Unittest', $data[1][6] ); |
|
| 82 | - $this->assertEquals( 'Pickhuben', $data[1][7] ); |
|
| 83 | - $this->assertEquals( '2-4', $data[1][8] ); |
|
| 84 | - $this->assertEquals( '', $data[1][9] ); |
|
| 85 | - $this->assertEquals( '20457', $data[1][10] ); |
|
| 86 | - $this->assertEquals( 'Hamburg', $data[1][11] ); |
|
| 87 | - $this->assertEquals( 'Hamburg', $data[1][12] ); |
|
| 88 | - $this->assertEquals( 'DE', $data[1][13] ); |
|
| 89 | - $this->assertEquals( 'de', $data[1][14] ); |
|
| 90 | - $this->assertEquals( '055544332211', $data[1][15] ); |
|
| 91 | - $this->assertEquals( '055544332212', $data[1][16] ); |
|
| 92 | - $this->assertEquals( '[email protected]', $data[1][17] ); |
|
| 93 | - $this->assertEquals( 'www.example.com', $data[1][18] ); |
|
| 94 | - $this->assertEquals( '10.000000', $data[1][19] ); |
|
| 95 | - $this->assertEquals( '50.000000', $data[1][20] ); |
|
| 41 | + $object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Address\Standard($context, $mapping); |
|
| 42 | + |
|
| 43 | + $invoice = $this->getInvoice($context); |
|
| 44 | + $order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->load($invoice->getBaseId()); |
|
| 45 | + |
|
| 46 | + $data = $object->process($invoice, $order); |
|
| 47 | + |
|
| 48 | + |
|
| 49 | + $this->assertEquals(2, count($data)); |
|
| 50 | + |
|
| 51 | + $this->assertEquals(21, count($data[0])); |
|
| 52 | + $this->assertEquals('payment', $data[0][0]); |
|
| 53 | + $this->assertEquals('mr', $data[0][1]); |
|
| 54 | + $this->assertEquals('', $data[0][2]); |
|
| 55 | + $this->assertEquals('', $data[0][3]); |
|
| 56 | + $this->assertEquals('', $data[0][4]); |
|
| 57 | + $this->assertEquals('Our', $data[0][5]); |
|
| 58 | + $this->assertEquals('Unittest', $data[0][6]); |
|
| 59 | + $this->assertEquals('Durchschnitt', $data[0][7]); |
|
| 60 | + $this->assertEquals('1', $data[0][8]); |
|
| 61 | + $this->assertEquals('', $data[0][9]); |
|
| 62 | + $this->assertEquals('20146', $data[0][10]); |
|
| 63 | + $this->assertEquals('Hamburg', $data[0][11]); |
|
| 64 | + $this->assertEquals('Hamburg', $data[0][12]); |
|
| 65 | + $this->assertEquals('DE', $data[0][13]); |
|
| 66 | + $this->assertEquals('de', $data[0][14]); |
|
| 67 | + $this->assertEquals('055544332211', $data[0][15]); |
|
| 68 | + $this->assertEquals('055544332213', $data[0][16]); |
|
| 69 | + $this->assertEquals('[email protected]', $data[0][17]); |
|
| 70 | + $this->assertEquals('www.metaways.net', $data[0][18]); |
|
| 71 | + $this->assertEquals('11.000000', $data[0][19]); |
|
| 72 | + $this->assertEquals('52.000000', $data[0][20]); |
|
| 73 | + |
|
| 74 | + $this->assertEquals(21, count($data[1])); |
|
| 75 | + $this->assertEquals('delivery', $data[1][0]); |
|
| 76 | + $this->assertEquals('mr', $data[1][1]); |
|
| 77 | + $this->assertEquals('Example company', $data[1][2]); |
|
| 78 | + $this->assertEquals('DE999999999', $data[1][3]); |
|
| 79 | + $this->assertEquals('Dr.', $data[1][4]); |
|
| 80 | + $this->assertEquals('Our', $data[1][5]); |
|
| 81 | + $this->assertEquals('Unittest', $data[1][6]); |
|
| 82 | + $this->assertEquals('Pickhuben', $data[1][7]); |
|
| 83 | + $this->assertEquals('2-4', $data[1][8]); |
|
| 84 | + $this->assertEquals('', $data[1][9]); |
|
| 85 | + $this->assertEquals('20457', $data[1][10]); |
|
| 86 | + $this->assertEquals('Hamburg', $data[1][11]); |
|
| 87 | + $this->assertEquals('Hamburg', $data[1][12]); |
|
| 88 | + $this->assertEquals('DE', $data[1][13]); |
|
| 89 | + $this->assertEquals('de', $data[1][14]); |
|
| 90 | + $this->assertEquals('055544332211', $data[1][15]); |
|
| 91 | + $this->assertEquals('055544332212', $data[1][16]); |
|
| 92 | + $this->assertEquals('[email protected]', $data[1][17]); |
|
| 93 | + $this->assertEquals('www.example.com', $data[1][18]); |
|
| 94 | + $this->assertEquals('10.000000', $data[1][19]); |
|
| 95 | + $this->assertEquals('50.000000', $data[1][20]); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | |
| 99 | - protected function getInvoice( $context ) |
|
| 99 | + protected function getInvoice($context) |
|
| 100 | 100 | { |
| 101 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
| 101 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
| 102 | 102 | |
| 103 | 103 | $search = $manager->createSearch(); |
| 104 | - $search->setConditions( $search->compare( '==', 'order.datepayment', '2008-02-15 12:34:56' ) ); |
|
| 104 | + $search->setConditions($search->compare('==', 'order.datepayment', '2008-02-15 12:34:56')); |
|
| 105 | 105 | |
| 106 | - $items = $manager->searchItems( $search ); |
|
| 106 | + $items = $manager->searchItems($search); |
|
| 107 | 107 | |
| 108 | - if( ( $item = reset( $items ) ) !== false ) { |
|
| 108 | + if (($item = reset($items)) !== false) { |
|
| 109 | 109 | return $item; |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - throw new \Exception( 'No order item found' ); |
|
| 112 | + throw new \Exception('No order item found'); |
|
| 113 | 113 | } |
| 114 | 114 | } |
@@ -34,50 +34,50 @@ |
||
| 34 | 34 | ); |
| 35 | 35 | |
| 36 | 36 | |
| 37 | - $object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Invoice\Standard( $context, $mapping ); |
|
| 38 | - |
|
| 39 | - $invoice = $this->getInvoice( $context ); |
|
| 40 | - $order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->load( $invoice->getBaseId() ); |
|
| 41 | - |
|
| 42 | - $data = $object->process( $invoice, $order ); |
|
| 43 | - |
|
| 44 | - |
|
| 45 | - $this->assertEquals( 1, count( $data ) ); |
|
| 46 | - |
|
| 47 | - $this->assertEquals( 17, count( $data[0] ) ); |
|
| 48 | - $this->assertEquals( 'web', $data[0][0] ); |
|
| 49 | - $this->assertEquals( '2008-02-15 12:34:56', $data[0][1] ); |
|
| 50 | - $this->assertEquals( '6', $data[0][2] ); |
|
| 51 | - $this->assertEquals( '', $data[0][3] ); |
|
| 52 | - $this->assertEquals( '4', $data[0][4] ); |
|
| 53 | - $this->assertEquals( '', $data[0][5] ); |
|
| 54 | - $this->assertGreaterThan( 0, $data[0][6] ); |
|
| 55 | - $this->assertEquals( 'unittest', $data[0][7] ); |
|
| 56 | - $this->assertEquals( 'de', $data[0][8] ); |
|
| 57 | - $this->assertEquals( 'EUR', $data[0][9] ); |
|
| 58 | - $this->assertEquals( '53.50', $data[0][10] ); |
|
| 59 | - $this->assertEquals( '1.50', $data[0][11] ); |
|
| 60 | - $this->assertEquals( '14.50', $data[0][12] ); |
|
| 61 | - $this->assertEquals( '0.0000', $data[0][13] ); |
|
| 62 | - $this->assertEquals( '1', $data[0][14] ); |
|
| 63 | - $this->assertEquals( '0', $data[0][15] ); |
|
| 64 | - $this->assertEquals( 'This is a comment if an order. It can be added by the user.', $data[0][16] ); |
|
| 37 | + $object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Invoice\Standard($context, $mapping); |
|
| 38 | + |
|
| 39 | + $invoice = $this->getInvoice($context); |
|
| 40 | + $order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->load($invoice->getBaseId()); |
|
| 41 | + |
|
| 42 | + $data = $object->process($invoice, $order); |
|
| 43 | + |
|
| 44 | + |
|
| 45 | + $this->assertEquals(1, count($data)); |
|
| 46 | + |
|
| 47 | + $this->assertEquals(17, count($data[0])); |
|
| 48 | + $this->assertEquals('web', $data[0][0]); |
|
| 49 | + $this->assertEquals('2008-02-15 12:34:56', $data[0][1]); |
|
| 50 | + $this->assertEquals('6', $data[0][2]); |
|
| 51 | + $this->assertEquals('', $data[0][3]); |
|
| 52 | + $this->assertEquals('4', $data[0][4]); |
|
| 53 | + $this->assertEquals('', $data[0][5]); |
|
| 54 | + $this->assertGreaterThan(0, $data[0][6]); |
|
| 55 | + $this->assertEquals('unittest', $data[0][7]); |
|
| 56 | + $this->assertEquals('de', $data[0][8]); |
|
| 57 | + $this->assertEquals('EUR', $data[0][9]); |
|
| 58 | + $this->assertEquals('53.50', $data[0][10]); |
|
| 59 | + $this->assertEquals('1.50', $data[0][11]); |
|
| 60 | + $this->assertEquals('14.50', $data[0][12]); |
|
| 61 | + $this->assertEquals('0.0000', $data[0][13]); |
|
| 62 | + $this->assertEquals('1', $data[0][14]); |
|
| 63 | + $this->assertEquals('0', $data[0][15]); |
|
| 64 | + $this->assertEquals('This is a comment if an order. It can be added by the user.', $data[0][16]); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | |
| 68 | - protected function getInvoice( $context ) |
|
| 68 | + protected function getInvoice($context) |
|
| 69 | 69 | { |
| 70 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
| 70 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
| 71 | 71 | |
| 72 | 72 | $search = $manager->createSearch(); |
| 73 | - $search->setConditions( $search->compare( '==', 'order.datepayment', '2008-02-15 12:34:56' ) ); |
|
| 73 | + $search->setConditions($search->compare('==', 'order.datepayment', '2008-02-15 12:34:56')); |
|
| 74 | 74 | |
| 75 | - $items = $manager->searchItems( $search ); |
|
| 75 | + $items = $manager->searchItems($search); |
|
| 76 | 76 | |
| 77 | - if( ( $item = reset( $items ) ) !== false ) { |
|
| 77 | + if (($item = reset($items)) !== false) { |
|
| 78 | 78 | return $item; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - throw new \Exception( 'No order item found' ); |
|
| 81 | + throw new \Exception('No order item found'); |
|
| 82 | 82 | } |
| 83 | 83 | } |
@@ -40,17 +40,17 @@ |
||
| 40 | 40 | * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items |
| 41 | 41 | * @return array Two dimensional associative list of order data representing the lines in CSV |
| 42 | 42 | */ |
| 43 | - public function process( \Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order ) |
|
| 43 | + public function process(\Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order) |
|
| 44 | 44 | { |
| 45 | 45 | $result = []; |
| 46 | 46 | |
| 47 | - foreach( $order->getCoupons() as $code => $products ) |
|
| 47 | + foreach ($order->getCoupons() as $code => $products) |
|
| 48 | 48 | { |
| 49 | 49 | $data = []; |
| 50 | 50 | |
| 51 | - foreach( $this->getMapping() as $pos => $key ) |
|
| 51 | + foreach ($this->getMapping() as $pos => $key) |
|
| 52 | 52 | { |
| 53 | - if( $key === 'order.base.coupon.code' ) { |
|
| 53 | + if ($key === 'order.base.coupon.code') { |
|
| 54 | 54 | $data[$pos] = $code; |
| 55 | 55 | } else { |
| 56 | 56 | $data[$pos] = ''; |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 30 | 30 | * @param array $mapping Associative list of field position in CSV as key and domain item key as value |
| 31 | 31 | */ |
| 32 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping ) |
|
| 32 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping) |
|
| 33 | 33 | { |
| 34 | 34 | $this->context = $context; |
| 35 | 35 | $this->mapping = $mapping; |
@@ -40,28 +40,28 @@ |
||
| 40 | 40 | * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items |
| 41 | 41 | * @return array Two dimensional associative list of order data representing the lines in CSV |
| 42 | 42 | */ |
| 43 | - public function process( \Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order ) |
|
| 43 | + public function process(\Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order) |
|
| 44 | 44 | { |
| 45 | 45 | $result = []; |
| 46 | 46 | $addresses = $order->getAddresses(); |
| 47 | 47 | |
| 48 | - krsort( $addresses ); |
|
| 48 | + krsort($addresses); |
|
| 49 | 49 | |
| 50 | - foreach( $addresses as $item ) |
|
| 50 | + foreach ($addresses as $item) |
|
| 51 | 51 | { |
| 52 | 52 | $data = []; |
| 53 | 53 | $list = $item->toArray(); |
| 54 | 54 | |
| 55 | - foreach( $this->getMapping() as $pos => $key ) |
|
| 55 | + foreach ($this->getMapping() as $pos => $key) |
|
| 56 | 56 | { |
| 57 | - if( array_key_exists( $key, $list ) ) { |
|
| 57 | + if (array_key_exists($key, $list)) { |
|
| 58 | 58 | $data[$pos] = $list[$key]; |
| 59 | 59 | } else { |
| 60 | 60 | $data[$pos] = ''; |
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - ksort( $data ); |
|
| 64 | + ksort($data); |
|
| 65 | 65 | $result[] = $data; |
| 66 | 66 | } |
| 67 | 67 | |
@@ -40,21 +40,21 @@ |
||
| 40 | 40 | * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items |
| 41 | 41 | * @return array Two dimensional associative list of order data representing the lines in CSV |
| 42 | 42 | */ |
| 43 | - public function process( \Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order ) |
|
| 43 | + public function process(\Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order) |
|
| 44 | 44 | { |
| 45 | 45 | $result = []; |
| 46 | 46 | $list = $invoice->toArray() + $order->toArray(); |
| 47 | 47 | |
| 48 | - foreach( $this->getMapping() as $pos => $key ) |
|
| 48 | + foreach ($this->getMapping() as $pos => $key) |
|
| 49 | 49 | { |
| 50 | - if( array_key_exists( $key, $list ) ) { |
|
| 50 | + if (array_key_exists($key, $list)) { |
|
| 51 | 51 | $result[$pos] = $list[$key]; |
| 52 | 52 | } else { |
| 53 | 53 | $result[$pos] = ''; |
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - ksort( $result ); |
|
| 57 | + ksort($result); |
|
| 58 | 58 | |
| 59 | 59 | return [$result]; |
| 60 | 60 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 26 | 26 | * @param array $mapping Associative list of field position in CSV as key and domain item key as value |
| 27 | 27 | */ |
| 28 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping ); |
|
| 28 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping); |
|
| 29 | 29 | |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -35,5 +35,5 @@ discard block |
||
| 35 | 35 | * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items |
| 36 | 36 | * @return array Two dimensional associative list of order data representing the lines in CSV |
| 37 | 37 | */ |
| 38 | - public function process( \Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order ); |
|
| 38 | + public function process(\Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order); |
|
| 39 | 39 | } |
| 40 | 40 | \ No newline at end of file |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | public function getName() |
| 30 | 30 | { |
| 31 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Order export CSV' ); |
|
| 31 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Order export CSV'); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | */ |
| 40 | 40 | public function getDescription() |
| 41 | 41 | { |
| 42 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Exports orders to CSV file' ); |
|
| 42 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Exports orders to CSV file'); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | * @category Developer |
| 74 | 74 | * @see controller/common/order/export/csv/max-size |
| 75 | 75 | */ |
| 76 | - $mappings = $config->get( 'controller/common/order/export/csv/mapping', $mappings ); |
|
| 76 | + $mappings = $config->get('controller/common/order/export/csv/mapping', $mappings); |
|
| 77 | 77 | |
| 78 | 78 | /** controller/jobs/order/export/csv/mapping |
| 79 | 79 | * List of mappings between the position in the CSV file and item keys |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | * @category Developer |
| 89 | 89 | * @see controller/common/order/export/csv/max-size |
| 90 | 90 | */ |
| 91 | - $mappings = $config->get( 'controller/jobs/order/export/csv/mapping', $mappings ); |
|
| 91 | + $mappings = $config->get('controller/jobs/order/export/csv/mapping', $mappings); |
|
| 92 | 92 | |
| 93 | 93 | |
| 94 | 94 | /** controller/common/order/export/csv/max-size |
@@ -106,29 +106,29 @@ discard block |
||
| 106 | 106 | * @category Developer |
| 107 | 107 | * @see controller/common/order/export/csv/mapping |
| 108 | 108 | */ |
| 109 | - $maxcnt = (int) $config->get( 'controller/common/order/export/csv/max-size', 1000 ); |
|
| 109 | + $maxcnt = (int) $config->get('controller/common/order/export/csv/max-size', 1000); |
|
| 110 | 110 | |
| 111 | 111 | |
| 112 | - $processors = $this->getProcessors( $mappings ); |
|
| 113 | - $mq = $context->getMessageQueueManager()->get( 'mq-admin' )->getQueue( 'order-export' ); |
|
| 112 | + $processors = $this->getProcessors($mappings); |
|
| 113 | + $mq = $context->getMessageQueueManager()->get('mq-admin')->getQueue('order-export'); |
|
| 114 | 114 | |
| 115 | - while( ( $msg = $mq->get() ) !== null ) |
|
| 115 | + while (($msg = $mq->get()) !== null) |
|
| 116 | 116 | { |
| 117 | 117 | try |
| 118 | 118 | { |
| 119 | - if( ( $data = json_decode( $msg->getBody(), true ) ) === null ) { |
|
| 120 | - throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid message: %2$s', $msg->getBody() ) ); |
|
| 119 | + if (($data = json_decode($msg->getBody(), true)) === null) { |
|
| 120 | + throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid message: %2$s', $msg->getBody())); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - $this->export( $processors, $data, $maxcnt ); |
|
| 123 | + $this->export($processors, $data, $maxcnt); |
|
| 124 | 124 | } |
| 125 | - catch( \Exception $e ) |
|
| 125 | + catch (\Exception $e) |
|
| 126 | 126 | { |
| 127 | - $logger->log( 'Order export error: ' . $e->getMessage() ); |
|
| 128 | - $logger->log( $e->getTraceAsString() ); |
|
| 127 | + $logger->log('Order export error: ' . $e->getMessage()); |
|
| 128 | + $logger->log($e->getTraceAsString()); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - $mq->del( $msg ); |
|
| 131 | + $mq->del($msg); |
|
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | 134 | |
@@ -139,15 +139,15 @@ discard block |
||
| 139 | 139 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item |
| 140 | 140 | * @param string $path Absolute path to the exported file |
| 141 | 141 | */ |
| 142 | - protected function addJob( $context, $path ) |
|
| 142 | + protected function addJob($context, $path) |
|
| 143 | 143 | { |
| 144 | - $manager = \Aimeos\MAdmin\Factory::createManager( $context, 'job' ); |
|
| 144 | + $manager = \Aimeos\MAdmin\Factory::createManager($context, 'job'); |
|
| 145 | 145 | |
| 146 | 146 | $item = $manager->createItem(); |
| 147 | - $item->setResult( ['file' => $path] ); |
|
| 148 | - $item->setLabel( $path ); |
|
| 147 | + $item->setResult(['file' => $path]); |
|
| 148 | + $item->setLabel($path); |
|
| 149 | 149 | |
| 150 | - $manager->saveItem( $item, false ); |
|
| 150 | + $manager->saveItem($item, false); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | * @see controller/jobs/order/export/csv/container/content |
| 178 | 178 | * @see controller/jobs/order/export/csv/container/options |
| 179 | 179 | */ |
| 180 | - $location = $config->get( 'controller/jobs/order/export/csv/location', sys_get_temp_dir() ); |
|
| 180 | + $location = $config->get('controller/jobs/order/export/csv/location', sys_get_temp_dir()); |
|
| 181 | 181 | |
| 182 | 182 | /** controller/jobs/order/export/csv/container/type |
| 183 | 183 | * Nave of the container type to read the data from |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | * @see controller/jobs/order/export/csv/container/content |
| 201 | 201 | * @see controller/jobs/order/export/csv/container/options |
| 202 | 202 | */ |
| 203 | - $container = $config->get( 'controller/jobs/order/export/csv/container/type', 'Directory' ); |
|
| 203 | + $container = $config->get('controller/jobs/order/export/csv/container/type', 'Directory'); |
|
| 204 | 204 | |
| 205 | 205 | /** controller/jobs/order/export/csv/container/content |
| 206 | 206 | * Name of the content type inside the container to read the data from |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | * @see controller/jobs/order/export/csv/container/type |
| 222 | 222 | * @see controller/jobs/order/export/csv/container/options |
| 223 | 223 | */ |
| 224 | - $content = $config->get( 'controller/jobs/order/export/csv/container/content', 'CSV' ); |
|
| 224 | + $content = $config->get('controller/jobs/order/export/csv/container/content', 'CSV'); |
|
| 225 | 225 | |
| 226 | 226 | /** controller/jobs/order/export/csv/container/options |
| 227 | 227 | * List of file container options for the order export files |
@@ -239,9 +239,9 @@ discard block |
||
| 239 | 239 | * @see controller/jobs/order/export/csv/container/content |
| 240 | 240 | * @see controller/jobs/order/export/csv/container/type |
| 241 | 241 | */ |
| 242 | - $options = $config->get( 'controller/jobs/order/export/csv/container/options', [] ); |
|
| 242 | + $options = $config->get('controller/jobs/order/export/csv/container/options', []); |
|
| 243 | 243 | |
| 244 | - return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options ); |
|
| 244 | + return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options); |
|
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | |
@@ -253,56 +253,56 @@ discard block |
||
| 253 | 253 | * @param integer $maxcnt Maximum number of retrieved orders at once |
| 254 | 254 | * @return string Path of the file containing the exported data |
| 255 | 255 | */ |
| 256 | - protected function export( array $processors, $msg, $maxcnt ) |
|
| 256 | + protected function export(array $processors, $msg, $maxcnt) |
|
| 257 | 257 | { |
| 258 | - $lcontext = $this->getLocaleContext( $msg ); |
|
| 258 | + $lcontext = $this->getLocaleContext($msg); |
|
| 259 | 259 | $baseRef = ['order/base/address', 'order.base.coupon', 'order/base/product', 'order/base/service']; |
| 260 | 260 | |
| 261 | - $manager = \Aimeos\MShop\Factory::createManager( $lcontext, 'order' ); |
|
| 262 | - $baseManager = \Aimeos\MShop\Factory::createManager( $lcontext, 'order/base' ); |
|
| 261 | + $manager = \Aimeos\MShop\Factory::createManager($lcontext, 'order'); |
|
| 262 | + $baseManager = \Aimeos\MShop\Factory::createManager($lcontext, 'order/base'); |
|
| 263 | 263 | |
| 264 | 264 | $container = $this->getContainer(); |
| 265 | - $content = $container->create( 'order-export_' . date( 'Y-m-d_H-i-s' ) ); |
|
| 266 | - $search = $this->initCriteria( $manager->createSearch(), $msg ); |
|
| 265 | + $content = $container->create('order-export_' . date('Y-m-d_H-i-s')); |
|
| 266 | + $search = $this->initCriteria($manager->createSearch(), $msg); |
|
| 267 | 267 | $start = 0; |
| 268 | 268 | |
| 269 | 269 | do |
| 270 | 270 | { |
| 271 | 271 | $baseIds = []; |
| 272 | - $search->setSlice( $start, $maxcnt ); |
|
| 273 | - $items = $manager->searchItems( $search ); |
|
| 272 | + $search->setSlice($start, $maxcnt); |
|
| 273 | + $items = $manager->searchItems($search); |
|
| 274 | 274 | |
| 275 | - foreach( $items as $item ) { |
|
| 275 | + foreach ($items as $item) { |
|
| 276 | 276 | $baseIds[] = $item->getBaseId(); |
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | $baseSearch = $baseManager->createSearch(); |
| 280 | - $baseSearch->setConditions( $baseSearch->compare( '==', 'order.base.id', $baseIds ) ); |
|
| 281 | - $baseSearch->setSlice( 0, count( $baseIds ) ); |
|
| 280 | + $baseSearch->setConditions($baseSearch->compare('==', 'order.base.id', $baseIds)); |
|
| 281 | + $baseSearch->setSlice(0, count($baseIds)); |
|
| 282 | 282 | |
| 283 | - $baseItems = $baseManager->searchItems( $baseSearch, $baseRef ); |
|
| 283 | + $baseItems = $baseManager->searchItems($baseSearch, $baseRef); |
|
| 284 | 284 | |
| 285 | - foreach( $items as $id => $item ) |
|
| 285 | + foreach ($items as $id => $item) |
|
| 286 | 286 | { |
| 287 | - foreach( $processors as $type => $processor ) |
|
| 287 | + foreach ($processors as $type => $processor) |
|
| 288 | 288 | { |
| 289 | - foreach( $processor->process( $item, $baseItems[$item->getBaseId()] ) as $line ) { |
|
| 290 | - $content->add( [0 => $type, 1 => $id] + $line ); |
|
| 289 | + foreach ($processor->process($item, $baseItems[$item->getBaseId()]) as $line) { |
|
| 290 | + $content->add([0 => $type, 1 => $id] + $line); |
|
| 291 | 291 | } |
| 292 | 292 | } |
| 293 | 293 | } |
| 294 | 294 | |
| 295 | - $count = count( $items ); |
|
| 295 | + $count = count($items); |
|
| 296 | 296 | $start += $count; |
| 297 | 297 | } |
| 298 | - while( $count === $search->getSliceSize() ); |
|
| 298 | + while ($count === $search->getSliceSize()); |
|
| 299 | 299 | |
| 300 | 300 | $path = $content->getResource(); |
| 301 | - $container->add( $content ); |
|
| 301 | + $container->add($content); |
|
| 302 | 302 | $container->close(); |
| 303 | 303 | |
| 304 | - $path = $this->moveFile( $lcontext, $path ); |
|
| 305 | - $this->addJob( $lcontext, $path ); |
|
| 304 | + $path = $this->moveFile($lcontext, $path); |
|
| 305 | + $this->addJob($lcontext, $path); |
|
| 306 | 306 | } |
| 307 | 307 | |
| 308 | 308 | |
@@ -312,15 +312,15 @@ discard block |
||
| 312 | 312 | * @param array $msg Message data including a "sitecode" value |
| 313 | 313 | * @return \Aimeos\MShop\Context\Item\Iface New context item with updated locale |
| 314 | 314 | */ |
| 315 | - protected function getLocaleContext( array $msg ) |
|
| 315 | + protected function getLocaleContext(array $msg) |
|
| 316 | 316 | { |
| 317 | 317 | $lcontext = clone $this->getContext(); |
| 318 | - $manager = \Aimeos\MShop\Factory::createManager( $lcontext, 'locale' ); |
|
| 318 | + $manager = \Aimeos\MShop\Factory::createManager($lcontext, 'locale'); |
|
| 319 | 319 | |
| 320 | - $sitecode = ( isset( $msg['sitecode'] ) ? $msg['sitecode'] : 'default' ); |
|
| 321 | - $localeItem = $manager->bootstrap( $sitecode, '', '', false, \Aimeos\MShop\Locale\Manager\Base::SITE_ONE ); |
|
| 320 | + $sitecode = (isset($msg['sitecode']) ? $msg['sitecode'] : 'default'); |
|
| 321 | + $localeItem = $manager->bootstrap($sitecode, '', '', false, \Aimeos\MShop\Locale\Manager\Base::SITE_ONE); |
|
| 322 | 322 | |
| 323 | - return $lcontext->setLocale( $localeItem ); |
|
| 323 | + return $lcontext->setLocale($localeItem); |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | |
@@ -331,14 +331,14 @@ discard block |
||
| 331 | 331 | * @param array $msg Message data |
| 332 | 332 | * @return \Aimeos\MW\Criteria\Iface Initialized criteria object |
| 333 | 333 | */ |
| 334 | - protected function initCriteria( \Aimeos\MW\Criteria\Iface $criteria, array $msg ) |
|
| 334 | + protected function initCriteria(\Aimeos\MW\Criteria\Iface $criteria, array $msg) |
|
| 335 | 335 | { |
| 336 | - if( isset( $msg['filter'] ) ) { |
|
| 337 | - $criteria->setConditions( $criteria->toConditions( $msg['filter'] ) ); |
|
| 336 | + if (isset($msg['filter'])) { |
|
| 337 | + $criteria->setConditions($criteria->toConditions($msg['filter'])); |
|
| 338 | 338 | } |
| 339 | 339 | |
| 340 | - if( isset( $msg['sort'] ) ) { |
|
| 341 | - $criteria->setSortations( $criteria->toSortations( $msg['sort'] ) ); |
|
| 340 | + if (isset($msg['sort'])) { |
|
| 341 | + $criteria->setSortations($criteria->toSortations($msg['sort'])); |
|
| 342 | 342 | } |
| 343 | 343 | |
| 344 | 344 | return $criteria; |
@@ -352,12 +352,12 @@ discard block |
||
| 352 | 352 | * @param string $path Absolute path to the exported file |
| 353 | 353 | * @return string Relative path of the file in the storage |
| 354 | 354 | */ |
| 355 | - protected function moveFile( $context, $path ) |
|
| 355 | + protected function moveFile($context, $path) |
|
| 356 | 356 | { |
| 357 | - $filename = basename( $path ); |
|
| 358 | - $context->getFileSystemManager()->get( 'fs-admin' )->writef( $filename, $path ); |
|
| 357 | + $filename = basename($path); |
|
| 358 | + $context->getFileSystemManager()->get('fs-admin')->writef($filename, $path); |
|
| 359 | 359 | |
| 360 | - unlink( $path ); |
|
| 360 | + unlink($path); |
|
| 361 | 361 | return $filename; |
| 362 | 362 | } |
| 363 | 363 | } |