From 73d8354812740fe65248a2c40552c2be962f1693 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 24 Aug 2022 23:53:31 +0200 Subject: [PATCH 001/646] add failing saturday-thursday config --- .../src/View/Helper/MyTimeHelperTest.php | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php index b8fb825ad7..175a54aea6 100644 --- a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php +++ b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php @@ -62,6 +62,12 @@ private function prepareMondayTuesdayConfig() $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 1); } + private function prepareSaturdayThursdayConfig() + { + $this->changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 4); + $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 5); + } + public function testGetFormattedNextDeliveryDayThursdayFriday() { $this->prepareThursdayFridayConfig(); @@ -146,6 +152,20 @@ public function testGetOrderPeriodFirstDayMondayTuesday() $this->assertGetOrderPeriodFirstDay('05.12.2017', '27.11.2017'); // tuesday } + public function testGetOrderPeriodFirstDaySaturdayThursday() + { + $this->prepareSaturdayThursdayConfig(); + $this->assertGetOrderPeriodFirstDay('22.08.2022', '20.08.2022'); // monday + $this->assertGetOrderPeriodFirstDay('23.08.2022', '20.08.2022'); // tuesday + $this->assertGetOrderPeriodFirstDay('24.08.2022', '20.08.2022'); // wednesday + $this->assertGetOrderPeriodFirstDay('25.08.2022', '20.08.2022'); // thursday + $this->assertGetOrderPeriodFirstDay('26.08.2022', '20.08.2022'); // friday + $this->assertGetOrderPeriodFirstDay('27.08.2022', '27.08.2022'); // saturday + $this->assertGetOrderPeriodFirstDay('28.08.2022', '27.08.2022'); // sunday + $this->assertGetOrderPeriodFirstDay('29.08.2022', '27.08.2022'); // monday + $this->assertGetOrderPeriodFirstDay('30.08.2022', '27.08.2022'); // tuesday + } + public function testGetOrderPeriodLastDayThursdayFriday() { $this->prepareThursdayFridayConfig(); @@ -203,6 +223,20 @@ public function testGetOrderPeriodLastDayMondayTuesday() $this->assertGetOrderPeriodLastDay('06.12.2017', '10.12.2017'); // wednesday } + public function testGetOrderPeriodLastDaySaturdayThursday() + { + $this->prepareSaturdayThursdayConfig(); + $this->assertGetOrderPeriodLastDay('22.08.2022', '26.08.2022'); // monday + $this->assertGetOrderPeriodLastDay('23.08.2022', '26.08.2022'); // tuesday + $this->assertGetOrderPeriodLastDay('24.08.2022', '26.08.2022'); // wednesday + $this->assertGetOrderPeriodLastDay('25.08.2022', '26.08.2022'); // thursday + $this->assertGetOrderPeriodLastDay('26.08.2022', '26.08.2022'); // friday + $this->assertGetOrderPeriodLastDay('27.08.2022', '02.09.2022'); // saturday + $this->assertGetOrderPeriodLastDay('28.08.2022', '02.09.2022'); // sunday + $this->assertGetOrderPeriodLastDay('29.08.2022', '02.09.2022'); // monday + $this->assertGetOrderPeriodLastDay('30.08.2022', '02.09.2022'); // tuesday + } + public function testGetDeliveryDayTuesdayFriday() { $this->prepareTuesdayFridayConfig(); From 3f3aa0864a580042a0e57ed9b1bd2d0d756ac765 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 25 Aug 2022 14:43:12 +0200 Subject: [PATCH 002/646] getOrderPeriodLastDay fix for saturday-thursday config --- src/View/Helper/MyTimeHelper.php | 11 +++++++++-- .../TestCase/src/View/Helper/MyTimeHelperTest.php | 14 +++++++------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index 5493055740..ec43d11e7b 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -383,7 +383,7 @@ public function getOrderPeriodFirstDay($day) } /** - * implemented for $this->sendOrderListsWeekday() == monday OR tuesday OR wednesday + * implemented for $this->sendOrderListsWeekday() == monday OR tuesday OR wednesday OR saturday * @param $day * @return $day */ @@ -415,7 +415,14 @@ public function getOrderPeriodLastDay($day) $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 1; } if ($currentWeekday == ($this->getDeliveryWeekday() + 6) % 7) { - $dateDiff = Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1; + $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 0; + } + + // method returned wrong data for MyTimeHelperTest::prepareSaturdayThursdayConfig() + // the following part fixes that + $correctionFactor = Configure::read('appDb.FCS_WEEKLY_PICKUP_DAY') - Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA'); + if ($correctionFactor < 0 && $dateDiff < 0) { + $dateDiff += 7; } $date = date($this->getI18Format('DateShortAlt'), strtotime($dateDiff . ' day ', $day)); diff --git a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php index 175a54aea6..98717c48cd 100644 --- a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php +++ b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php @@ -226,15 +226,15 @@ public function testGetOrderPeriodLastDayMondayTuesday() public function testGetOrderPeriodLastDaySaturdayThursday() { $this->prepareSaturdayThursdayConfig(); - $this->assertGetOrderPeriodLastDay('22.08.2022', '26.08.2022'); // monday - $this->assertGetOrderPeriodLastDay('23.08.2022', '26.08.2022'); // tuesday - $this->assertGetOrderPeriodLastDay('24.08.2022', '26.08.2022'); // wednesday - $this->assertGetOrderPeriodLastDay('25.08.2022', '26.08.2022'); // thursday - $this->assertGetOrderPeriodLastDay('26.08.2022', '26.08.2022'); // friday - $this->assertGetOrderPeriodLastDay('27.08.2022', '02.09.2022'); // saturday - $this->assertGetOrderPeriodLastDay('28.08.2022', '02.09.2022'); // sunday $this->assertGetOrderPeriodLastDay('29.08.2022', '02.09.2022'); // monday $this->assertGetOrderPeriodLastDay('30.08.2022', '02.09.2022'); // tuesday + $this->assertGetOrderPeriodLastDay('31.08.2022', '02.09.2022'); // wednesday + $this->assertGetOrderPeriodLastDay('01.09.2022', '02.09.2022'); // thursday + $this->assertGetOrderPeriodLastDay('02.09.2022', '02.09.2022'); // friday + $this->assertGetOrderPeriodLastDay('03.09.2022', '09.09.2022'); // saturday + $this->assertGetOrderPeriodLastDay('04.09.2022', '09.09.2022'); // sunday + $this->assertGetOrderPeriodLastDay('05.09.2022', '09.09.2022'); // monday + $this->assertGetOrderPeriodLastDay('06.09.2022', '09.09.2022'); // tuesday } public function testGetDeliveryDayTuesdayFriday() From a56c7209f707ec71c33d980f0392c7104afbb356 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 25 Aug 2022 14:51:43 +0200 Subject: [PATCH 003/646] fix --- tests/TestCase/src/View/Helper/MyTimeHelperTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php index 98717c48cd..f8357fae48 100644 --- a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php +++ b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php @@ -159,7 +159,7 @@ public function testGetOrderPeriodFirstDaySaturdayThursday() $this->assertGetOrderPeriodFirstDay('23.08.2022', '20.08.2022'); // tuesday $this->assertGetOrderPeriodFirstDay('24.08.2022', '20.08.2022'); // wednesday $this->assertGetOrderPeriodFirstDay('25.08.2022', '20.08.2022'); // thursday - $this->assertGetOrderPeriodFirstDay('26.08.2022', '20.08.2022'); // friday + $this->assertGetOrderPeriodFirstDay('26.08.2022', '27.08.2022'); // friday $this->assertGetOrderPeriodFirstDay('27.08.2022', '27.08.2022'); // saturday $this->assertGetOrderPeriodFirstDay('28.08.2022', '27.08.2022'); // sunday $this->assertGetOrderPeriodFirstDay('29.08.2022', '27.08.2022'); // monday From 4a2c04814d60e448bfe14435701bf343056c65be Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 25 Aug 2022 15:15:38 +0200 Subject: [PATCH 004/646] add test1WeekNormalNoFirstDeliveryDaySaturdayThursday --- .../Table/ProductsTableDeliveryRhythmTest.php | 21 ++++++- .../Traits/DeliveryRhythmConfigsTrait.php | 58 +++++++++++++++++++ .../src/View/Helper/MyTimeHelperTest.php | 33 +---------- 3 files changed, 81 insertions(+), 31 deletions(-) create mode 100644 tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php diff --git a/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php b/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php index 38cc37d1d7..10d3de0ca1 100644 --- a/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php +++ b/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php @@ -3,6 +3,7 @@ use App\Test\TestCase\AppCakeTestCase; use Cake\I18n\FrozenDate; use App\Test\TestCase\Traits\AppIntegrationTestTrait; +use App\Test\TestCase\Traits\DeliveryRhythmConfigsTrait; use App\Test\TestCase\Traits\LoginTrait; /** @@ -22,6 +23,7 @@ class ProductsTableDeliveryRhythmTest extends AppCakeTestCase { use AppIntegrationTestTrait; + use DeliveryRhythmConfigsTrait; use LoginTrait; public $Product; @@ -67,7 +69,7 @@ public function test1WeekWithFirstDeliveryDayAllowOrdersConfigOn() $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); } - public function test1WeekNormalNoFirstDeliveryDay() + public function test1WeekNormalNoFirstDeliveryDayWednesdayFriday() { $data = [ 'product' => $this->Product->newEntity( @@ -83,6 +85,23 @@ public function test1WeekNormalNoFirstDeliveryDay() $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); } + public function test1WeekNormalNoFirstDeliveryDaySaturdayThursday() + { + $this->prepareSaturdayThursdayConfig(); + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '1', + 'is_stock_product' => '0' + ] + ), + 'currentDay' => '2022-08-25', + 'result' => '2022-09-01' + ]; + $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); + } + public function test1WeekWithSendOrderListDayOneDayBeforeDefault() { $data = [ diff --git a/tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php b/tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php new file mode 100644 index 0000000000..6657fa6ece --- /dev/null +++ b/tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php @@ -0,0 +1,58 @@ +changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 5); + $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 1); + } + + protected function prepareWednesdayFridayConfig() + { + $this->changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 5); + $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 2); + } + + protected function prepareTuesdayFridayConfig() + { + $this->changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 5); + $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 3); + } + + protected function prepareMondayTuesdayConfig() + { + $this->changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 2); + $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 1); + } + + protected function prepareSaturdayThursdayConfig() + { + $this->changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 4); + $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 5); + $this->Products = FactoryLocator::get('Table')->get('Products'); + $query = 'UPDATE ' . $this->Products->getTable().' SET delivery_rhythm_send_order_list_weekday = 6'; + $this->dbConnection->execute($query); + } + +} diff --git a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php index f8357fae48..a512a1dae2 100644 --- a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php +++ b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php @@ -13,6 +13,7 @@ * @link https://www.foodcoopshop.com */ use App\Test\TestCase\AppCakeTestCase; +use App\Test\TestCase\Traits\DeliveryRhythmConfigsTrait; use App\View\Helper\MyTimeHelper; use Cake\I18n\FrozenDate; use Cake\View\View; @@ -20,6 +21,8 @@ class MyTimeHelperTest extends AppCakeTestCase { + use DeliveryRhythmConfigsTrait; + public function setUp(): void { parent::setUp(); @@ -38,36 +41,6 @@ public function testFormatToDbFormatDateEn() $this->assertEquals($result, '2018-06-12'); } - private function prepareThursdayFridayConfig() - { - $this->changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 5); - $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 1); - } - - private function prepareWednesdayFridayConfig() - { - $this->changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 5); - $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 2); - } - - private function prepareTuesdayFridayConfig() - { - $this->changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 5); - $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 3); - } - - private function prepareMondayTuesdayConfig() - { - $this->changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 2); - $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 1); - } - - private function prepareSaturdayThursdayConfig() - { - $this->changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 4); - $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 5); - } - public function testGetFormattedNextDeliveryDayThursdayFriday() { $this->prepareThursdayFridayConfig(); From e631a2e5448b5ce9877ce66b85080e829e110c3a Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 25 Aug 2022 15:20:20 +0200 Subject: [PATCH 005/646] code cleaning --- src/View/Helper/MyTimeHelper.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index ec43d11e7b..00be7321a3 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -361,11 +361,6 @@ public function getFormattedNextDeliveryDay($day) return date($this->getI18Format('DateShortAlt'), strtotime($this->getNextDeliveryDay($day))); } - /** - * see tests for implementations - * @param $day - * @return $day - */ public function getOrderPeriodFirstDay($day) { @@ -382,11 +377,6 @@ public function getOrderPeriodFirstDay($day) return $date; } - /** - * implemented for $this->sendOrderListsWeekday() == monday OR tuesday OR wednesday OR saturday - * @param $day - * @return $day - */ public function getOrderPeriodLastDay($day) { From 3e56b57675b00be9d43d3a157330c746e572235c Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 25 Aug 2022 21:35:42 +0200 Subject: [PATCH 006/646] add 867 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a37150cff..f4fca93ed1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe ### Neue Funktionen / Verbesserungen - Die Umsatzsteuer in der Bestellbestätigung kann nun mittels `app.showTaxInOrderConfirmationEmail => false` ausgeblendet werden. [PR#869](https://github.com/foodcoopshop/foodcoopshop/pull/869) +- Die Konfiguration "Freitag Bestellschluss / Samstag Bestelllisten-Versand / Donnerstag Abholtag" ist jetzt möglich. [I#866](https://github.com/foodcoopshop/foodcoopshop/issues/866) / [PR#867](https://github.com/foodcoopshop/foodcoopshop/pull/867) # Unveröffentlichte Version From 25e1300bffdb0523558039b09a90787a547ab5fb Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 25 Aug 2022 21:51:35 +0200 Subject: [PATCH 007/646] correct user --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4fca93ed1..d0f99d3dc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe ### Neue Funktionen / Verbesserungen - Die Umsatzsteuer in der Bestellbestätigung kann nun mittels `app.showTaxInOrderConfirmationEmail => false` ausgeblendet werden. [PR#869](https://github.com/foodcoopshop/foodcoopshop/pull/869) -- Die Konfiguration "Freitag Bestellschluss / Samstag Bestelllisten-Versand / Donnerstag Abholtag" ist jetzt möglich. [I#866](https://github.com/foodcoopshop/foodcoopshop/issues/866) / [PR#867](https://github.com/foodcoopshop/foodcoopshop/pull/867) +- Die Konfiguration "Freitag Bestellschluss / Samstag Bestelllisten-Versand / Donnerstag Abholtag" ist jetzt möglich. [I#866](https://github.com/foodcoopshop/foodcoopshop/issues/866) / [PR#867](https://github.com/foodcoopshop/foodcoopshop/pull/867) # Unveröffentlichte Version From 16f767467988e56dc8fb93bf725d4d01aa1cda4e Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 25 Aug 2022 21:53:21 +0200 Subject: [PATCH 008/646] wrong version --- tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php b/tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php index 6657fa6ece..fc4094bc49 100644 --- a/tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php +++ b/tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php @@ -11,7 +11,7 @@ * For full copyright and license information, please see LICENSE * Redistributions of files must retain the above copyright notice. * - * @since FoodCoopShop 3.5.0 + * @since FoodCoopShop 3.6.0 * @license https://opensource.org/licenses/AGPL-3.0 * @author Mario Rothauer * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com From 9a4edef748f245c500c3c9ad1335658b373d4115 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sat, 27 Aug 2022 22:45:30 +0200 Subject: [PATCH 009/646] introduced isWeeklyPickupDayBeforeSendOrderListsDay --- src/View/Helper/MyTimeHelper.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index 00be7321a3..782ebc5f19 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -409,9 +409,8 @@ public function getOrderPeriodLastDay($day) } // method returned wrong data for MyTimeHelperTest::prepareSaturdayThursdayConfig() - // the following part fixes that - $correctionFactor = Configure::read('appDb.FCS_WEEKLY_PICKUP_DAY') - Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA'); - if ($correctionFactor < 0 && $dateDiff < 0) { + // the check for isWeeklyPickupDayBeforeSendOrderListsDay fixes that + if ($this->isWeeklyPickupDayBeforeSendOrderListsDay() && $dateDiff < 0) { $dateDiff += 7; } @@ -420,6 +419,11 @@ public function getOrderPeriodLastDay($day) return $date; } + private function isWeeklyPickupDayBeforeSendOrderListsDay() + { + return (Configure::read('appDb.FCS_WEEKLY_PICKUP_DAY') - Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA')) < 0; + } + public function getSendOrderListsWeekdayOptions() { $defaultSendOrderListsWeekday = $this->getSendOrderListsWeekday(); From 0f85cbe4b071e879303cc7776748ba52d5921389 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sat, 27 Aug 2022 22:46:23 +0200 Subject: [PATCH 010/646] add failing tests for saturday-thursday config --- .../Table/ProductsTableDeliveryRhythmTest.php | 22 +++++++++++++++++-- .../src/View/Helper/MyTimeHelperTest.php | 15 ++++++++++++- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php b/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php index 10d3de0ca1..46b733a46f 100644 --- a/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php +++ b/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php @@ -96,8 +96,26 @@ public function test1WeekNormalNoFirstDeliveryDaySaturdayThursday() 'is_stock_product' => '0' ] ), - 'currentDay' => '2022-08-25', - 'result' => '2022-09-01' + 'currentDay' => '2022-08-26', // friday + 'result' => '2022-09-01', + ]; + $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); + } + + public function test1WeekNormalNoFirstDeliveryDaySaturdayThursdayWithSendOrderListDayOneDayBeforeDefault() + { + $this->prepareSaturdayThursdayConfig(); + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '1', + 'is_stock_product' => '0', + 'delivery_rhythm_send_order_list_weekday' => 5, + ] + ), + 'currentDay' => '2022-08-26', + 'result' => '2022-09-08', ]; $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); } diff --git a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php index a512a1dae2..aea06d0e33 100644 --- a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php +++ b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php @@ -213,7 +213,20 @@ public function testGetOrderPeriodLastDaySaturdayThursday() public function testGetDeliveryDayTuesdayFriday() { $this->prepareTuesdayFridayConfig(); - $this->assertGetDeliveryDay('25.07.2018', '03.08.2018'); // wednesday + $this->assertGetDeliveryDay('25.07.2018', '03.08.2018'); + } + + public function testGetDeliveryDaySaturdayThursday() + { + $this->prepareSaturdayThursdayConfig(); + $this->assertGetDeliveryDay('24.08.2022', '01.09.2022'); // wednesday + $this->assertGetDeliveryDay('25.08.2022', '01.09.2022'); // thursday + $this->assertGetDeliveryDay('26.08.2022', '01.09.2022'); // friday + $this->assertGetDeliveryDay('27.08.2022', '08.09.2022'); // saturday + $this->assertGetDeliveryDay('28.08.2022', '08.09.2022'); // sunday + $this->assertGetDeliveryDay('29.08.2022', '08.09.2022'); // monday + $this->assertGetDeliveryDay('30.08.2022', '08.09.2022'); // tuesday + $this->assertGetDeliveryDay('31.08.2022', '08.09.2022'); // wednesday } public function testGetLastDayOfLastMonth() From 94cb710efb2688c46b73af928ced310cf9165d6e Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sat, 27 Aug 2022 22:48:47 +0200 Subject: [PATCH 011/646] better setting of default values --- src/View/Helper/MyTimeHelper.php | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index 782ebc5f19..7556868cde 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -291,14 +291,13 @@ public function getDeliveryDateForSendOrderListsShell($date) return $deliveryDay; } - public function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, $deliveryRhythmType = null, $deliveryRhythmCount = null) + public function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, $deliveryRhythmType = 'week', $deliveryRhythmCount = 1) { - if (is_null($deliveryRhythmType)) { - $deliveryRhythmType = 'week'; - } - if (is_null($deliveryRhythmCount)) { - $deliveryRhythmCount = 1; + + if (is_null($sendOrderListsWeekday)) { + $sendOrderListsWeekday = $this->getSendOrderListsWeekday(); } + $daysToAddToOrderPeriodLastDay = Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') + 1; $deliveryDate = strtotime($this->getOrderPeriodLastDay($orderDay) . '+' . $daysToAddToOrderPeriodLastDay . ' days'); @@ -308,10 +307,6 @@ public function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, $delive $weekdayOrderDay = $this->formatAsWeekday($orderDay); $weekdayOrderDay = $weekdayOrderDay % 7; - if (is_null($sendOrderListsWeekday)) { - $sendOrderListsWeekday = $this->getSendOrderListsWeekday(); - } - if ($weekdayOrderDay >= $sendOrderListsWeekday && $weekdayOrderDay <= $weekdayDeliveryDate && $deliveryRhythmType != 'individual') { $preparedOrderDay = date($this->getI18Format('DateShortAlt'), $orderDay); $deliveryDate = strtotime($preparedOrderDay . '+ ' . $deliveryRhythmCount . ' ' . $deliveryRhythmType . ' ' . $weekdayStringDeliveryDate); From 40b4d1d29db98919805e930408cef51a9e4a6c84 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sat, 27 Aug 2022 23:07:11 +0200 Subject: [PATCH 012/646] Revert "better setting of default values" This reverts commit 94cb710efb2688c46b73af928ced310cf9165d6e. --- src/View/Helper/MyTimeHelper.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index 7556868cde..782ebc5f19 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -291,13 +291,14 @@ public function getDeliveryDateForSendOrderListsShell($date) return $deliveryDay; } - public function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, $deliveryRhythmType = 'week', $deliveryRhythmCount = 1) + public function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, $deliveryRhythmType = null, $deliveryRhythmCount = null) { - - if (is_null($sendOrderListsWeekday)) { - $sendOrderListsWeekday = $this->getSendOrderListsWeekday(); + if (is_null($deliveryRhythmType)) { + $deliveryRhythmType = 'week'; + } + if (is_null($deliveryRhythmCount)) { + $deliveryRhythmCount = 1; } - $daysToAddToOrderPeriodLastDay = Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') + 1; $deliveryDate = strtotime($this->getOrderPeriodLastDay($orderDay) . '+' . $daysToAddToOrderPeriodLastDay . ' days'); @@ -307,6 +308,10 @@ public function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, $delive $weekdayOrderDay = $this->formatAsWeekday($orderDay); $weekdayOrderDay = $weekdayOrderDay % 7; + if (is_null($sendOrderListsWeekday)) { + $sendOrderListsWeekday = $this->getSendOrderListsWeekday(); + } + if ($weekdayOrderDay >= $sendOrderListsWeekday && $weekdayOrderDay <= $weekdayDeliveryDate && $deliveryRhythmType != 'individual') { $preparedOrderDay = date($this->getI18Format('DateShortAlt'), $orderDay); $deliveryDate = strtotime($preparedOrderDay . '+ ' . $deliveryRhythmCount . ' ' . $deliveryRhythmType . ' ' . $weekdayStringDeliveryDate); From 87ab6d3e860d02bd4bccb709a9747b96b57f4238 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sat, 27 Aug 2022 23:08:10 +0200 Subject: [PATCH 013/646] fix --- src/View/Helper/MyTimeHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index 782ebc5f19..d4db2245c4 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -312,7 +312,7 @@ public function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, $delive $sendOrderListsWeekday = $this->getSendOrderListsWeekday(); } - if ($weekdayOrderDay >= $sendOrderListsWeekday && $weekdayOrderDay <= $weekdayDeliveryDate && $deliveryRhythmType != 'individual') { + if ($weekdayOrderDay >= $sendOrderListsWeekday && ($weekdayOrderDay <= $weekdayDeliveryDate || $this->isWeeklyPickupDayBeforeSendOrderListsDay()) && $deliveryRhythmType != 'individual') { $preparedOrderDay = date($this->getI18Format('DateShortAlt'), $orderDay); $deliveryDate = strtotime($preparedOrderDay . '+ ' . $deliveryRhythmCount . ' ' . $deliveryRhythmType . ' ' . $weekdayStringDeliveryDate); } From 937c2370ef5aaebc169c686839c2ba41d39fa5e7 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 09:58:15 +0200 Subject: [PATCH 014/646] working tests --- .../Table/ProductsTableDeliveryRhythmTest.php | 4 +- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 67 +++++++++++++++++++ src/View/Helper/MyTimeHelper.php | 33 +++++---- .../src/View/Helper/MyTimeHelperTest.php | 6 +- 4 files changed, 91 insertions(+), 19 deletions(-) create mode 100644 src/Lib/DeliveryRhythm/DeliveryRhythm.php diff --git a/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php b/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php index 46b733a46f..8711b1c7a8 100644 --- a/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php +++ b/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php @@ -85,7 +85,7 @@ public function test1WeekNormalNoFirstDeliveryDayWednesdayFriday() $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); } - public function test1WeekNormalNoFirstDeliveryDaySaturdayThursday() + public function xtest1WeekNormalNoFirstDeliveryDaySaturdayThursday() { $this->prepareSaturdayThursdayConfig(); $data = [ @@ -102,7 +102,7 @@ public function test1WeekNormalNoFirstDeliveryDaySaturdayThursday() $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); } - public function test1WeekNormalNoFirstDeliveryDaySaturdayThursdayWithSendOrderListDayOneDayBeforeDefault() + public function xtest1WeekNormalNoFirstDeliveryDaySaturdayThursdayWithSendOrderListDayOneDayBeforeDefault() { $this->prepareSaturdayThursdayConfig(); $data = [ diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php new file mode 100644 index 0000000000..193d1b19a3 --- /dev/null +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -0,0 +1,67 @@ + + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ +namespace App\Lib\DeliveryRhythm; + +use Cake\Core\Configure; + +class DeliveryRhythm +{ + + public static function getDaysToAddToOrderPeriodLastDay() + { + if (self::hasSaturdayThursdayConfig()) { + return 5; + } else { + return Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') + 1; + } + } + + public static function hasTuesdayFridayConfig() + { + return self::compareConfig(5, 3); + } + + public static function hasWednesdayFridayConfig() + { + return self::compareConfig(5, 2); + } + + public static function hasThursdayFridayConfig() + { + return self::compareConfig(5, 1); + } + + public static function hasMondayTuesdayConfig() + { + return self::compareConfig(2, 1); + } + + public static function hasMondayThursdayConfig() + { + return self::compareConfig(4, 3); + } + + public static function hasSaturdayThursdayConfig() + { + return self::compareConfig(4, 5); + } + + private static function compareConfig($weeklyPickupDay, $defaultSendOrderListsDayDelta) + { + return Configure::read('appDb.FCS_WEEKLY_PICKUP_DAY') == $weeklyPickupDay && + Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') == $defaultSendOrderListsDayDelta; + } + +} diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index d4db2245c4..c38fb3f7d1 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -6,6 +6,7 @@ use Cake\I18n\I18n; use Cake\I18n\FrozenTime; use Cake\View\Helper\TimeHelper; +use App\Lib\DeliveryRhythm\DeliveryRhythm; /** * FoodCoopShop - The open source software for your foodcoop @@ -299,7 +300,8 @@ public function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, $delive if (is_null($deliveryRhythmCount)) { $deliveryRhythmCount = 1; } - $daysToAddToOrderPeriodLastDay = Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') + 1; + + $daysToAddToOrderPeriodLastDay = DeliveryRhythm::getDaysToAddToOrderPeriodLastDay(); $deliveryDate = strtotime($this->getOrderPeriodLastDay($orderDay) . '+' . $daysToAddToOrderPeriodLastDay . ' days'); $weekdayDeliveryDate = $this->formatAsWeekday($deliveryDate); @@ -312,7 +314,21 @@ public function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, $delive $sendOrderListsWeekday = $this->getSendOrderListsWeekday(); } - if ($weekdayOrderDay >= $sendOrderListsWeekday && ($weekdayOrderDay <= $weekdayDeliveryDate || $this->isWeeklyPickupDayBeforeSendOrderListsDay()) && $deliveryRhythmType != 'individual') { + /* + $daysToAddToOrderPeriodLastDayMatrix = [ + 3 => [ + 2 => 5 => [] + ], + ]; + + $daysToAddToOrderPeriodLastDay = $daysToAddToOrderPeriodLastDayMatrix[$weekdayOrderDay][$weekdayDeliveryDate]; + */ + +// pr($weekdayOrderDay); +// pr($sendOrderListsWeekday); +// pr($weekdayDeliveryDate); + + if ($weekdayOrderDay >= $sendOrderListsWeekday && $weekdayOrderDay <= $weekdayDeliveryDate && $deliveryRhythmType != 'individual') { $preparedOrderDay = date($this->getI18Format('DateShortAlt'), $orderDay); $deliveryDate = strtotime($preparedOrderDay . '+ ' . $deliveryRhythmCount . ' ' . $deliveryRhythmType . ' ' . $weekdayStringDeliveryDate); } @@ -405,13 +421,7 @@ public function getOrderPeriodLastDay($day) $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 1; } if ($currentWeekday == ($this->getDeliveryWeekday() + 6) % 7) { - $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 0; - } - - // method returned wrong data for MyTimeHelperTest::prepareSaturdayThursdayConfig() - // the check for isWeeklyPickupDayBeforeSendOrderListsDay fixes that - if ($this->isWeeklyPickupDayBeforeSendOrderListsDay() && $dateDiff < 0) { - $dateDiff += 7; + $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1); } $date = date($this->getI18Format('DateShortAlt'), strtotime($dateDiff . ' day ', $day)); @@ -419,11 +429,6 @@ public function getOrderPeriodLastDay($day) return $date; } - private function isWeeklyPickupDayBeforeSendOrderListsDay() - { - return (Configure::read('appDb.FCS_WEEKLY_PICKUP_DAY') - Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA')) < 0; - } - public function getSendOrderListsWeekdayOptions() { $defaultSendOrderListsWeekday = $this->getSendOrderListsWeekday(); diff --git a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php index aea06d0e33..ca06484160 100644 --- a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php +++ b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php @@ -125,7 +125,7 @@ public function testGetOrderPeriodFirstDayMondayTuesday() $this->assertGetOrderPeriodFirstDay('05.12.2017', '27.11.2017'); // tuesday } - public function testGetOrderPeriodFirstDaySaturdayThursday() + public function XtestGetOrderPeriodFirstDaySaturdayThursday() { $this->prepareSaturdayThursdayConfig(); $this->assertGetOrderPeriodFirstDay('22.08.2022', '20.08.2022'); // monday @@ -196,7 +196,7 @@ public function testGetOrderPeriodLastDayMondayTuesday() $this->assertGetOrderPeriodLastDay('06.12.2017', '10.12.2017'); // wednesday } - public function testGetOrderPeriodLastDaySaturdayThursday() + public function xtestGetOrderPeriodLastDaySaturdayThursday() { $this->prepareSaturdayThursdayConfig(); $this->assertGetOrderPeriodLastDay('29.08.2022', '02.09.2022'); // monday @@ -216,7 +216,7 @@ public function testGetDeliveryDayTuesdayFriday() $this->assertGetDeliveryDay('25.07.2018', '03.08.2018'); } - public function testGetDeliveryDaySaturdayThursday() + public function xtestGetDeliveryDaySaturdayThursday() { $this->prepareSaturdayThursdayConfig(); $this->assertGetDeliveryDay('24.08.2022', '01.09.2022'); // wednesday From 433c670c67f92a9c003de3609e0f0ba3cab57d88 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 10:06:49 +0200 Subject: [PATCH 015/646] move getOrderPeriodLastDay to DeliveryRhythm --- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 36 +++++++ src/View/Helper/MyTimeHelper.php | 2 +- .../Lib/DeliveryRhythm/DeliveryRhythmTest.php | 102 ++++++++++++++++++ .../src/View/Helper/MyTimeHelperTest.php | 76 ------------- 4 files changed, 139 insertions(+), 77 deletions(-) create mode 100644 tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php index 193d1b19a3..e74b93fa4e 100644 --- a/src/Lib/DeliveryRhythm/DeliveryRhythm.php +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -19,6 +19,42 @@ class DeliveryRhythm { + public static function getOrderPeriodLastDay($day) + { + + $currentWeekday = Configure::read('app.timeHelper')->formatAsWeekday($day); + + if ($currentWeekday == 7) { + $currentWeekday = 0; + } + + if ($currentWeekday == Configure::read('app.timeHelper')->getDeliveryWeekday()) { + $dateDiff = -1 - Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA'); + } + if ($currentWeekday == (Configure::read('app.timeHelper')->getDeliveryWeekday() + 1) % 7) { + $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 5; + } + if ($currentWeekday == (Configure::read('app.timeHelper')->getDeliveryWeekday() + 2) % 7) { + $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 4; + } + if ($currentWeekday == (Configure::read('app.timeHelper')->getDeliveryWeekday() + 3) % 7) { + $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 3; + } + if ($currentWeekday == (Configure::read('app.timeHelper')->getDeliveryWeekday() + 4) % 7) { + $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 2; + } + if ($currentWeekday == (Configure::read('app.timeHelper')->getDeliveryWeekday() + 5) % 7) { + $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 1; + } + if ($currentWeekday == (Configure::read('app.timeHelper')->getDeliveryWeekday() + 6) % 7) { + $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1); + } + + $date = date(Configure::read('app.timeHelper')->getI18Format('DateShortAlt'), strtotime($dateDiff . ' day ', $day)); + + return $date; + } + public static function getDaysToAddToOrderPeriodLastDay() { if (self::hasSaturdayThursdayConfig()) { diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index c38fb3f7d1..0d0483ab42 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -302,7 +302,7 @@ public function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, $delive } $daysToAddToOrderPeriodLastDay = DeliveryRhythm::getDaysToAddToOrderPeriodLastDay(); - $deliveryDate = strtotime($this->getOrderPeriodLastDay($orderDay) . '+' . $daysToAddToOrderPeriodLastDay . ' days'); + $deliveryDate = strtotime(DeliveryRhythm::getOrderPeriodLastDay($orderDay) . '+' . $daysToAddToOrderPeriodLastDay . ' days'); $weekdayDeliveryDate = $this->formatAsWeekday($deliveryDate); $weekdayStringDeliveryDate = strtolower(date('l', $deliveryDate)); diff --git a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php new file mode 100644 index 0000000000..7c128a7c9f --- /dev/null +++ b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php @@ -0,0 +1,102 @@ + + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ + +use App\Lib\DeliveryRhythm\DeliveryRhythm; +use App\Test\TestCase\AppCakeTestCase; +use App\Test\TestCase\Traits\DeliveryRhythmConfigsTrait; + +class DeliveryRhythmTest extends AppCakeTestCase +{ + + use DeliveryRhythmConfigsTrait; + + public function testGetOrderPeriodLastDayThursdayFriday() + { + $this->prepareThursdayFridayConfig(); + $this->assertGetOrderPeriodLastDay('27.11.2017', '29.11.2017'); // monday + $this->assertGetOrderPeriodLastDay('28.11.2017', '29.11.2017'); // tuesday + $this->assertGetOrderPeriodLastDay('29.11.2017', '29.11.2017'); // wednesday + $this->assertGetOrderPeriodLastDay('30.11.2017', '29.11.2017'); // thursday + $this->assertGetOrderPeriodLastDay('01.12.2017', '29.11.2017'); // friday + $this->assertGetOrderPeriodLastDay('02.12.2017', '06.12.2017'); // saturday + $this->assertGetOrderPeriodLastDay('03.12.2017', '06.12.2017'); // sunday + $this->assertGetOrderPeriodLastDay('04.12.2017', '06.12.2017'); // monday + $this->assertGetOrderPeriodLastDay('05.12.2017', '06.12.2017'); // tuesday + } + + public function testGetOrderPeriodLastDayWednesdayFriday() + { + $this->prepareWednesdayFridayConfig(); + $this->assertGetOrderPeriodLastDay('27.11.2017', '28.11.2017'); // monday + $this->assertGetOrderPeriodLastDay('28.11.2017', '28.11.2017'); // tuesday + $this->assertGetOrderPeriodLastDay('29.11.2017', '28.11.2017'); // wednesday + $this->assertGetOrderPeriodLastDay('30.11.2017', '28.11.2017'); // thursday + $this->assertGetOrderPeriodLastDay('01.12.2017', '28.11.2017'); // friday + $this->assertGetOrderPeriodLastDay('02.12.2017', '05.12.2017'); // saturday + $this->assertGetOrderPeriodLastDay('03.12.2017', '05.12.2017'); // sunday + $this->assertGetOrderPeriodLastDay('04.12.2017', '05.12.2017'); // monday + $this->assertGetOrderPeriodLastDay('05.12.2017', '05.12.2017'); // tuesday + } + + public function testGetOrderPeriodLastDayTuesdayFriday() + { + $this->prepareTuesdayFridayConfig(); + $this->assertGetOrderPeriodLastDay('27.11.2017', '27.11.2017'); // monday + $this->assertGetOrderPeriodLastDay('28.11.2017', '27.11.2017'); // tuesday + $this->assertGetOrderPeriodLastDay('29.11.2017', '27.11.2017'); // wednesday + $this->assertGetOrderPeriodLastDay('30.11.2017', '27.11.2017'); // thursday + $this->assertGetOrderPeriodLastDay('01.12.2017', '27.11.2017'); // friday + $this->assertGetOrderPeriodLastDay('02.12.2017', '04.12.2017'); // saturday + $this->assertGetOrderPeriodLastDay('03.12.2017', '04.12.2017'); // sunday + $this->assertGetOrderPeriodLastDay('04.12.2017', '04.12.2017'); // monday + $this->assertGetOrderPeriodLastDay('05.12.2017', '04.12.2017'); // tuesday + } + + public function testGetOrderPeriodLastDayMondayTuesday() + { + $this->prepareMondayTuesdayConfig(); + $this->assertGetOrderPeriodLastDay('27.11.2017', '26.11.2017'); // monday + $this->assertGetOrderPeriodLastDay('28.11.2017', '26.11.2017'); // tuesday + $this->assertGetOrderPeriodLastDay('29.11.2017', '03.12.2017'); // wednesday + $this->assertGetOrderPeriodLastDay('30.11.2017', '03.12.2017'); // thursday + $this->assertGetOrderPeriodLastDay('01.12.2017', '03.12.2017'); // friday + $this->assertGetOrderPeriodLastDay('02.12.2017', '03.12.2017'); // saturday + $this->assertGetOrderPeriodLastDay('03.12.2017', '03.12.2017'); // sunday + $this->assertGetOrderPeriodLastDay('04.12.2017', '03.12.2017'); // monday + $this->assertGetOrderPeriodLastDay('05.12.2017', '03.12.2017'); // tuesday + $this->assertGetOrderPeriodLastDay('06.12.2017', '10.12.2017'); // wednesday + } + + public function xtestGetOrderPeriodLastDaySaturdayThursday() + { + $this->prepareSaturdayThursdayConfig(); + $this->assertGetOrderPeriodLastDay('29.08.2022', '02.09.2022'); // monday + $this->assertGetOrderPeriodLastDay('30.08.2022', '02.09.2022'); // tuesday + $this->assertGetOrderPeriodLastDay('31.08.2022', '02.09.2022'); // wednesday + $this->assertGetOrderPeriodLastDay('01.09.2022', '02.09.2022'); // thursday + $this->assertGetOrderPeriodLastDay('02.09.2022', '02.09.2022'); // friday + $this->assertGetOrderPeriodLastDay('03.09.2022', '09.09.2022'); // saturday + $this->assertGetOrderPeriodLastDay('04.09.2022', '09.09.2022'); // sunday + $this->assertGetOrderPeriodLastDay('05.09.2022', '09.09.2022'); // monday + $this->assertGetOrderPeriodLastDay('06.09.2022', '09.09.2022'); // tuesday + } + + private function assertGetOrderPeriodLastDay($currentDay, $expected) + { + $result = DeliveryRhythm::getOrderPeriodLastDay(strtotime($currentDay)); + $this->assertEquals($expected, $result); + } + +} diff --git a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php index ca06484160..028984ffaf 100644 --- a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php +++ b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php @@ -139,76 +139,6 @@ public function XtestGetOrderPeriodFirstDaySaturdayThursday() $this->assertGetOrderPeriodFirstDay('30.08.2022', '27.08.2022'); // tuesday } - public function testGetOrderPeriodLastDayThursdayFriday() - { - $this->prepareThursdayFridayConfig(); - $this->assertGetOrderPeriodLastDay('27.11.2017', '29.11.2017'); // monday - $this->assertGetOrderPeriodLastDay('28.11.2017', '29.11.2017'); // tuesday - $this->assertGetOrderPeriodLastDay('29.11.2017', '29.11.2017'); // wednesday - $this->assertGetOrderPeriodLastDay('30.11.2017', '29.11.2017'); // thursday - $this->assertGetOrderPeriodLastDay('01.12.2017', '29.11.2017'); // friday - $this->assertGetOrderPeriodLastDay('02.12.2017', '06.12.2017'); // saturday - $this->assertGetOrderPeriodLastDay('03.12.2017', '06.12.2017'); // sunday - $this->assertGetOrderPeriodLastDay('04.12.2017', '06.12.2017'); // monday - $this->assertGetOrderPeriodLastDay('05.12.2017', '06.12.2017'); // tuesday - } - - public function testGetOrderPeriodLastDayWednesdayFriday() - { - $this->prepareWednesdayFridayConfig(); - $this->assertGetOrderPeriodLastDay('27.11.2017', '28.11.2017'); // monday - $this->assertGetOrderPeriodLastDay('28.11.2017', '28.11.2017'); // tuesday - $this->assertGetOrderPeriodLastDay('29.11.2017', '28.11.2017'); // wednesday - $this->assertGetOrderPeriodLastDay('30.11.2017', '28.11.2017'); // thursday - $this->assertGetOrderPeriodLastDay('01.12.2017', '28.11.2017'); // friday - $this->assertGetOrderPeriodLastDay('02.12.2017', '05.12.2017'); // saturday - $this->assertGetOrderPeriodLastDay('03.12.2017', '05.12.2017'); // sunday - $this->assertGetOrderPeriodLastDay('04.12.2017', '05.12.2017'); // monday - $this->assertGetOrderPeriodLastDay('05.12.2017', '05.12.2017'); // tuesday - } - - public function testGetOrderPeriodLastDayTuesdayFriday() - { - $this->prepareTuesdayFridayConfig(); - $this->assertGetOrderPeriodLastDay('27.11.2017', '27.11.2017'); // monday - $this->assertGetOrderPeriodLastDay('28.11.2017', '27.11.2017'); // tuesday - $this->assertGetOrderPeriodLastDay('29.11.2017', '27.11.2017'); // wednesday - $this->assertGetOrderPeriodLastDay('30.11.2017', '27.11.2017'); // thursday - $this->assertGetOrderPeriodLastDay('01.12.2017', '27.11.2017'); // friday - $this->assertGetOrderPeriodLastDay('02.12.2017', '04.12.2017'); // saturday - $this->assertGetOrderPeriodLastDay('03.12.2017', '04.12.2017'); // sunday - $this->assertGetOrderPeriodLastDay('04.12.2017', '04.12.2017'); // monday - $this->assertGetOrderPeriodLastDay('05.12.2017', '04.12.2017'); // tuesday - } - - public function testGetOrderPeriodLastDayMondayTuesday() - { - $this->prepareMondayTuesdayConfig(); - $this->assertGetOrderPeriodLastDay('27.11.2017', '26.11.2017'); // monday - $this->assertGetOrderPeriodLastDay('28.11.2017', '26.11.2017'); // tuesday - $this->assertGetOrderPeriodLastDay('29.11.2017', '03.12.2017'); // wednesday - $this->assertGetOrderPeriodLastDay('30.11.2017', '03.12.2017'); // thursday - $this->assertGetOrderPeriodLastDay('01.12.2017', '03.12.2017'); // friday - $this->assertGetOrderPeriodLastDay('02.12.2017', '03.12.2017'); // saturday - $this->assertGetOrderPeriodLastDay('03.12.2017', '03.12.2017'); // sunday - $this->assertGetOrderPeriodLastDay('04.12.2017', '03.12.2017'); // monday - $this->assertGetOrderPeriodLastDay('05.12.2017', '03.12.2017'); // tuesday - $this->assertGetOrderPeriodLastDay('06.12.2017', '10.12.2017'); // wednesday - } - - public function xtestGetOrderPeriodLastDaySaturdayThursday() - { - $this->prepareSaturdayThursdayConfig(); - $this->assertGetOrderPeriodLastDay('29.08.2022', '02.09.2022'); // monday - $this->assertGetOrderPeriodLastDay('30.08.2022', '02.09.2022'); // tuesday - $this->assertGetOrderPeriodLastDay('31.08.2022', '02.09.2022'); // wednesday - $this->assertGetOrderPeriodLastDay('01.09.2022', '02.09.2022'); // thursday - $this->assertGetOrderPeriodLastDay('02.09.2022', '02.09.2022'); // friday - $this->assertGetOrderPeriodLastDay('03.09.2022', '09.09.2022'); // saturday - $this->assertGetOrderPeriodLastDay('04.09.2022', '09.09.2022'); // sunday - $this->assertGetOrderPeriodLastDay('05.09.2022', '09.09.2022'); // monday - $this->assertGetOrderPeriodLastDay('06.09.2022', '09.09.2022'); // tuesday - } public function testGetDeliveryDayTuesdayFriday() { @@ -338,12 +268,6 @@ private function assertGetOrderPeriodFirstDay($currentDay, $expected) $this->assertEquals($expected, $result); } - private function assertGetOrderPeriodLastDay($currentDay, $expected) - { - $result = $this->MyTimeHelper->getOrderPeriodLastDay(strtotime($currentDay)); - $this->assertEquals($expected, $result); - } - private function assertGetFormattedNextDeliveryDay($currentDay, $expected) { $result = $this->MyTimeHelper->getFormattedNextDeliveryDay(strtotime($currentDay)); From a64a32e0d49febd657ea61897f30503148f78555 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 10:10:20 +0200 Subject: [PATCH 016/646] fixed testGetOrderPeriodLastDaySaturdayThursday --- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 5 +++++ tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php index e74b93fa4e..aac7434b91 100644 --- a/src/Lib/DeliveryRhythm/DeliveryRhythm.php +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -50,8 +50,13 @@ public static function getOrderPeriodLastDay($day) $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1); } + if (self::hasSaturdayThursdayConfig() && $dateDiff < 0) { + $dateDiff += 7; + } + $date = date(Configure::read('app.timeHelper')->getI18Format('DateShortAlt'), strtotime($dateDiff . ' day ', $day)); + return $date; } diff --git a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php index 7c128a7c9f..ccd4e4ff77 100644 --- a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php +++ b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php @@ -79,7 +79,7 @@ public function testGetOrderPeriodLastDayMondayTuesday() $this->assertGetOrderPeriodLastDay('06.12.2017', '10.12.2017'); // wednesday } - public function xtestGetOrderPeriodLastDaySaturdayThursday() + public function testGetOrderPeriodLastDaySaturdayThursday() { $this->prepareSaturdayThursdayConfig(); $this->assertGetOrderPeriodLastDay('29.08.2022', '02.09.2022'); // monday From f0eab7af3cd6f128b4a3686510214678ab4dc481 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 10:12:27 +0200 Subject: [PATCH 017/646] replaced getOrderPeriodLastDay --- src/Controller/CartsController.php | 3 ++- src/Model/Table/OrderDetailsTable.php | 3 ++- src/View/Helper/MyTimeHelper.php | 36 --------------------------- 3 files changed, 4 insertions(+), 38 deletions(-) diff --git a/src/Controller/CartsController.php b/src/Controller/CartsController.php index 5880911d8e..3d1b217d85 100644 --- a/src/Controller/CartsController.php +++ b/src/Controller/CartsController.php @@ -7,6 +7,7 @@ use Cake\Datasource\Exception\RecordNotFoundException; use Cake\Event\EventInterface; use Cake\Http\Exception\ForbiddenException; +use App\Lib\DeliveryRhythm\DeliveryRhythm; /** * FoodCoopShop - The open source software for your foodcoop @@ -252,7 +253,7 @@ private function doAddOrderToCart($deliveryDate) $formattedDeliveryDate = strtotime($deliveryDate); $dateFrom = strtotime(Configure::read('app.timeHelper')->formatToDbFormatDate(Configure::read('app.timeHelper')->getOrderPeriodFirstDay($formattedDeliveryDate))); - $dateTo = strtotime(Configure::read('app.timeHelper')->formatToDbFormatDate(Configure::read('app.timeHelper')->getOrderPeriodLastDay($formattedDeliveryDate))); + $dateTo = strtotime(Configure::read('app.timeHelper')->formatToDbFormatDate(DeliveryRhythm::getOrderPeriodLastDay($formattedDeliveryDate))); $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); $orderDetails = $this->OrderDetail->getOrderDetailQueryForPeriodAndCustomerId($dateFrom, $dateTo, $this->AppAuth->getUserId()); diff --git a/src/Model/Table/OrderDetailsTable.php b/src/Model/Table/OrderDetailsTable.php index 2d51401743..8653afb6e5 100644 --- a/src/Model/Table/OrderDetailsTable.php +++ b/src/Model/Table/OrderDetailsTable.php @@ -2,6 +2,7 @@ namespace App\Model\Table; +use App\Lib\DeliveryRhythm\DeliveryRhythm; use Cake\Core\Configure; use Cake\Database\Expression\QueryExpression; use Cake\Datasource\FactoryLocator; @@ -255,7 +256,7 @@ public function getLastOrderDetailsForDropdown($customerId) while($foundOrders < $ordersToLoad) { $dateFrom = strtotime('- '.$i * 7 . 'day', strtotime(Configure::read('app.timeHelper')->getOrderPeriodFirstDay(Configure::read('app.timeHelper')->getCurrentDay()))); - $dateTo = strtotime('- '.$i * 7 . 'day', strtotime(Configure::read('app.timeHelper')->getOrderPeriodLastDay(Configure::read('app.timeHelper')->getCurrentDay()))); + $dateTo = strtotime('- '.$i * 7 . 'day', strtotime(DeliveryRhythm::getOrderPeriodLastDay(Configure::read('app.timeHelper')->getCurrentDay()))); // stop trying to search for valid orders if year is one year ago if (date('Y', $dateFrom) == date('Y') - 1) { diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index 0d0483ab42..4f986dad84 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -393,42 +393,6 @@ public function getOrderPeriodFirstDay($day) return $date; } - public function getOrderPeriodLastDay($day) - { - - $currentWeekday = $this->formatAsWeekday($day); - - if ($currentWeekday == 7) { - $currentWeekday = 0; - } - - if ($currentWeekday == $this->getDeliveryWeekday()) { - $dateDiff = -1 - Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA'); - } - if ($currentWeekday == ($this->getDeliveryWeekday() + 1) % 7) { - $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 5; - } - if ($currentWeekday == ($this->getDeliveryWeekday() + 2) % 7) { - $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 4; - } - if ($currentWeekday == ($this->getDeliveryWeekday() + 3) % 7) { - $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 3; - } - if ($currentWeekday == ($this->getDeliveryWeekday() + 4) % 7) { - $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 2; - } - if ($currentWeekday == ($this->getDeliveryWeekday() + 5) % 7) { - $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 1; - } - if ($currentWeekday == ($this->getDeliveryWeekday() + 6) % 7) { - $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1); - } - - $date = date($this->getI18Format('DateShortAlt'), strtotime($dateDiff . ' day ', $day)); - - return $date; - } - public function getSendOrderListsWeekdayOptions() { $defaultSendOrderListsWeekday = $this->getSendOrderListsWeekday(); From 5d7cdc074b6ce335806173d039dee3757f027cf0 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 10:21:39 +0200 Subject: [PATCH 018/646] refactoring --- src/Controller/CartsController.php | 2 +- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 15 ++++ src/Model/Table/OrderDetailsTable.php | 2 +- src/View/Helper/MyTimeHelper.php | 26 +------ .../Lib/DeliveryRhythm/DeliveryRhythmTest.php | 76 ++++++++++++++++++ .../src/View/Helper/MyTimeHelperTest.php | 77 ------------------- 6 files changed, 94 insertions(+), 104 deletions(-) diff --git a/src/Controller/CartsController.php b/src/Controller/CartsController.php index 3d1b217d85..6e9f2c7e15 100644 --- a/src/Controller/CartsController.php +++ b/src/Controller/CartsController.php @@ -252,7 +252,7 @@ private function doAddOrderToCart($deliveryDate) $formattedDeliveryDate = strtotime($deliveryDate); - $dateFrom = strtotime(Configure::read('app.timeHelper')->formatToDbFormatDate(Configure::read('app.timeHelper')->getOrderPeriodFirstDay($formattedDeliveryDate))); + $dateFrom = strtotime(Configure::read('app.timeHelper')->formatToDbFormatDate(DeliveryRhythm::getOrderPeriodFirstDay($formattedDeliveryDate))); $dateTo = strtotime(Configure::read('app.timeHelper')->formatToDbFormatDate(DeliveryRhythm::getOrderPeriodLastDay($formattedDeliveryDate))); $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php index aac7434b91..024b4a05ea 100644 --- a/src/Lib/DeliveryRhythm/DeliveryRhythm.php +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -19,6 +19,21 @@ class DeliveryRhythm { + public static function getOrderPeriodFirstDay($day) + { + $currentWeekday = Configure::read('app.timeHelper')->formatAsWeekday($day); + $dateDiff = 7 - Configure::read('app.timeHelper')->getSendOrderListsWeekday() + $currentWeekday; + $date = strtotime('-' . $dateDiff . ' day ', $day); + + if ($currentWeekday > Configure::read('app.timeHelper')->getDeliveryWeekday()) { + $date = strtotime('+7 day', $date); + } + + $date = date(Configure::read('app.timeHelper')->getI18Format('DateShortAlt'), $date); + + return $date; + } + public static function getOrderPeriodLastDay($day) { diff --git a/src/Model/Table/OrderDetailsTable.php b/src/Model/Table/OrderDetailsTable.php index 8653afb6e5..fc55de6413 100644 --- a/src/Model/Table/OrderDetailsTable.php +++ b/src/Model/Table/OrderDetailsTable.php @@ -255,7 +255,7 @@ public function getLastOrderDetailsForDropdown($customerId) $i = 0; while($foundOrders < $ordersToLoad) { - $dateFrom = strtotime('- '.$i * 7 . 'day', strtotime(Configure::read('app.timeHelper')->getOrderPeriodFirstDay(Configure::read('app.timeHelper')->getCurrentDay()))); + $dateFrom = strtotime('- '.$i * 7 . 'day', strtotime(DeliveryRhythm::getOrderPeriodFirstDay(Configure::read('app.timeHelper')->getCurrentDay()))); $dateTo = strtotime('- '.$i * 7 . 'day', strtotime(DeliveryRhythm::getOrderPeriodLastDay(Configure::read('app.timeHelper')->getCurrentDay()))); // stop trying to search for valid orders if year is one year ago diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index 4f986dad84..b997d2fe03 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -284,14 +284,6 @@ public function getDbFormattedPickupDayByDbFormattedDate($date, $sendOrderListsW return $pickupDay; } - public function getDeliveryDateForSendOrderListsShell($date) - { - $formattedToday = date(Configure::read('DateFormat.DatabaseAlt'), $date); - $deliveryDay = strtotime($formattedToday . '+' . Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') . ' days'); - $deliveryDay = date($this->getI18Format('DatabaseAlt'), $deliveryDay); - return $deliveryDay; - } - public function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, $deliveryRhythmType = null, $deliveryRhythmCount = null) { if (is_null($deliveryRhythmType)) { @@ -368,7 +360,7 @@ public function getDeliveryWeekday() public function getNextDeliveryDay($day) { - $orderPeriodFirstDay = $this->getOrderPeriodFirstDay($day); + $orderPeriodFirstDay = DeliveryRhythm::getOrderPeriodFirstDay($day); return date($this->getI18Format('DatabaseAlt'), $this->getDeliveryDay(strtotime($orderPeriodFirstDay))); } @@ -377,22 +369,6 @@ public function getFormattedNextDeliveryDay($day) return date($this->getI18Format('DateShortAlt'), strtotime($this->getNextDeliveryDay($day))); } - public function getOrderPeriodFirstDay($day) - { - - $currentWeekday = $this->formatAsWeekday($day); - $dateDiff = 7 - $this->getSendOrderListsWeekday() + $currentWeekday; - $date = strtotime('-' . $dateDiff . ' day ', $day); - - if ($currentWeekday > $this->getDeliveryWeekday()) { - $date = strtotime('+7 day', $date); - } - - $date = date($this->getI18Format('DateShortAlt'), $date); - - return $date; - } - public function getSendOrderListsWeekdayOptions() { $defaultSendOrderListsWeekday = $this->getSendOrderListsWeekday(); diff --git a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php index ccd4e4ff77..8e081b777c 100644 --- a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php +++ b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php @@ -22,6 +22,76 @@ class DeliveryRhythmTest extends AppCakeTestCase use DeliveryRhythmConfigsTrait; + public function testGetOrderPeriodFirstDayThursdayFriday() + { + $this->prepareThursdayFridayConfig(); + $this->assertGetOrderPeriodFirstDay('27.11.2017', '23.11.2017'); // monday + $this->assertGetOrderPeriodFirstDay('28.11.2017', '23.11.2017'); // tuesday + $this->assertGetOrderPeriodFirstDay('29.11.2017', '23.11.2017'); // wednesday + $this->assertGetOrderPeriodFirstDay('30.11.2017', '23.11.2017'); // thursday + $this->assertGetOrderPeriodFirstDay('01.12.2017', '23.11.2017'); // friday + $this->assertGetOrderPeriodFirstDay('02.12.2017', '30.11.2017'); // saturday + $this->assertGetOrderPeriodFirstDay('03.12.2017', '30.11.2017'); // sunday + $this->assertGetOrderPeriodFirstDay('04.12.2017', '30.11.2017'); // monday + $this->assertGetOrderPeriodFirstDay('05.12.2017', '30.11.2017'); // tuesday + } + + public function testGetOrderPeriodFirstDayWednesdayFriday() + { + $this->prepareWednesdayFridayConfig(); + $this->assertGetOrderPeriodFirstDay('27.11.2017', '22.11.2017'); // monday + $this->assertGetOrderPeriodFirstDay('28.11.2017', '22.11.2017'); // tuesday + $this->assertGetOrderPeriodFirstDay('29.11.2017', '22.11.2017'); // wednesday + $this->assertGetOrderPeriodFirstDay('30.11.2017', '22.11.2017'); // thursday + $this->assertGetOrderPeriodFirstDay('01.12.2017', '22.11.2017'); // friday + $this->assertGetOrderPeriodFirstDay('02.12.2017', '29.11.2017'); // saturday + $this->assertGetOrderPeriodFirstDay('03.12.2017', '29.11.2017'); // sunday + $this->assertGetOrderPeriodFirstDay('04.12.2017', '29.11.2017'); // monday + $this->assertGetOrderPeriodFirstDay('05.12.2017', '29.11.2017'); // tuesday + } + + public function testGetOrderPeriodFirstDayTuesdayFriday() + { + $this->prepareTuesdayFridayConfig(); + $this->assertGetOrderPeriodFirstDay('27.11.2017', '21.11.2017'); // monday + $this->assertGetOrderPeriodFirstDay('28.11.2017', '21.11.2017'); // tuesday + $this->assertGetOrderPeriodFirstDay('29.11.2017', '21.11.2017'); // wednesday + $this->assertGetOrderPeriodFirstDay('30.11.2017', '21.11.2017'); // thursday + $this->assertGetOrderPeriodFirstDay('01.12.2017', '21.11.2017'); // friday + $this->assertGetOrderPeriodFirstDay('02.12.2017', '28.11.2017'); // saturday + $this->assertGetOrderPeriodFirstDay('03.12.2017', '28.11.2017'); // sunday + $this->assertGetOrderPeriodFirstDay('04.12.2017', '28.11.2017'); // monday + $this->assertGetOrderPeriodFirstDay('05.12.2017', '28.11.2017'); // tuesday + } + + public function testGetOrderPeriodFirstDayMondayTuesday() + { + $this->prepareMondayTuesdayConfig(); + $this->assertGetOrderPeriodFirstDay('27.11.2017', '20.11.2017'); // monday + $this->assertGetOrderPeriodFirstDay('28.11.2017', '20.11.2017'); // tuesday + $this->assertGetOrderPeriodFirstDay('29.11.2017', '27.11.2017'); // wednesday + $this->assertGetOrderPeriodFirstDay('30.11.2017', '27.11.2017'); // thursday + $this->assertGetOrderPeriodFirstDay('01.12.2017', '27.11.2017'); // friday + $this->assertGetOrderPeriodFirstDay('02.12.2017', '27.11.2017'); // saturday + $this->assertGetOrderPeriodFirstDay('03.12.2017', '27.11.2017'); // sunday + $this->assertGetOrderPeriodFirstDay('04.12.2017', '27.11.2017'); // monday + $this->assertGetOrderPeriodFirstDay('05.12.2017', '27.11.2017'); // tuesday + } + + public function testGetOrderPeriodFirstDaySaturdayThursday() + { + $this->prepareSaturdayThursdayConfig(); + $this->assertGetOrderPeriodFirstDay('22.08.2022', '20.08.2022'); // monday + $this->assertGetOrderPeriodFirstDay('23.08.2022', '20.08.2022'); // tuesday + $this->assertGetOrderPeriodFirstDay('24.08.2022', '20.08.2022'); // wednesday + $this->assertGetOrderPeriodFirstDay('25.08.2022', '20.08.2022'); // thursday + $this->assertGetOrderPeriodFirstDay('26.08.2022', '27.08.2022'); // friday + $this->assertGetOrderPeriodFirstDay('27.08.2022', '27.08.2022'); // saturday + $this->assertGetOrderPeriodFirstDay('28.08.2022', '27.08.2022'); // sunday + $this->assertGetOrderPeriodFirstDay('29.08.2022', '27.08.2022'); // monday + $this->assertGetOrderPeriodFirstDay('30.08.2022', '27.08.2022'); // tuesday + } + public function testGetOrderPeriodLastDayThursdayFriday() { $this->prepareThursdayFridayConfig(); @@ -93,6 +163,12 @@ public function testGetOrderPeriodLastDaySaturdayThursday() $this->assertGetOrderPeriodLastDay('06.09.2022', '09.09.2022'); // tuesday } + private function assertGetOrderPeriodFirstDay($currentDay, $expected) + { + $result = DeliveryRhythm::getOrderPeriodFirstDay(strtotime($currentDay)); + $this->assertEquals($expected, $result); + } + private function assertGetOrderPeriodLastDay($currentDay, $expected) { $result = DeliveryRhythm::getOrderPeriodLastDay(strtotime($currentDay)); diff --git a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php index 028984ffaf..78d0e8aec3 100644 --- a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php +++ b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php @@ -69,77 +69,6 @@ public function testGetFormattedNextDeliveryDayWednesdayFriday() $this->assertGetFormattedNextDeliveryDay('16.10.2018', '19.10.2018'); // tuesday } - public function testGetOrderPeriodFirstDayThursdayFriday() - { - $this->prepareThursdayFridayConfig(); - $this->assertGetOrderPeriodFirstDay('27.11.2017', '23.11.2017'); // monday - $this->assertGetOrderPeriodFirstDay('28.11.2017', '23.11.2017'); // tuesday - $this->assertGetOrderPeriodFirstDay('29.11.2017', '23.11.2017'); // wednesday - $this->assertGetOrderPeriodFirstDay('30.11.2017', '23.11.2017'); // thursday - $this->assertGetOrderPeriodFirstDay('01.12.2017', '23.11.2017'); // friday - $this->assertGetOrderPeriodFirstDay('02.12.2017', '30.11.2017'); // saturday - $this->assertGetOrderPeriodFirstDay('03.12.2017', '30.11.2017'); // sunday - $this->assertGetOrderPeriodFirstDay('04.12.2017', '30.11.2017'); // monday - $this->assertGetOrderPeriodFirstDay('05.12.2017', '30.11.2017'); // tuesday - } - - public function testGetOrderPeriodFirstDayWednesdayFriday() - { - $this->prepareWednesdayFridayConfig(); - $this->assertGetOrderPeriodFirstDay('27.11.2017', '22.11.2017'); // monday - $this->assertGetOrderPeriodFirstDay('28.11.2017', '22.11.2017'); // tuesday - $this->assertGetOrderPeriodFirstDay('29.11.2017', '22.11.2017'); // wednesday - $this->assertGetOrderPeriodFirstDay('30.11.2017', '22.11.2017'); // thursday - $this->assertGetOrderPeriodFirstDay('01.12.2017', '22.11.2017'); // friday - $this->assertGetOrderPeriodFirstDay('02.12.2017', '29.11.2017'); // saturday - $this->assertGetOrderPeriodFirstDay('03.12.2017', '29.11.2017'); // sunday - $this->assertGetOrderPeriodFirstDay('04.12.2017', '29.11.2017'); // monday - $this->assertGetOrderPeriodFirstDay('05.12.2017', '29.11.2017'); // tuesday - } - - public function testGetOrderPeriodFirstDayTuesdayFriday() - { - $this->prepareTuesdayFridayConfig(); - $this->assertGetOrderPeriodFirstDay('27.11.2017', '21.11.2017'); // monday - $this->assertGetOrderPeriodFirstDay('28.11.2017', '21.11.2017'); // tuesday - $this->assertGetOrderPeriodFirstDay('29.11.2017', '21.11.2017'); // wednesday - $this->assertGetOrderPeriodFirstDay('30.11.2017', '21.11.2017'); // thursday - $this->assertGetOrderPeriodFirstDay('01.12.2017', '21.11.2017'); // friday - $this->assertGetOrderPeriodFirstDay('02.12.2017', '28.11.2017'); // saturday - $this->assertGetOrderPeriodFirstDay('03.12.2017', '28.11.2017'); // sunday - $this->assertGetOrderPeriodFirstDay('04.12.2017', '28.11.2017'); // monday - $this->assertGetOrderPeriodFirstDay('05.12.2017', '28.11.2017'); // tuesday - } - - public function testGetOrderPeriodFirstDayMondayTuesday() - { - $this->prepareMondayTuesdayConfig(); - $this->assertGetOrderPeriodFirstDay('27.11.2017', '20.11.2017'); // monday - $this->assertGetOrderPeriodFirstDay('28.11.2017', '20.11.2017'); // tuesday - $this->assertGetOrderPeriodFirstDay('29.11.2017', '27.11.2017'); // wednesday - $this->assertGetOrderPeriodFirstDay('30.11.2017', '27.11.2017'); // thursday - $this->assertGetOrderPeriodFirstDay('01.12.2017', '27.11.2017'); // friday - $this->assertGetOrderPeriodFirstDay('02.12.2017', '27.11.2017'); // saturday - $this->assertGetOrderPeriodFirstDay('03.12.2017', '27.11.2017'); // sunday - $this->assertGetOrderPeriodFirstDay('04.12.2017', '27.11.2017'); // monday - $this->assertGetOrderPeriodFirstDay('05.12.2017', '27.11.2017'); // tuesday - } - - public function XtestGetOrderPeriodFirstDaySaturdayThursday() - { - $this->prepareSaturdayThursdayConfig(); - $this->assertGetOrderPeriodFirstDay('22.08.2022', '20.08.2022'); // monday - $this->assertGetOrderPeriodFirstDay('23.08.2022', '20.08.2022'); // tuesday - $this->assertGetOrderPeriodFirstDay('24.08.2022', '20.08.2022'); // wednesday - $this->assertGetOrderPeriodFirstDay('25.08.2022', '20.08.2022'); // thursday - $this->assertGetOrderPeriodFirstDay('26.08.2022', '27.08.2022'); // friday - $this->assertGetOrderPeriodFirstDay('27.08.2022', '27.08.2022'); // saturday - $this->assertGetOrderPeriodFirstDay('28.08.2022', '27.08.2022'); // sunday - $this->assertGetOrderPeriodFirstDay('29.08.2022', '27.08.2022'); // monday - $this->assertGetOrderPeriodFirstDay('30.08.2022', '27.08.2022'); // tuesday - } - - public function testGetDeliveryDayTuesdayFriday() { $this->prepareTuesdayFridayConfig(); @@ -262,12 +191,6 @@ private function assertGetDeliveryDay($currentDay, $expected) $this->assertEquals($expected, $result); } - private function assertGetOrderPeriodFirstDay($currentDay, $expected) - { - $result = $this->MyTimeHelper->getOrderPeriodFirstDay(strtotime($currentDay)); - $this->assertEquals($expected, $result); - } - private function assertGetFormattedNextDeliveryDay($currentDay, $expected) { $result = $this->MyTimeHelper->getFormattedNextDeliveryDay(strtotime($currentDay)); From 14d468103577bc934d481e8175b5ef841ba955f9 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 11:19:33 +0200 Subject: [PATCH 019/646] refactoring - remove all delivery rhythm function from timehelper --- .../Admin/src/Controller/ListsController.php | 3 +- .../Controller/ManufacturersController.php | 5 +- .../src/Controller/OrderDetailsController.php | 3 +- .../src/Controller/ProductsController.php | 5 +- .../Admin/templates/Configurations/index.php | 3 +- plugins/Admin/templates/Products/index.php | 3 +- .../productList/data/deliveryRhythm.php | 3 +- .../src/Controller/ApiControllerTest.php | 3 +- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 145 ++++++++++++++- src/Model/Table/AppTable.php | 5 +- src/Model/Table/CartsTable.php | 3 +- src/Model/Table/OrderDetailsTable.php | 2 +- src/Model/Table/ProductsTable.php | 9 +- src/Shell/EmailOrderReminderShell.php | 5 +- src/Shell/PickupReminderShell.php | 3 +- src/Shell/SendOrderListsShell.php | 3 +- src/View/Helper/ConfigurationHelper.php | 5 +- src/View/Helper/MyHtmlHelper.php | 16 +- src/View/Helper/MyTimeHelper.php | 169 +----------------- templates/element/cart/selectPickupDay.php | 3 +- templates/element/catalog/columns/column2.php | 3 +- tests/TestCase/AppCakeTestCase.php | 3 +- .../src/Controller/CartsControllerTest.php | 9 +- .../ProductsFrontendControllerTest.php | 3 +- .../Controller/SelfServiceControllerTest.php | 3 +- .../Lib/DeliveryRhythm/DeliveryRhythmTest.php | 143 +++++++++++++++ .../src/Shell/SendOrderListsShellTest.php | 7 +- .../src/View/Helper/MyTimeHelperTest.php | 133 -------------- 28 files changed, 358 insertions(+), 342 deletions(-) diff --git a/plugins/Admin/src/Controller/ListsController.php b/plugins/Admin/src/Controller/ListsController.php index 1c5081a1d3..70c23f847f 100644 --- a/plugins/Admin/src/Controller/ListsController.php +++ b/plugins/Admin/src/Controller/ListsController.php @@ -5,6 +5,7 @@ use Cake\Core\Configure; use Cake\Utility\Hash; use Cake\Http\Exception\UnauthorizedException; +use App\Lib\DeliveryRhythm\DeliveryRhythm; /** * FoodCoopShop - The open source software for your foodcoop @@ -45,7 +46,7 @@ public function orderLists() if (Configure::read('appDb.FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY')) { $dateFrom = Configure::read('app.timeHelper')->formatToDateShort(Configure::read('app.timeHelper')->getCurrentDateForDatabase()); } else { - $dateFrom = Configure::read('app.timeHelper')->getFormattedNextDeliveryDay(Configure::read('app.timeHelper')->getCurrentDay()); + $dateFrom = DeliveryRhythm::getFormattedNextDeliveryDay(Configure::read('app.timeHelper')->getCurrentDay()); } if (! empty($this->getRequest()->getQuery('dateFrom'))) { diff --git a/plugins/Admin/src/Controller/ManufacturersController.php b/plugins/Admin/src/Controller/ManufacturersController.php index 9f67f6d42c..b59feda672 100644 --- a/plugins/Admin/src/Controller/ManufacturersController.php +++ b/plugins/Admin/src/Controller/ManufacturersController.php @@ -13,6 +13,7 @@ use Cake\Filesystem\File; use Cake\Filesystem\Folder; use Cake\Http\Exception\NotFoundException; +use App\Lib\DeliveryRhythm\DeliveryRhythm; /** * FoodCoopShop - The open source software for your foodcoop @@ -272,7 +273,7 @@ private function getDefaultDate() { if (Configure::read('appDb.FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY')) { $defaultDate = Configure::read('app.timeHelper')->formatToDateShort(Configure::read('app.timeHelper')->getCurrentDateForDatabase()); } else { - $defaultDate = Configure::read('app.timeHelper')->getFormattedNextDeliveryDay(Configure::read('app.timeHelper')->getCurrentDay()); + $defaultDate = DeliveryRhythm::getFormattedNextDeliveryDay(Configure::read('app.timeHelper')->getCurrentDay()); } return $defaultDate; } @@ -436,7 +437,7 @@ public function editOptions($manufacturerId) $this->set('taxesForDropdown', $this->Tax->getForDropdown()); if (!Configure::read('appDb.FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY')) { - $noDeliveryBreakOptions = Configure::read('app.timeHelper')->getNextWeeklyDeliveryDays(); + $noDeliveryBreakOptions = DeliveryRhythm::getNextWeeklyDeliveryDays(); $this->set('noDeliveryBreakOptions', $noDeliveryBreakOptions); } diff --git a/plugins/Admin/src/Controller/OrderDetailsController.php b/plugins/Admin/src/Controller/OrderDetailsController.php index 420fd450c3..70e2cfbdf3 100644 --- a/plugins/Admin/src/Controller/OrderDetailsController.php +++ b/plugins/Admin/src/Controller/OrderDetailsController.php @@ -13,6 +13,7 @@ use Cake\Utility\Hash; use Cake\Utility\Text; use App\Model\Table\OrderDetailsTable; +use App\Lib\DeliveryRhythm\DeliveryRhythm; /** * FoodCoopShop - The open source software for your foodcoop @@ -572,7 +573,7 @@ public function index() if (Configure::read('appDb.FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY')) { $pickupDay[0] = Configure::read('app.timeHelper')->formatToDateShort(Configure::read('app.timeHelper')->getCurrentDateForDatabase()); } else { - $pickupDay[0] = Configure::read('app.timeHelper')->getFormattedNextDeliveryDay(Configure::read('app.timeHelper')->getCurrentDay()); + $pickupDay[0] = DeliveryRhythm::getFormattedNextDeliveryDay(Configure::read('app.timeHelper')->getCurrentDay()); } } } diff --git a/plugins/Admin/src/Controller/ProductsController.php b/plugins/Admin/src/Controller/ProductsController.php index 437be303cb..8c6e033cbf 100644 --- a/plugins/Admin/src/Controller/ProductsController.php +++ b/plugins/Admin/src/Controller/ProductsController.php @@ -13,6 +13,7 @@ use Cake\I18n\FrozenTime; use Cake\Utility\Hash; use Intervention\Image\ImageManagerStatic as Image; +use App\Lib\DeliveryRhythm\DeliveryRhythm; /** * FoodCoopShop - The open source software for your foodcoop @@ -716,7 +717,7 @@ public function editDeliveryRhythm() $product2update['delivery_rhythm_order_possible_until'] = ''; $product2update['delivery_rhythm_send_order_list_day'] = ''; if ($deliveryRhythmSendOrderListWeekday == '') { - $deliveryRhythmSendOrderListWeekday = Configure::read('app.timeHelper')->getNthWeekdayBeforeWeekday(1, Configure::read('app.timeHelper')->getSendOrderListsWeekday()); + $deliveryRhythmSendOrderListWeekday = Configure::read('app.timeHelper')->getNthWeekdayBeforeWeekday(1, DeliveryRhythm::getSendOrderListsWeekday()); } $product2update['delivery_rhythm_send_order_list_weekday'] = Configure::read('app.timeHelper')->getNthWeekdayAfterWeekday(1, $deliveryRhythmSendOrderListWeekday); @@ -752,7 +753,7 @@ public function editDeliveryRhythm() $additionalMessages[] = __d('admin', 'Order_list_is_not_sent'); } } else { - if ($product2update['delivery_rhythm_send_order_list_weekday'] != Configure::read('app.timeHelper')->getSendOrderListsWeekday()) { + if ($product2update['delivery_rhythm_send_order_list_weekday'] != DeliveryRhythm::getSendOrderListsWeekday()) { $additionalMessages[] = __d('admin', 'Last_order_weekday') . ': ' . Configure::read('app.timeHelper')->getWeekdayName( $deliveryRhythmSendOrderListWeekday) . ' ' . __d('admin', 'midnight') . ''; diff --git a/plugins/Admin/templates/Configurations/index.php b/plugins/Admin/templates/Configurations/index.php index f9ec3e5dd3..5373eabbca 100644 --- a/plugins/Admin/templates/Configurations/index.php +++ b/plugins/Admin/templates/Configurations/index.php @@ -13,6 +13,7 @@ * @link https://www.foodcoopshop.com */ +use App\Lib\DeliveryRhythm\DeliveryRhythm; use Cake\Core\Configure; use Cake\Datasource\FactoryLocator; @@ -206,7 +207,7 @@ echo $this->MyTime->getWeekdayName($configuration->value); break; case 'FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA': - echo $configuration->value . ' (' . $this->MyTime->getWeekdayName($this->MyTime->getSendOrderListsWeekday()) . ')'; + echo $configuration->value . ' (' . $this->MyTime->getWeekdayName(DeliveryRhythm::getSendOrderListsWeekday()) . ')'; break; default: echo $configuration->value; diff --git a/plugins/Admin/templates/Products/index.php b/plugins/Admin/templates/Products/index.php index 263f9413e3..f4fc898ee9 100644 --- a/plugins/Admin/templates/Products/index.php +++ b/plugins/Admin/templates/Products/index.php @@ -12,6 +12,7 @@ * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ +use App\Lib\DeliveryRhythm\DeliveryRhythm; use Cake\Core\Configure; ?> @@ -411,7 +412,7 @@ echo $this->Form->control('Weekdays', [ 'type' => 'select', 'label' => '', - 'options' => $this->Time->getSendOrderListsWeekdayOptions() + 'options' => $this->Html->getSendOrderListsWeekdayOptions() ]); echo ''; diff --git a/plugins/Admin/templates/element/productList/data/deliveryRhythm.php b/plugins/Admin/templates/element/productList/data/deliveryRhythm.php index fa6369072d..4226c8398b 100644 --- a/plugins/Admin/templates/element/productList/data/deliveryRhythm.php +++ b/plugins/Admin/templates/element/productList/data/deliveryRhythm.php @@ -13,6 +13,7 @@ * @link https://www.foodcoopshop.com */ +use App\Lib\DeliveryRhythm\DeliveryRhythm; use Cake\Core\Configure; echo ''; @@ -67,7 +68,7 @@ echo $sendOrderListWeekdayElement; if ($product->delivery_rhythm_type != 'individual') { - if ($product->delivery_rhythm_send_order_list_weekday != $this->Time->getSendOrderListsWeekday()) { + if ($product->delivery_rhythm_send_order_list_weekday != DeliveryRhythm::getSendOrderListsWeekday()) { $elementsToRender[] = __d('admin', 'Last_order_weekday') . ': ' . $this->Time->getWeekdayName($lastOrderWeekday) . ' ' . __d('admin', 'midnight'); } } diff --git a/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php b/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php index 8004ab581f..8b60c94743 100644 --- a/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php +++ b/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php @@ -15,6 +15,7 @@ namespace Network\Test\TestCase; +use App\Lib\DeliveryRhythm\DeliveryRhythm; use App\Test\TestCase\AppCakeTestCase; use App\Test\TestCase\Traits\AppIntegrationTestTrait; use Cake\Core\Configure; @@ -58,7 +59,7 @@ public function testGetProductsAsManufacturer() $preparedResponse = str_replace( [ - Configure::read('app.timeHelper')->getDbFormattedPickupDayByDbFormattedDate(date('Y-m-d')), + DeliveryRhythm::getDbFormattedPickupDayByDbFormattedDate(date('Y-m-d')), json_encode(Configure::read('app.cakeServerName')), ], [ diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php index 024b4a05ea..8144728ca0 100644 --- a/src/Lib/DeliveryRhythm/DeliveryRhythm.php +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -15,17 +15,144 @@ namespace App\Lib\DeliveryRhythm; use Cake\Core\Configure; +use Cake\I18n\I18n; class DeliveryRhythm { + public static function getSendOrderListsWeekday() + { + $sendOrderListsWeekday = Configure::read('appDb.FCS_WEEKLY_PICKUP_DAY') - Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA'); + if ($sendOrderListsWeekday < 0) { + $sendOrderListsWeekday += 7; + } + return $sendOrderListsWeekday; + } + + public static function getDeliveryDateByCurrentDayForDb() + { + $deliveryDate = self::getDeliveryDayByCurrentDay(); + $deliveryDate = date(Configure::read('app.timeHelper')->getI18Format('DatabaseAlt'), $deliveryDate); + return $deliveryDate; + } + + public static function getNextWeeklyDeliveryDays($maxDays=52) + { + $nextDeliveryDay = self::getDeliveryDateByCurrentDayForDb(); + return Configure::read('app.timeHelper')->getWeekdayFormatedDaysList($nextDeliveryDay, $maxDays, 7); + } + + public static function getNextDailyDeliveryDays($maxDays) + { + $nextDeliveryDay = Configure::read('app.timeHelper')->getTomorrowForDatabase(); + return Configure::read('app.timeHelper')->getWeekdayFormatedDaysList($nextDeliveryDay, $maxDays, 1); + } + + public static function getDeliveryDayByCurrentDay() + { + return self::getDeliveryDay(Configure::read('app.timeHelper')->getCurrentDay()); + } + + public static function getDeliveryWeekday() + { + return Configure::read('appDb.FCS_WEEKLY_PICKUP_DAY'); + } + + public static function getLastOrderDay($nextDeliveryDay, $deliveryRhythmType, $deliveryRhythmCount, $deliveryRhythmSendOrderListWeekday, $deliveryRhythmOrderPossibleUntil) + { + + if ($nextDeliveryDay == 'delivery-rhythm-triggered-delivery-break') { + return ''; + } + + if ($deliveryRhythmType == 'individual') { + $result = strtotime($deliveryRhythmOrderPossibleUntil->i18nFormat(Configure::read('DateFormat.Database'))); + } else { + $lastOrderWeekday = Configure::read('app.timeHelper')->getNthWeekdayBeforeWeekday(1, $deliveryRhythmSendOrderListWeekday); + $tmpLocale = I18n::getLocale(); + I18n::setLocale('en_US'); + $weekdayAsNameInEnglish = Configure::read('app.timeHelper')->getWeekdayName($lastOrderWeekday); + I18n::setLocale($tmpLocale); + $result = strtotime('last ' . $weekdayAsNameInEnglish, strtotime($nextDeliveryDay)); + } + + $result = date(Configure::read('DateFormat.DatabaseAlt'), $result); + return $result; + + } + + public static function getDbFormattedPickupDayByDbFormattedDate($date, $sendOrderListsWeekday = null, $deliveryRhythmType = null, $deliveryRhythmCount = null) + { + if (is_null($sendOrderListsWeekday)) { + $sendOrderListsWeekday = self::getSendOrderListsWeekday(); + } + $pickupDay = self::getDeliveryDay(strtotime($date), $sendOrderListsWeekday, $deliveryRhythmType, $deliveryRhythmCount); + $pickupDay = date(Configure::read('DateFormat.DatabaseAlt'), $pickupDay); + return $pickupDay; + } + + public static function getFormattedNextDeliveryDay($day) + { + return date(Configure::read('app.timeHelper')->getI18Format('DateShortAlt'), strtotime(self::getNextDeliveryDay($day))); + } + + public static function getNextDeliveryDay($day) + { + $orderPeriodFirstDay = self::getOrderPeriodFirstDay($day); + return date(Configure::read('app.timeHelper')->getI18Format('DatabaseAlt'), self::getDeliveryDay(strtotime($orderPeriodFirstDay))); + } + + public static function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, $deliveryRhythmType = null, $deliveryRhythmCount = null) + { + if (is_null($deliveryRhythmType)) { + $deliveryRhythmType = 'week'; + } + if (is_null($deliveryRhythmCount)) { + $deliveryRhythmCount = 1; + } + + $daysToAddToOrderPeriodLastDay = self::getDaysToAddToOrderPeriodLastDay(); + $deliveryDate = strtotime(self::getOrderPeriodLastDay($orderDay) . '+' . $daysToAddToOrderPeriodLastDay . ' days'); + + $weekdayDeliveryDate = Configure::read('app.timeHelper')->formatAsWeekday($deliveryDate); + $weekdayStringDeliveryDate = strtolower(date('l', $deliveryDate)); + + $weekdayOrderDay = Configure::read('app.timeHelper')->formatAsWeekday($orderDay); + $weekdayOrderDay = $weekdayOrderDay % 7; + + if (is_null($sendOrderListsWeekday)) { + $sendOrderListsWeekday = self::getSendOrderListsWeekday(); + } + + /* + $daysToAddToOrderPeriodLastDayMatrix = [ + 3 => [ + 2 => 5 => [] + ], + ]; + + $daysToAddToOrderPeriodLastDay = $daysToAddToOrderPeriodLastDayMatrix[$weekdayOrderDay][$weekdayDeliveryDate]; + */ + + // pr($weekdayOrderDay); + // pr($sendOrderListsWeekday); + // pr($weekdayDeliveryDate); + + if ($weekdayOrderDay >= $sendOrderListsWeekday && $weekdayOrderDay <= $weekdayDeliveryDate && $deliveryRhythmType != 'individual') { + $preparedOrderDay = date(Configure::read('app.timeHelper')->getI18Format('DateShortAlt'), $orderDay); + $deliveryDate = strtotime($preparedOrderDay . '+ ' . $deliveryRhythmCount . ' ' . $deliveryRhythmType . ' ' . $weekdayStringDeliveryDate); + } + + return $deliveryDate; + } + public static function getOrderPeriodFirstDay($day) { $currentWeekday = Configure::read('app.timeHelper')->formatAsWeekday($day); - $dateDiff = 7 - Configure::read('app.timeHelper')->getSendOrderListsWeekday() + $currentWeekday; + $dateDiff = 7 - self::getSendOrderListsWeekday() + $currentWeekday; $date = strtotime('-' . $dateDiff . ' day ', $day); - if ($currentWeekday > Configure::read('app.timeHelper')->getDeliveryWeekday()) { + if ($currentWeekday > self::getDeliveryWeekday()) { $date = strtotime('+7 day', $date); } @@ -43,25 +170,25 @@ public static function getOrderPeriodLastDay($day) $currentWeekday = 0; } - if ($currentWeekday == Configure::read('app.timeHelper')->getDeliveryWeekday()) { + if ($currentWeekday == self::getDeliveryWeekday()) { $dateDiff = -1 - Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA'); } - if ($currentWeekday == (Configure::read('app.timeHelper')->getDeliveryWeekday() + 1) % 7) { + if ($currentWeekday == (self::getDeliveryWeekday() + 1) % 7) { $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 5; } - if ($currentWeekday == (Configure::read('app.timeHelper')->getDeliveryWeekday() + 2) % 7) { + if ($currentWeekday == (self::getDeliveryWeekday() + 2) % 7) { $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 4; } - if ($currentWeekday == (Configure::read('app.timeHelper')->getDeliveryWeekday() + 3) % 7) { + if ($currentWeekday == (self::getDeliveryWeekday() + 3) % 7) { $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 3; } - if ($currentWeekday == (Configure::read('app.timeHelper')->getDeliveryWeekday() + 4) % 7) { + if ($currentWeekday == (self::getDeliveryWeekday() + 4) % 7) { $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 2; } - if ($currentWeekday == (Configure::read('app.timeHelper')->getDeliveryWeekday() + 5) % 7) { + if ($currentWeekday == (self::getDeliveryWeekday() + 5) % 7) { $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1) + 1; } - if ($currentWeekday == (Configure::read('app.timeHelper')->getDeliveryWeekday() + 6) % 7) { + if ($currentWeekday == (self::getDeliveryWeekday() + 6) % 7) { $dateDiff = (Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') * -1); } diff --git a/src/Model/Table/AppTable.php b/src/Model/Table/AppTable.php index 0cad7fbe71..4dd06664b7 100644 --- a/src/Model/Table/AppTable.php +++ b/src/Model/Table/AppTable.php @@ -11,6 +11,7 @@ use Cake\Utility\Hash; use Cake\Validation\Validation; use Cake\Validation\Validator; +use App\Lib\DeliveryRhythm\DeliveryRhythm; /** * FoodCoopShop - The open source software for your foodcoop @@ -43,14 +44,14 @@ public function getAllowOnlyOneWeekdayValidator(Validator $validator, $field, $f { $validator->add($field, 'allow-only-one-weekday', [ 'rule' => function ($value, $context) { - if (Configure::read('app.timeHelper')->getDeliveryWeekday() != Configure::read('app.timeHelper')->formatAsWeekday(strtotime($value))) { + if (DeliveryRhythm::getDeliveryWeekday() != Configure::read('app.timeHelper')->formatAsWeekday(strtotime($value))) { return false; } return true; }, 'message' => __('{0}_needs_to_be_a_{1}.', [ $fieldName, - Configure::read('app.timeHelper')->getWeekdayName(Configure::read('app.timeHelper')->getDeliveryWeekday()) + Configure::read('app.timeHelper')->getWeekdayName(DeliveryRhythm::getDeliveryWeekday()) ]) ]); return $validator; diff --git a/src/Model/Table/CartsTable.php b/src/Model/Table/CartsTable.php index 88f5bebb04..978662631b 100644 --- a/src/Model/Table/CartsTable.php +++ b/src/Model/Table/CartsTable.php @@ -6,6 +6,7 @@ use Cake\Core\Configure; use Cake\Datasource\FactoryLocator; use Cake\Validation\Validator; +use App\Lib\DeliveryRhythm\DeliveryRhythm; /** * FoodCoopShop - The open source software for your foodcoop @@ -74,7 +75,7 @@ public function getAllowOnlyDefinedPickupDaysValidator(Validator $validator, $fi { $validator->add($field, 'allow-only-defined-pickup-days', [ 'rule' => function ($value, $context) { - if (!in_array($value, array_keys(Configure::read('app.timeHelper')->getNextDailyDeliveryDays(14))) + if (!in_array($value, array_keys(DeliveryRhythm::getNextDailyDeliveryDays(14))) || in_array($value, Configure::read('app.htmlHelper')->getGlobalNoDeliveryDaysAsArray())) { return false; } diff --git a/src/Model/Table/OrderDetailsTable.php b/src/Model/Table/OrderDetailsTable.php index fc55de6413..6b39b07752 100644 --- a/src/Model/Table/OrderDetailsTable.php +++ b/src/Model/Table/OrderDetailsTable.php @@ -266,7 +266,7 @@ public function getLastOrderDetailsForDropdown($customerId) $orderDetails = $this->getOrderDetailQueryForPeriodAndCustomerId($dateFrom, $dateTo, $customerId); if (count($orderDetails) > 0) { - $deliveryDay = Configure::read('app.timeHelper')->formatToDateShort(date('Y-m-d', Configure::read('app.timeHelper')->getDeliveryDay($dateTo))); + $deliveryDay = Configure::read('app.timeHelper')->formatToDateShort(date('Y-m-d', DeliveryRhythm::getDeliveryDay($dateTo))); $result[$deliveryDay] = __('Pickup_day') . ' ' . $deliveryDay . ' - ' . __('{0,plural,=1{1_product} other{#_products}}', [count($orderDetails)]); $foundOrders++; } diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index d3230663fd..6010de8d3a 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -12,6 +12,7 @@ use Cake\Datasource\FactoryLocator; use Cake\Utility\Hash; use Cake\Validation\Validator; +use App\Lib\DeliveryRhythm\DeliveryRhythm; /** * FoodCoopShop - The open source software for your foodcoop @@ -183,7 +184,7 @@ private function getCorrectDayOfMonthValidator(Validator $validator, $field) $deliveryDayAsWeekdayInEnglish = strtolower(date('l', strtotime($context['data']['delivery_rhythm_first_delivery_day']))); $calculatedPickupDay = date(Configure::read('app.timeHelper')->getI18Format('DatabaseAlt'), strtotime($context['data']['delivery_rhythm_first_delivery_day'] . ' ' . $ordinal . ' ' . $deliveryDayAsWeekdayInEnglish . ' of this month')); - $deliveryWeekdayName = Configure::read('app.timeHelper')->getWeekdayName(Configure::read('app.timeHelper')->getDeliveryWeekday()); + $deliveryWeekdayName = Configure::read('app.timeHelper')->getWeekdayName(DeliveryRhythm::getDeliveryWeekday()); $message = __('The_first_delivery_day_needs_to_be_a_{0}_{1}_of_the_month.', [ $ordinalForWeekday, $deliveryWeekdayName, @@ -232,7 +233,7 @@ public function calculatePickupDayRespectingDeliveryRhythm($product, $currentDay $sendOrderListsWeekday = $product->delivery_rhythm_send_order_list_weekday; } - $pickupDay = Configure::read('app.timeHelper')->getDbFormattedPickupDayByDbFormattedDate($currentDay, $sendOrderListsWeekday); + $pickupDay = DeliveryRhythm::getDbFormattedPickupDayByDbFormattedDate($currentDay, $sendOrderListsWeekday); // assure that $product->is_stock_product also contains check for $product->manufacturer->stock_management_enabled if ($product->is_stock_product) { @@ -241,7 +242,7 @@ public function calculatePickupDayRespectingDeliveryRhythm($product, $currentDay if (Configure::read('appDb.FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY')) { if ($product->delivery_rhythm_type == 'week' && $product->delivery_rhythm_count == 1) { - $regularPickupDay = Configure::read('app.timeHelper')->getDbFormattedPickupDayByDbFormattedDate($currentDay); + $regularPickupDay = DeliveryRhythm::getDbFormattedPickupDayByDbFormattedDate($currentDay); if ($pickupDay != $regularPickupDay) { return 'delivery-rhythm-triggered-delivery-break'; } @@ -1504,7 +1505,7 @@ public function add($manufacturer, $productName, $descriptionShort, $description 'id_manufacturer' => $manufacturer->id_manufacturer, 'id_tax' => $this->Manufacturer->getOptionDefaultTaxId($manufacturer->default_tax_id), 'name' => StringComponent::removeSpecialChars(strip_tags(trim($productName))), - 'delivery_rhythm_send_order_list_weekday' => Configure::read('app.timeHelper')->getSendOrderListsWeekday(), + 'delivery_rhythm_send_order_list_weekday' => DeliveryRhythm::getSendOrderListsWeekday(), 'description_short' => StringComponent::prepareWysiwygEditorHtml($descriptionShort, self::ALLOWED_TAGS_DESCRIPTION_SHORT), 'description' => StringComponent::prepareWysiwygEditorHtml($description, self::ALLOWED_TAGS_DESCRIPTION), 'unity' => StringComponent::removeSpecialChars(strip_tags(trim($unity))), diff --git a/src/Shell/EmailOrderReminderShell.php b/src/Shell/EmailOrderReminderShell.php index 3b0e11c62f..e7a8b74edf 100644 --- a/src/Shell/EmailOrderReminderShell.php +++ b/src/Shell/EmailOrderReminderShell.php @@ -18,6 +18,7 @@ namespace App\Shell; +use App\Lib\DeliveryRhythm\DeliveryRhythm; use App\Mailer\AppMailer; use Cake\Core\Configure; use Cake\Database\Expression\QueryExpression; @@ -39,7 +40,7 @@ public function main() return true; } - $nextDeliveryDay = Configure::read('app.timeHelper')->getNextDeliveryDay(strtotime($this->cronjobRunDay)); + $nextDeliveryDay = DeliveryRhythm::getNextDeliveryDay(strtotime($this->cronjobRunDay)); if (Configure::read('appDb.FCS_NO_DELIVERY_DAYS_GLOBAL') != '') { $this->Product = $this->getTableLocator()->get('Products'); if ($this->Product->deliveryBreakEnabled(Configure::read('appDb.FCS_NO_DELIVERY_DAYS_GLOBAL'), $nextDeliveryDay)) { @@ -86,7 +87,7 @@ public function main() ->setViewVars([ 'customer' => $customer, 'newsletterCustomer' => $customer, - 'lastOrderDayAsString' => (Configure::read('app.timeHelper')->getSendOrderListsWeekday() - date('N', strtotime($this->cronjobRunDay))) == 1 ? __('today') : __('tomorrow') + 'lastOrderDayAsString' => (DeliveryRhythm::getSendOrderListsWeekday() - date('N', strtotime($this->cronjobRunDay))) == 1 ? __('today') : __('tomorrow') ]) ->addToQueue(); diff --git a/src/Shell/PickupReminderShell.php b/src/Shell/PickupReminderShell.php index db7176e1f4..256fa2d602 100644 --- a/src/Shell/PickupReminderShell.php +++ b/src/Shell/PickupReminderShell.php @@ -18,6 +18,7 @@ use App\Mailer\AppMailer; use Cake\Core\Configure; use Cake\Database\Expression\QueryExpression; +use App\Lib\DeliveryRhythm\DeliveryRhythm; class PickupReminderShell extends AppShell { @@ -54,7 +55,7 @@ public function main() $customers = $this->Customer->sortByVirtualField($customers, 'name'); $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); - $nextPickupDay = Configure::read('app.timeHelper')->getDeliveryDay(strtotime($this->cronjobRunDay)); + $nextPickupDay = DeliveryRhythm::getDeliveryDay(strtotime($this->cronjobRunDay)); $formattedPickupDay = Configure::read('app.timeHelper')->getDateFormattedWithWeekday($nextPickupDay); $diffOrderAndPickupInDays = 6; diff --git a/src/Shell/SendOrderListsShell.php b/src/Shell/SendOrderListsShell.php index eab3669f51..f4db7ace0a 100644 --- a/src/Shell/SendOrderListsShell.php +++ b/src/Shell/SendOrderListsShell.php @@ -14,6 +14,7 @@ */ namespace App\Shell; +use App\Lib\DeliveryRhythm\DeliveryRhythm; use Cake\Core\Configure; use Cake\I18n\FrozenDate; use Cake\Utility\Hash; @@ -39,7 +40,7 @@ public function main() if (Configure::read('appDb.FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY')) { $pickupDay = $this->cronjobRunDay; } else { - $pickupDay = Configure::read('app.timeHelper')->getNextDeliveryDay(strtotime($this->cronjobRunDay)); + $pickupDay = DeliveryRhythm::getNextDeliveryDay(strtotime($this->cronjobRunDay)); } // 1) get all manufacturers (not only active ones) diff --git a/src/View/Helper/ConfigurationHelper.php b/src/View/Helper/ConfigurationHelper.php index 96e8cf9a01..1967a37468 100644 --- a/src/View/Helper/ConfigurationHelper.php +++ b/src/View/Helper/ConfigurationHelper.php @@ -7,6 +7,7 @@ use Cake\Datasource\FactoryLocator; use Cake\Utility\Hash; use Cake\View\Helper; +use App\Lib\DeliveryRhythm\DeliveryRhythm; /** * FoodCoopShop - The open source software for your foodcoop @@ -48,9 +49,9 @@ public function getConfigurationDropdownOptions($name, $appAuth) break; case 'FCS_NO_DELIVERY_DAYS_GLOBAL': if (Configure::read('appDb.FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY')) { - $values = Configure::read('app.timeHelper')->getNextDailyDeliveryDays(365); + $values = DeliveryRhythm::getNextDailyDeliveryDays(365); } else { - $values = Configure::read('app.timeHelper')->getNextWeeklyDeliveryDays(); + $values = DeliveryRhythm::getNextWeeklyDeliveryDays(); } return $values; break; diff --git a/src/View/Helper/MyHtmlHelper.php b/src/View/Helper/MyHtmlHelper.php index 464eb69f0a..6722264cad 100644 --- a/src/View/Helper/MyHtmlHelper.php +++ b/src/View/Helper/MyHtmlHelper.php @@ -8,6 +8,7 @@ use Cake\View\View; use Cake\View\Helper\HtmlHelper; use App\Controller\Component\StringComponent; +use App\Lib\DeliveryRhythm\DeliveryRhythm; use App\Lib\OutputFilter\OutputFilter; /** @@ -120,7 +121,7 @@ public function getDeliveryRhythmString($isStockProduct, $deliveryRhythmType, $d } if ($deliveryRhythmType == 'month') { - $deliveryDayAsWeekday = $this->MyTime->getWeekdayName($this->MyTime->getDeliveryWeekday()); + $deliveryDayAsWeekday = $this->MyTime->getWeekdayName(DeliveryRhythm::getDeliveryWeekday()); if ($deliveryRhythmCount > 0) { $deliveryRhythmString = __('every_{0}_{1}_of_a_month', [ $this->MyNumber->ordinal($deliveryRhythmCount), @@ -140,6 +141,19 @@ public function getDeliveryRhythmString($isStockProduct, $deliveryRhythmType, $d return $deliveryRhythmString; } + public function getSendOrderListsWeekdayOptions() + { + $defaultSendOrderListsWeekday = DeliveryRhythm::getSendOrderListsWeekday(); + $weekday3 = $this->MyTime->getNthWeekdayBeforeWeekday(3, $defaultSendOrderListsWeekday); + $weekday2 = $this->MyTime->getNthWeekdayBeforeWeekday(2, $defaultSendOrderListsWeekday); + $weekday1 = $this->MyTime->getNthWeekdayBeforeWeekday(1, $defaultSendOrderListsWeekday); + return [ + $weekday3 => $this->MyTime->getWeekdayName($weekday3) . ' ' . __('midnight'), + $weekday2 => $this->MyTime->getWeekdayName($weekday2) . ' ' . __('midnight'), + $weekday1 => $this->MyTime->getWeekdayName($weekday1) . ' ' . __('midnight') . ' (' . __('default_value') . ')' + ]; + } + public function getDeliveryRhythmTypesForDropdown() { return [ diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index b997d2fe03..0abbaa9692 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -3,10 +3,8 @@ namespace App\View\Helper; use Cake\Core\Configure; -use Cake\I18n\I18n; use Cake\I18n\FrozenTime; use Cake\View\Helper\TimeHelper; -use App\Lib\DeliveryRhythm\DeliveryRhythm; /** * FoodCoopShop - The open source software for your foodcoop @@ -88,29 +86,6 @@ public function getI18Format($formatString) return Configure::read('DateFormat.' . $formatString); } - public function getLastOrderDay($nextDeliveryDay, $deliveryRhythmType, $deliveryRhythmCount, $deliveryRhythmSendOrderListWeekday, $deliveryRhythmOrderPossibleUntil) - { - - if ($nextDeliveryDay == 'delivery-rhythm-triggered-delivery-break') { - return ''; - } - - if ($deliveryRhythmType == 'individual') { - $result = strtotime($deliveryRhythmOrderPossibleUntil->i18nFormat(Configure::read('DateFormat.Database'))); - } else { - $lastOrderWeekday = $this->getNthWeekdayBeforeWeekday(1, $deliveryRhythmSendOrderListWeekday); - $tmpLocale = I18n::getLocale(); - I18n::setLocale('en_US'); - $weekdayAsNameInEnglish = $this->getWeekdayName($lastOrderWeekday); - I18n::setLocale($tmpLocale); - $result = strtotime('last ' . $weekdayAsNameInEnglish, strtotime($nextDeliveryDay)); - } - - $result = date(Configure::read('DateFormat.DatabaseAlt'), $result); - return $result; - - } - public function getLastDayOfGivenMonth($monthAndYear) { return date('t', strtotime($monthAndYear)); @@ -153,50 +128,11 @@ public function getNthWeekdayAfterWeekday($n, $weekday) return $beforeWeekday; } - public function getSendOrderListsWeekday() - { - $sendOrderListsWeekday = Configure::read('appDb.FCS_WEEKLY_PICKUP_DAY') - Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA'); - if ($sendOrderListsWeekday < 0) { - $sendOrderListsWeekday += 7; - } - return $sendOrderListsWeekday; - } - - public function getDeliveryDateByCurrentDayForDb() - { - $deliveryDate = self::getDeliveryDayByCurrentDay(); - $deliveryDate = date($this->getI18Format('DatabaseAlt'), $deliveryDate); - return $deliveryDate; - } - public function getDateFormattedWithWeekday($date) { $date = $this->getWeekdayName($this->formatAsWeekday($date)) . ', ' . date($this->getI18Format('DateShortAlt'), $date); return $date; } - public function getDeliveryDateByCurrentDayFormattedWithWeekday() - { - $deliveryDate = self::getDeliveryDayByCurrentDay(); - return $this->getDateFormattedWithWeekday($deliveryDate); - } - - public function getDeliveryDayByCurrentDay() - { - return self::getDeliveryDay($this->getCurrentDay()); - } - - public function getNextWeeklyDeliveryDays($maxDays=52) - { - $nextDeliveryDay = $this->getDeliveryDateByCurrentDayForDb(); - return $this->getWeekdayFormatedDaysList($nextDeliveryDay, $maxDays, 7); - } - - public function getNextDailyDeliveryDays($maxDays) - { - $nextDeliveryDay = $this->getTomorrowForDatabase(); - return $this->getWeekdayFormatedDaysList($nextDeliveryDay, $maxDays, 1); - } - public function getTomorrowForDatabase() { return $this->getInXDaysForDatabase(1); } @@ -206,18 +142,18 @@ public function getInXDaysForDatabase($days) return date(Configure::read('DateFormat.DatabaseAlt'), strtotime($this->getCurrentDateForDatabase() . ' +' . $days . ' days')); } - private function getWeekdayFormatedDaysList($nextDeliveryDay, $maxDays, $factor) + private function getWeekdayFormatedDaysList($day, $maxDays, $factor) { - $nextDeliveryDays = [ - $nextDeliveryDay => $this->getDateFormattedWithWeekday(strtotime($nextDeliveryDay)) + $days = [ + $day => $this->getDateFormattedWithWeekday(strtotime($day)) ]; $count = 1; while($count < $maxDays) { - $nextCalculatedDeliveryDay = date(Configure::read('DateFormat.DatabaseAlt'), strtotime($nextDeliveryDay . ' + ' . $count * $factor . ' day')); - $nextDeliveryDays[$nextCalculatedDeliveryDay] = $this->getDateFormattedWithWeekday(strtotime($nextCalculatedDeliveryDay)); + $nextCalculatedDay = date(Configure::read('DateFormat.DatabaseAlt'), strtotime($day . ' + ' . $count * $factor . ' day')); + $days[$nextCalculatedDay] = $this->getDateFormattedWithWeekday(strtotime($nextCalculatedDay)); $count++; } - return $nextDeliveryDays; + return $days; } /** @@ -274,70 +210,6 @@ public function getCalendarWeeks($firstWeek, $lastWeek, $year) return $result; } - public function getDbFormattedPickupDayByDbFormattedDate($date, $sendOrderListsWeekday = null, $deliveryRhythmType = null, $deliveryRhythmCount = null) - { - if (is_null($sendOrderListsWeekday)) { - $sendOrderListsWeekday = $this->getSendOrderListsWeekday(); - } - $pickupDay = $this->getDeliveryDay(strtotime($date), $sendOrderListsWeekday, $deliveryRhythmType, $deliveryRhythmCount); - $pickupDay = date(Configure::read('DateFormat.DatabaseAlt'), $pickupDay); - return $pickupDay; - } - - public function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, $deliveryRhythmType = null, $deliveryRhythmCount = null) - { - if (is_null($deliveryRhythmType)) { - $deliveryRhythmType = 'week'; - } - if (is_null($deliveryRhythmCount)) { - $deliveryRhythmCount = 1; - } - - $daysToAddToOrderPeriodLastDay = DeliveryRhythm::getDaysToAddToOrderPeriodLastDay(); - $deliveryDate = strtotime(DeliveryRhythm::getOrderPeriodLastDay($orderDay) . '+' . $daysToAddToOrderPeriodLastDay . ' days'); - - $weekdayDeliveryDate = $this->formatAsWeekday($deliveryDate); - $weekdayStringDeliveryDate = strtolower(date('l', $deliveryDate)); - - $weekdayOrderDay = $this->formatAsWeekday($orderDay); - $weekdayOrderDay = $weekdayOrderDay % 7; - - if (is_null($sendOrderListsWeekday)) { - $sendOrderListsWeekday = $this->getSendOrderListsWeekday(); - } - - /* - $daysToAddToOrderPeriodLastDayMatrix = [ - 3 => [ - 2 => 5 => [] - ], - ]; - - $daysToAddToOrderPeriodLastDay = $daysToAddToOrderPeriodLastDayMatrix[$weekdayOrderDay][$weekdayDeliveryDate]; - */ - -// pr($weekdayOrderDay); -// pr($sendOrderListsWeekday); -// pr($weekdayDeliveryDate); - - if ($weekdayOrderDay >= $sendOrderListsWeekday && $weekdayOrderDay <= $weekdayDeliveryDate && $deliveryRhythmType != 'individual') { - $preparedOrderDay = date($this->getI18Format('DateShortAlt'), $orderDay); - $deliveryDate = strtotime($preparedOrderDay . '+ ' . $deliveryRhythmCount . ' ' . $deliveryRhythmType . ' ' . $weekdayStringDeliveryDate); - } - - return $deliveryDate; - } - - public function getWeekdaysBetweenOrderSendAndDelivery($delta = 0) - { - $sendOrderListsWeekday = $this->getSendOrderListsWeekday(); - $weekdays = []; - for ($i = $sendOrderListsWeekday; $i <= $sendOrderListsWeekday + Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') + $delta; $i++) { - $weekdays[] = $i; - } - return $weekdays; - } - public function getCurrentWeekday() { return $this->formatAsWeekday($this->getCurrentDay()); @@ -353,35 +225,6 @@ public function getCurrentDay() return time(); } - public function getDeliveryWeekday() - { - return Configure::read('appDb.FCS_WEEKLY_PICKUP_DAY'); - } - - public function getNextDeliveryDay($day) - { - $orderPeriodFirstDay = DeliveryRhythm::getOrderPeriodFirstDay($day); - return date($this->getI18Format('DatabaseAlt'), $this->getDeliveryDay(strtotime($orderPeriodFirstDay))); - } - - public function getFormattedNextDeliveryDay($day) - { - return date($this->getI18Format('DateShortAlt'), strtotime($this->getNextDeliveryDay($day))); - } - - public function getSendOrderListsWeekdayOptions() - { - $defaultSendOrderListsWeekday = $this->getSendOrderListsWeekday(); - $weekday3 = $this->getNthWeekdayBeforeWeekday(3, $defaultSendOrderListsWeekday); - $weekday2 = $this->getNthWeekdayBeforeWeekday(2, $defaultSendOrderListsWeekday); - $weekday1 = $this->getNthWeekdayBeforeWeekday(1, $defaultSendOrderListsWeekday); - return [ - $weekday3 => $this->getWeekdayName($weekday3) . ' ' . __('midnight'), - $weekday2 => $this->getWeekdayName($weekday2) . ' ' . __('midnight'), - $weekday1 => $this->getWeekdayName($weekday1) . ' ' . __('midnight') . ' (' . __('default_value') . ')' - ]; - } - public function getWeekdays() { $weekdays = [ diff --git a/templates/element/cart/selectPickupDay.php b/templates/element/cart/selectPickupDay.php index b32f072055..983ffe7d96 100644 --- a/templates/element/cart/selectPickupDay.php +++ b/templates/element/cart/selectPickupDay.php @@ -12,6 +12,7 @@ * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ +use App\Lib\DeliveryRhythm\DeliveryRhythm; use Cake\Core\Configure; if (!Configure::read('appDb.FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY')) { @@ -26,7 +27,7 @@ echo '
'; - $preparedDeliveryDays = $this->Time->getNextDailyDeliveryDays(14); + $preparedDeliveryDays = DeliveryRhythm::getNextDailyDeliveryDays(14); $formattedToDatabaseDeliveryDays = $this->Html->getGlobalNoDeliveryDaysAsArray(); $i = 0; diff --git a/templates/element/catalog/columns/column2.php b/templates/element/catalog/columns/column2.php index 46f5d1d8f4..b3264d87f6 100644 --- a/templates/element/catalog/columns/column2.php +++ b/templates/element/catalog/columns/column2.php @@ -13,6 +13,7 @@ * @link https://www.foodcoopshop.com */ +use App\Lib\DeliveryRhythm\DeliveryRhythm; use Cake\Core\Configure; echo '
'; @@ -56,7 +57,7 @@ if (!($product->delivery_rhythm_type == 'week' && $product->delivery_rhythm_count == 1 - && $this->Time->getSendOrderListsWeekday() == $product->delivery_rhythm_send_order_list_weekday + && DeliveryRhythm::getSendOrderListsWeekday() == $product->delivery_rhythm_send_order_list_weekday ) && $lastOrderDay != '' ) { diff --git a/tests/TestCase/AppCakeTestCase.php b/tests/TestCase/AppCakeTestCase.php index 3f5692d2c1..23a2575ddf 100644 --- a/tests/TestCase/AppCakeTestCase.php +++ b/tests/TestCase/AppCakeTestCase.php @@ -1,6 +1,7 @@ $this->getUserId(), - 'pickup_day' => !is_null($pickupDay) ? $pickupDay : Configure::read('app.timeHelper')->getDeliveryDateByCurrentDayForDb(), + 'pickup_day' => !is_null($pickupDay) ? $pickupDay : DeliveryRhythm::getDeliveryDateByCurrentDayForDb(), 'comment' => $comment, ]; } diff --git a/tests/TestCase/src/Controller/CartsControllerTest.php b/tests/TestCase/src/Controller/CartsControllerTest.php index 3ccd227369..cf6a3a3a6b 100644 --- a/tests/TestCase/src/Controller/CartsControllerTest.php +++ b/tests/TestCase/src/Controller/CartsControllerTest.php @@ -19,6 +19,7 @@ use Cake\I18n\FrozenDate; use Cake\TestSuite\EmailTrait; use Cake\TestSuite\TestEmailTransport; +use App\Lib\DeliveryRhythm\DeliveryRhythm; class CartsControllerTest extends AppCakeTestCase { @@ -394,7 +395,7 @@ public function testManufacturerDeliveryBreakActivatedWhileShopping() $this->checkCartStatus(); $manufacturerId = 5; - $this->changeManufacturerNoDeliveryDays($manufacturerId, Configure::read('app.timeHelper')->getDeliveryDateByCurrentDayForDb()); + $this->changeManufacturerNoDeliveryDays($manufacturerId, DeliveryRhythm::getDeliveryDateByCurrentDayForDb()); $this->finishCart(); $this->checkValidationError(); $this->assertMatchesRegularExpression('/Der Hersteller des Produktes (.*) hat entweder Lieferpause oder er ist nicht mehr aktiviert und das Produkt ist somit nicht mehr bestellbar./', $this->_response); @@ -406,7 +407,7 @@ public function testGlobalDeliveryBreakActivatedWhileShopping() $this->loginAsSuperadmin(); $this->fillCart(); $this->checkCartStatus(); - $this->changeConfiguration('FCS_NO_DELIVERY_DAYS_GLOBAL', Configure::read('app.timeHelper')->getDeliveryDateByCurrentDayForDb()); + $this->changeConfiguration('FCS_NO_DELIVERY_DAYS_GLOBAL', DeliveryRhythm::getDeliveryDateByCurrentDayForDb()); $this->loginAsSuperadmin(); $this->finishCart(0, 0); $this->checkValidationError(); @@ -674,7 +675,7 @@ public function testFinishOrderWithComment() $this->checkCartStatusAfterFinish(); $cart = $this->getCartById($cartId); - $pickupDay = Configure::read('app.timeHelper')->getDeliveryDateByCurrentDayForDb(); + $pickupDay = DeliveryRhythm::getDeliveryDateByCurrentDayForDb(); // check order_details for product1 (index 2!) $this->checkOrderDetails($cart->cart_products[0]->order_detail, 'Artischocke : Stück', 2, 0, 1, 3.3, 3.64, 0.17, 0.34, 10, $pickupDay); @@ -831,7 +832,7 @@ public function testFinishCartWithPricePerUnit() $this->checkCartStatusAfterFinish(); $cart = $this->getCartById($cartId); - $pickupDay = Configure::read('app.timeHelper')->getDeliveryDateByCurrentDayForDb(); + $pickupDay = DeliveryRhythm::getDeliveryDateByCurrentDayForDb(); // check order_details $this->checkOrderDetails($cart->cart_products[0]->order_detail, 'Forelle : Stück', 2, 0, 0, 9.54, 10.5, 0.48, 0.96, 10, $pickupDay); diff --git a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php index 0609d43d6a..7e74bbf4b2 100644 --- a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php +++ b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php @@ -12,6 +12,7 @@ * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ +use App\Lib\DeliveryRhythm\DeliveryRhythm; use App\Test\TestCase\AppCakeTestCase; use App\Test\TestCase\Traits\AppIntegrationTestTrait; use App\Test\TestCase\Traits\LoginTrait; @@ -109,7 +110,7 @@ public function testProductDetailDeliveryBreakActive() $this->loginAsSuperadmin(); $productId = 346; $manufacturerId = 5; - $this->changeManufacturerNoDeliveryDays($manufacturerId, Configure::read('app.timeHelper')->getDeliveryDateByCurrentDayForDb()); + $this->changeManufacturerNoDeliveryDays($manufacturerId, DeliveryRhythm::getDeliveryDateByCurrentDayForDb()); $this->get($this->Slug->getProductDetail($productId, 'Artischocke')); $this->assertResponseContains(' Lieferpause!'); } diff --git a/tests/TestCase/src/Controller/SelfServiceControllerTest.php b/tests/TestCase/src/Controller/SelfServiceControllerTest.php index d8cba75b57..abf4b330f3 100644 --- a/tests/TestCase/src/Controller/SelfServiceControllerTest.php +++ b/tests/TestCase/src/Controller/SelfServiceControllerTest.php @@ -14,6 +14,7 @@ */ use App\Application; +use App\Lib\DeliveryRhythm\DeliveryRhythm; use App\Test\TestCase\AppCakeTestCase; use App\Test\TestCase\Traits\AppIntegrationTestTrait; use App\Test\TestCase\Traits\AssertPagesForErrorsTrait; @@ -193,7 +194,7 @@ public function testSelfServiceOrderWithPricePerUnitPurchasePriceEnabled() public function testSelfServiceOrderWithDeliveryBreak() { $this->changeConfiguration('FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED', 1); - $this->changeConfiguration('FCS_NO_DELIVERY_DAYS_GLOBAL', Configure::read('app.timeHelper')->getDeliveryDateByCurrentDayForDb()); + $this->changeConfiguration('FCS_NO_DELIVERY_DAYS_GLOBAL', DeliveryRhythm::getDeliveryDateByCurrentDayForDb()); $this->loginAsSuperadmin(); $this->addProductToSelfServiceCart('350-15', 1, '1,5'); $this->finishSelfServiceCart(1, 1); diff --git a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php index 8e081b777c..93b59f014a 100644 --- a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php +++ b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php @@ -16,12 +16,40 @@ use App\Lib\DeliveryRhythm\DeliveryRhythm; use App\Test\TestCase\AppCakeTestCase; use App\Test\TestCase\Traits\DeliveryRhythmConfigsTrait; +use App\View\Helper\MyTimeHelper; +use Cake\I18n\FrozenDate; +use Cake\View\View; class DeliveryRhythmTest extends AppCakeTestCase { use DeliveryRhythmConfigsTrait; + public function setUp(): void + { + parent::setUp(); + $this->MyTimeHelper = new MyTimeHelper(new View()); + } + + public function testGetDeliveryDayTuesdayFriday() + { + $this->prepareTuesdayFridayConfig(); + $this->assertGetDeliveryDay('25.07.2018', '03.08.2018'); + } + + public function xtestGetDeliveryDaySaturdayThursday() + { + $this->prepareSaturdayThursdayConfig(); + $this->assertGetDeliveryDay('24.08.2022', '01.09.2022'); // wednesday + $this->assertGetDeliveryDay('25.08.2022', '01.09.2022'); // thursday + $this->assertGetDeliveryDay('26.08.2022', '01.09.2022'); // friday + $this->assertGetDeliveryDay('27.08.2022', '08.09.2022'); // saturday + $this->assertGetDeliveryDay('28.08.2022', '08.09.2022'); // sunday + $this->assertGetDeliveryDay('29.08.2022', '08.09.2022'); // monday + $this->assertGetDeliveryDay('30.08.2022', '08.09.2022'); // tuesday + $this->assertGetDeliveryDay('31.08.2022', '08.09.2022'); // wednesday + } + public function testGetOrderPeriodFirstDayThursdayFriday() { $this->prepareThursdayFridayConfig(); @@ -163,6 +191,95 @@ public function testGetOrderPeriodLastDaySaturdayThursday() $this->assertGetOrderPeriodLastDay('06.09.2022', '09.09.2022'); // tuesday } + public function testGetFormattedNextDeliveryDayThursdayFriday() + { + $this->prepareThursdayFridayConfig(); + $this->assertGetFormattedNextDeliveryDay('08.10.2018', '12.10.2018'); // monday + $this->assertGetFormattedNextDeliveryDay('09.10.2018', '12.10.2018'); // tuesday + $this->assertGetFormattedNextDeliveryDay('10.10.2018', '12.10.2018'); // wednesday + $this->assertGetFormattedNextDeliveryDay('11.10.2018', '12.10.2018'); // thursday + $this->assertGetFormattedNextDeliveryDay('12.10.2018', '12.10.2018'); // friday + $this->assertGetFormattedNextDeliveryDay('13.10.2018', '19.10.2018'); // saturday + $this->assertGetFormattedNextDeliveryDay('14.10.2018', '19.10.2018'); // sunday + $this->assertGetFormattedNextDeliveryDay('15.10.2018', '19.10.2018'); // monday + $this->assertGetFormattedNextDeliveryDay('16.10.2018', '19.10.2018'); // tuesday + } + + public function testGetFormattedNextDeliveryDayWednesdayFriday() + { + $this->prepareWednesdayFridayConfig(); + $this->assertGetFormattedNextDeliveryDay('08.10.2018', '12.10.2018'); // monday + $this->assertGetFormattedNextDeliveryDay('09.10.2018', '12.10.2018'); // tuesday + $this->assertGetFormattedNextDeliveryDay('10.10.2018', '12.10.2018'); // wednesday + $this->assertGetFormattedNextDeliveryDay('11.10.2018', '12.10.2018'); // thursday + $this->assertGetFormattedNextDeliveryDay('12.10.2018', '12.10.2018'); // friday + $this->assertGetFormattedNextDeliveryDay('13.10.2018', '19.10.2018'); // saturday + $this->assertGetFormattedNextDeliveryDay('14.10.2018', '19.10.2018'); // sunday + $this->assertGetFormattedNextDeliveryDay('15.10.2018', '19.10.2018'); // monday + $this->assertGetFormattedNextDeliveryDay('16.10.2018', '19.10.2018'); // tuesday + } + + public function testGetLastOrderDayWeeklySendOrderListsDayNormal() + { + $product = [ + 'next_delivery_day' => '2020-12-04', + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => 1, + 'delivery_rhythm_send_order_list_weekday' => 3, + 'delivery_rhythm_order_possible_until' => null, + ]; + $this->assertGetLastOrderDay($product, '2020-12-01'); + } + + public function testGetLastOrderDayWeeklySendOrderListsDayMonday() + { + $product = [ + 'next_delivery_day' => '2020-12-04', + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => 1, + 'delivery_rhythm_send_order_list_weekday' => 2, + 'delivery_rhythm_order_possible_until' => null, + ]; + $this->assertGetLastOrderDay($product, '2020-11-30'); + } + + public function testGetLastOrderDayMonthlySendOrderListsDayNormal() + { + $product = [ + 'next_delivery_day' => '2020-12-25', + 'delivery_rhythm_type' => 'month', + 'delivery_rhythm_count' => 0, + 'delivery_rhythm_send_order_list_weekday' => 3, + 'delivery_rhythm_order_possible_until' => null, + ]; + $this->assertGetLastOrderDay($product, '2020-12-22'); + } + + public function testGetLastOrderDayMonthlySendOrderListsDaySunday() + { + $product = [ + 'next_delivery_day' => '2020-12-25', + 'delivery_rhythm_type' => 'month', + 'delivery_rhythm_count' => 0, + 'delivery_rhythm_send_order_list_weekday' => 1, + 'delivery_rhythm_order_possible_until' => null, + ]; + $this->assertGetLastOrderDay($product, '2020-12-20'); + } + + public function testGetLastOrderDayIndividual() + { + $product = [ + 'next_delivery_day' => '2020-12-25', + 'delivery_rhythm_type' => 'individual', + 'delivery_rhythm_count' => 0, + 'delivery_rhythm_send_order_list_weekday' => 3, + 'delivery_rhythm_order_possible_until' => new FrozenDate('2020-12-12'), + ]; + $this->assertGetLastOrderDay($product, '2020-12-12'); + } + + private function assertGetOrderPeriodFirstDay($currentDay, $expected) { $result = DeliveryRhythm::getOrderPeriodFirstDay(strtotime($currentDay)); @@ -175,4 +292,30 @@ private function assertGetOrderPeriodLastDay($currentDay, $expected) $this->assertEquals($expected, $result); } + private function assertGetDeliveryDay($currentDay, $expected) + { + $result = DeliveryRhythm::getDeliveryDay(strtotime($currentDay)); + $result = date($this->MyTimeHelper->getI18Format('DateShortAlt'), $result); + $this->assertEquals($expected, $result); + } + + private function assertGetFormattedNextDeliveryDay($currentDay, $expected) + { + $result = DeliveryRhythm::getFormattedNextDeliveryDay(strtotime($currentDay)); + $this->assertEquals($expected, $result); + } + + private function assertGetLastOrderDay($product, $expected) + { + $result = DeliveryRhythm::getLastOrderDay( + $product['next_delivery_day'], + $product['delivery_rhythm_type'], + $product['delivery_rhythm_count'], + $product['delivery_rhythm_send_order_list_weekday'], + $product['delivery_rhythm_order_possible_until'], + ); + $this->assertEquals($expected, $result); + } + + } diff --git a/tests/TestCase/src/Shell/SendOrderListsShellTest.php b/tests/TestCase/src/Shell/SendOrderListsShellTest.php index 00b49c35c8..66e9507a58 100644 --- a/tests/TestCase/src/Shell/SendOrderListsShellTest.php +++ b/tests/TestCase/src/Shell/SendOrderListsShellTest.php @@ -1,5 +1,6 @@ cart_products[0]->order_detail->id_order_detail; $cronjobRunDay = '2019-02-27'; - $pickupDay = Configure::read('app.timeHelper')->getNextDeliveryDay(strtotime($cronjobRunDay)); + $pickupDay = DeliveryRhythm::getNextDeliveryDay(strtotime($cronjobRunDay)); $this->OrderDetail->save( $this->OrderDetail->patchEntity( @@ -99,7 +100,7 @@ public function testSendOrderListsIfOneOrderAvailable() public function testSendOrderListsIfMoreOrdersAvailable() { $cronjobRunDay = '2018-01-31'; - $pickupDay = Configure::read('app.timeHelper')->getNextDeliveryDay(strtotime($cronjobRunDay)); + $pickupDay = DeliveryRhythm::getNextDeliveryDay(strtotime($cronjobRunDay)); $this->exec('send_order_lists ' . $cronjobRunDay); $this->runAndAssertQueue(); @@ -125,7 +126,7 @@ public function testSendOrderListsIfMoreOrdersAvailable() public function testSendOrderListsWithSendOrderListFalse() { $cronjobRunDay = '2018-01-31'; - $pickupDay = Configure::read('app.timeHelper')->getNextDeliveryDay(strtotime($cronjobRunDay)); + $pickupDay = DeliveryRhythm::getNextDeliveryDay(strtotime($cronjobRunDay)); $this->changeManufacturer(4, 'send_order_list', 0); $this->runAndAssertQueue(); diff --git a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php index 78d0e8aec3..62f6142ccd 100644 --- a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php +++ b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php @@ -15,7 +15,6 @@ use App\Test\TestCase\AppCakeTestCase; use App\Test\TestCase\Traits\DeliveryRhythmConfigsTrait; use App\View\Helper\MyTimeHelper; -use Cake\I18n\FrozenDate; use Cake\View\View; class MyTimeHelperTest extends AppCakeTestCase @@ -41,53 +40,6 @@ public function testFormatToDbFormatDateEn() $this->assertEquals($result, '2018-06-12'); } - public function testGetFormattedNextDeliveryDayThursdayFriday() - { - $this->prepareThursdayFridayConfig(); - $this->assertGetFormattedNextDeliveryDay('08.10.2018', '12.10.2018'); // monday - $this->assertGetFormattedNextDeliveryDay('09.10.2018', '12.10.2018'); // tuesday - $this->assertGetFormattedNextDeliveryDay('10.10.2018', '12.10.2018'); // wednesday - $this->assertGetFormattedNextDeliveryDay('11.10.2018', '12.10.2018'); // thursday - $this->assertGetFormattedNextDeliveryDay('12.10.2018', '12.10.2018'); // friday - $this->assertGetFormattedNextDeliveryDay('13.10.2018', '19.10.2018'); // saturday - $this->assertGetFormattedNextDeliveryDay('14.10.2018', '19.10.2018'); // sunday - $this->assertGetFormattedNextDeliveryDay('15.10.2018', '19.10.2018'); // monday - $this->assertGetFormattedNextDeliveryDay('16.10.2018', '19.10.2018'); // tuesday - } - - public function testGetFormattedNextDeliveryDayWednesdayFriday() - { - $this->prepareWednesdayFridayConfig(); - $this->assertGetFormattedNextDeliveryDay('08.10.2018', '12.10.2018'); // monday - $this->assertGetFormattedNextDeliveryDay('09.10.2018', '12.10.2018'); // tuesday - $this->assertGetFormattedNextDeliveryDay('10.10.2018', '12.10.2018'); // wednesday - $this->assertGetFormattedNextDeliveryDay('11.10.2018', '12.10.2018'); // thursday - $this->assertGetFormattedNextDeliveryDay('12.10.2018', '12.10.2018'); // friday - $this->assertGetFormattedNextDeliveryDay('13.10.2018', '19.10.2018'); // saturday - $this->assertGetFormattedNextDeliveryDay('14.10.2018', '19.10.2018'); // sunday - $this->assertGetFormattedNextDeliveryDay('15.10.2018', '19.10.2018'); // monday - $this->assertGetFormattedNextDeliveryDay('16.10.2018', '19.10.2018'); // tuesday - } - - public function testGetDeliveryDayTuesdayFriday() - { - $this->prepareTuesdayFridayConfig(); - $this->assertGetDeliveryDay('25.07.2018', '03.08.2018'); - } - - public function xtestGetDeliveryDaySaturdayThursday() - { - $this->prepareSaturdayThursdayConfig(); - $this->assertGetDeliveryDay('24.08.2022', '01.09.2022'); // wednesday - $this->assertGetDeliveryDay('25.08.2022', '01.09.2022'); // thursday - $this->assertGetDeliveryDay('26.08.2022', '01.09.2022'); // friday - $this->assertGetDeliveryDay('27.08.2022', '08.09.2022'); // saturday - $this->assertGetDeliveryDay('28.08.2022', '08.09.2022'); // sunday - $this->assertGetDeliveryDay('29.08.2022', '08.09.2022'); // monday - $this->assertGetDeliveryDay('30.08.2022', '08.09.2022'); // tuesday - $this->assertGetDeliveryDay('31.08.2022', '08.09.2022'); // wednesday - } - public function testGetLastDayOfLastMonth() { $this->assertGetLastDayOfLastMonth('2018-03-11', '28.02.2018'); @@ -100,78 +52,6 @@ public function testGetFirstDayOfLastMonth() $this->assertGetFirstDayOfLastMonth('2018-01-11', '01.12.2017'); } - public function testGetLastOrderDayWeeklySendOrderListsDayNormal() - { - $product = [ - 'next_delivery_day' => '2020-12-04', - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => 1, - 'delivery_rhythm_send_order_list_weekday' => 3, - 'delivery_rhythm_order_possible_until' => null, - ]; - $this->assertGetLastOrderDay($product, '2020-12-01'); - } - - public function testGetLastOrderDayWeeklySendOrderListsDayMonday() - { - $product = [ - 'next_delivery_day' => '2020-12-04', - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => 1, - 'delivery_rhythm_send_order_list_weekday' => 2, - 'delivery_rhythm_order_possible_until' => null, - ]; - $this->assertGetLastOrderDay($product, '2020-11-30'); - } - - public function testGetLastOrderDayMonthlySendOrderListsDayNormal() - { - $product = [ - 'next_delivery_day' => '2020-12-25', - 'delivery_rhythm_type' => 'month', - 'delivery_rhythm_count' => 0, - 'delivery_rhythm_send_order_list_weekday' => 3, - 'delivery_rhythm_order_possible_until' => null, - ]; - $this->assertGetLastOrderDay($product, '2020-12-22'); - } - - public function testGetLastOrderDayMonthlySendOrderListsDaySunday() - { - $product = [ - 'next_delivery_day' => '2020-12-25', - 'delivery_rhythm_type' => 'month', - 'delivery_rhythm_count' => 0, - 'delivery_rhythm_send_order_list_weekday' => 1, - 'delivery_rhythm_order_possible_until' => null, - ]; - $this->assertGetLastOrderDay($product, '2020-12-20'); - } - - public function testGetLastOrderDayIndividual() - { - $product = [ - 'next_delivery_day' => '2020-12-25', - 'delivery_rhythm_type' => 'individual', - 'delivery_rhythm_count' => 0, - 'delivery_rhythm_send_order_list_weekday' => 3, - 'delivery_rhythm_order_possible_until' => new FrozenDate('2020-12-12'), - ]; - $this->assertGetLastOrderDay($product, '2020-12-12'); - } - - private function assertGetLastOrderDay($product, $expected) - { - $result = $this->MyTimeHelper->getLastOrderDay( - $product['next_delivery_day'], - $product['delivery_rhythm_type'], - $product['delivery_rhythm_count'], - $product['delivery_rhythm_send_order_list_weekday'], - $product['delivery_rhythm_order_possible_until'], - ); - $this->assertEquals($expected, $result); - } - private function assertGetLastDayOfLastMonth($currentDay, $expected) { $result = $this->MyTimeHelper->getLastDayOfLastMonth($currentDay); @@ -184,17 +64,4 @@ private function assertGetFirstDayOfLastMonth($currentDay, $expected) $this->assertEquals($expected, $result); } - private function assertGetDeliveryDay($currentDay, $expected) - { - $result = $this->MyTimeHelper->getDeliveryDay(strtotime($currentDay)); - $result = date($this->MyTimeHelper->getI18Format('DateShortAlt'), $result); - $this->assertEquals($expected, $result); - } - - private function assertGetFormattedNextDeliveryDay($currentDay, $expected) - { - $result = $this->MyTimeHelper->getFormattedNextDeliveryDay(strtotime($currentDay)); - $this->assertEquals($expected, $result); - } - } From 49b5e1d2c77191206d2ec500b18f791763cec45d Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 11:31:35 +0200 Subject: [PATCH 020/646] fixed getorderfirstday --- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 11 +++++++++-- .../src/Lib/DeliveryRhythm/DeliveryRhythmTest.php | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php index 8144728ca0..e6228fbbeb 100644 --- a/src/Lib/DeliveryRhythm/DeliveryRhythm.php +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -148,12 +148,19 @@ public static function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, public static function getOrderPeriodFirstDay($day) { + $currentWeekday = Configure::read('app.timeHelper')->formatAsWeekday($day); $dateDiff = 7 - self::getSendOrderListsWeekday() + $currentWeekday; $date = strtotime('-' . $dateDiff . ' day ', $day); - if ($currentWeekday > self::getDeliveryWeekday()) { - $date = strtotime('+7 day', $date); + if (self::hasSaturdayThursdayConfig()) { + if (in_array($currentWeekday, [6,7]) && self::getDeliveryWeekday()) { + $date = strtotime('+7 day', $date); + } + } else { + if ($currentWeekday > self::getDeliveryWeekday()) { + $date = strtotime('+7 day', $date); + } } $date = date(Configure::read('app.timeHelper')->getI18Format('DateShortAlt'), $date); diff --git a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php index 93b59f014a..a233f39536 100644 --- a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php +++ b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php @@ -113,7 +113,7 @@ public function testGetOrderPeriodFirstDaySaturdayThursday() $this->assertGetOrderPeriodFirstDay('23.08.2022', '20.08.2022'); // tuesday $this->assertGetOrderPeriodFirstDay('24.08.2022', '20.08.2022'); // wednesday $this->assertGetOrderPeriodFirstDay('25.08.2022', '20.08.2022'); // thursday - $this->assertGetOrderPeriodFirstDay('26.08.2022', '27.08.2022'); // friday + $this->assertGetOrderPeriodFirstDay('26.08.2022', '20.08.2022'); // friday $this->assertGetOrderPeriodFirstDay('27.08.2022', '27.08.2022'); // saturday $this->assertGetOrderPeriodFirstDay('28.08.2022', '27.08.2022'); // sunday $this->assertGetOrderPeriodFirstDay('29.08.2022', '27.08.2022'); // monday From 54b5adc81e22ce95d2fb16d26095622262cdece0 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 11:34:48 +0200 Subject: [PATCH 021/646] refactoring fixes --- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 4 ++-- templates/element/catalog/columns/column2.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php index e6228fbbeb..147f48733b 100644 --- a/src/Lib/DeliveryRhythm/DeliveryRhythm.php +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -39,13 +39,13 @@ public static function getDeliveryDateByCurrentDayForDb() public static function getNextWeeklyDeliveryDays($maxDays=52) { $nextDeliveryDay = self::getDeliveryDateByCurrentDayForDb(); - return Configure::read('app.timeHelper')->getWeekdayFormatedDaysList($nextDeliveryDay, $maxDays, 7); + return Configure::read('app.htmlHelper')->getWeekdayFormatedDaysList($nextDeliveryDay, $maxDays, 7); } public static function getNextDailyDeliveryDays($maxDays) { $nextDeliveryDay = Configure::read('app.timeHelper')->getTomorrowForDatabase(); - return Configure::read('app.timeHelper')->getWeekdayFormatedDaysList($nextDeliveryDay, $maxDays, 1); + return Configure::read('app.htmlHelper')->getWeekdayFormatedDaysList($nextDeliveryDay, $maxDays, 1); } public static function getDeliveryDayByCurrentDay() diff --git a/templates/element/catalog/columns/column2.php b/templates/element/catalog/columns/column2.php index b3264d87f6..6935787562 100644 --- a/templates/element/catalog/columns/column2.php +++ b/templates/element/catalog/columns/column2.php @@ -91,7 +91,7 @@ if (!$appAuth->isSelfServiceModeByUrl() && !$appAuth->isOrderForDifferentCustomerMode()) { if ( $product->next_delivery_day != 'delivery-rhythm-triggered-delivery-break' - && strtotime($product->next_delivery_day) != $this->Time->getDeliveryDayByCurrentDay() + && strtotime($product->next_delivery_day) != DeliveryRhythm::getDeliveryDayByCurrentDay() ) { $weeksAsFloat = (strtotime($product->next_delivery_day) - strtotime(date($this->MyTime->getI18Format('DateShortAlt')))) / 24/60/60; $fullWeeks = (int) ($weeksAsFloat / 7); From 21d3fa4198ae85dbc9abbf4dfc6059f0a98cd218 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 11:38:20 +0200 Subject: [PATCH 022/646] refactoring fix --- templates/element/catalog/columns/column2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/element/catalog/columns/column2.php b/templates/element/catalog/columns/column2.php index 6935787562..03d9d5050b 100644 --- a/templates/element/catalog/columns/column2.php +++ b/templates/element/catalog/columns/column2.php @@ -47,7 +47,7 @@ if (!$appAuth->isOrderForDifferentCustomerMode() && !($product->manufacturer->stock_management_enabled && $product->is_stock_product)) { - $lastOrderDay = $this->Time->getLastOrderDay( + $lastOrderDay = DeliveryRhythm::getLastOrderDay( $product->next_delivery_day, $product->delivery_rhythm_type, $product->delivery_rhythm_count, From bfb9bd3011205c791b0bc1eb22e23593104707d6 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 11:48:50 +0200 Subject: [PATCH 023/646] fix --- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php index 147f48733b..e6228fbbeb 100644 --- a/src/Lib/DeliveryRhythm/DeliveryRhythm.php +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -39,13 +39,13 @@ public static function getDeliveryDateByCurrentDayForDb() public static function getNextWeeklyDeliveryDays($maxDays=52) { $nextDeliveryDay = self::getDeliveryDateByCurrentDayForDb(); - return Configure::read('app.htmlHelper')->getWeekdayFormatedDaysList($nextDeliveryDay, $maxDays, 7); + return Configure::read('app.timeHelper')->getWeekdayFormatedDaysList($nextDeliveryDay, $maxDays, 7); } public static function getNextDailyDeliveryDays($maxDays) { $nextDeliveryDay = Configure::read('app.timeHelper')->getTomorrowForDatabase(); - return Configure::read('app.htmlHelper')->getWeekdayFormatedDaysList($nextDeliveryDay, $maxDays, 1); + return Configure::read('app.timeHelper')->getWeekdayFormatedDaysList($nextDeliveryDay, $maxDays, 1); } public static function getDeliveryDayByCurrentDay() From 0f22a81d62ebdab69e089297af070a50e8b4e3f7 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 11:59:55 +0200 Subject: [PATCH 024/646] public --- src/View/Helper/MyTimeHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index 0abbaa9692..be382d3b49 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -142,7 +142,7 @@ public function getInXDaysForDatabase($days) return date(Configure::read('DateFormat.DatabaseAlt'), strtotime($this->getCurrentDateForDatabase() . ' +' . $days . ' days')); } - private function getWeekdayFormatedDaysList($day, $maxDays, $factor) + public function getWeekdayFormatedDaysList($day, $maxDays, $factor) { $days = [ $day => $this->getDateFormattedWithWeekday(strtotime($day)) From d536afb1031a70f46f69c9fd5cf6813e3f788b86 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 12:32:08 +0200 Subject: [PATCH 025/646] fix --- tests/TestCase/src/Controller/CartsControllerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestCase/src/Controller/CartsControllerTest.php b/tests/TestCase/src/Controller/CartsControllerTest.php index cf6a3a3a6b..d1f03c5de4 100644 --- a/tests/TestCase/src/Controller/CartsControllerTest.php +++ b/tests/TestCase/src/Controller/CartsControllerTest.php @@ -1021,7 +1021,7 @@ public function testInstantOrderOk() public function testInstantOrderWithDeliveryBreak() { - $this->changeConfiguration('FCS_NO_DELIVERY_DAYS_GLOBAL', Configure::read('app.timeHelper')->getDeliveryDateByCurrentDayForDb()); + $this->changeConfiguration('FCS_NO_DELIVERY_DAYS_GLOBAL', DeliveryRhythm::getDeliveryDateByCurrentDayForDb()); $this->loginAsSuperadmin(); $this->get($this->Slug->getOrderDetailsList().'/initInstantOrder/' . Configure::read('test.customerId')); $this->loginAsSuperadminAddOrderCustomerToSession($_SESSION); From 5b16b10ba25b39f9161e4b1ed6c4893ad4f96452 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 12:50:55 +0200 Subject: [PATCH 026/646] delivery day for saturday thursday config --- .../Table/ProductsTableDeliveryRhythmTest.php | 22 +++++++++- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 41 ++++++++----------- .../Lib/DeliveryRhythm/DeliveryRhythmTest.php | 3 +- 3 files changed, 37 insertions(+), 29 deletions(-) diff --git a/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php b/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php index 8711b1c7a8..e02cc3333e 100644 --- a/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php +++ b/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php @@ -85,7 +85,7 @@ public function test1WeekNormalNoFirstDeliveryDayWednesdayFriday() $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); } - public function xtest1WeekNormalNoFirstDeliveryDaySaturdayThursday() + public function test1WeekNormalNoFirstDeliveryDaySaturdayThursday() { $this->prepareSaturdayThursdayConfig(); $data = [ @@ -102,7 +102,25 @@ public function xtest1WeekNormalNoFirstDeliveryDaySaturdayThursday() $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); } - public function xtest1WeekNormalNoFirstDeliveryDaySaturdayThursdayWithSendOrderListDayOneDayBeforeDefault() + public function test2WeekDeliveryDaySaturdayThursday() + { + $this->prepareSaturdayThursdayConfig(); + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '2', + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2022-09-08'), + 'is_stock_product' => '0', + ] + ), + 'currentDay' => '2022-08-25', // thursday + 'result' => '2022-09-08', + ]; + $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); + } + + public function test1WeekNormalNoFirstDeliveryDaySaturdayThursdayWithSendOrderListDayOneDayBeforeDefault() { $this->prepareSaturdayThursdayConfig(); $data = [ diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php index e6228fbbeb..94ffbeada9 100644 --- a/src/Lib/DeliveryRhythm/DeliveryRhythm.php +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -111,34 +111,29 @@ public static function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, $deliveryRhythmCount = 1; } + if (is_null($sendOrderListsWeekday)) { + $sendOrderListsWeekday = self::getSendOrderListsWeekday(); + } + $daysToAddToOrderPeriodLastDay = self::getDaysToAddToOrderPeriodLastDay(); $deliveryDate = strtotime(self::getOrderPeriodLastDay($orderDay) . '+' . $daysToAddToOrderPeriodLastDay . ' days'); - $weekdayDeliveryDate = Configure::read('app.timeHelper')->formatAsWeekday($deliveryDate); - $weekdayStringDeliveryDate = strtolower(date('l', $deliveryDate)); - $weekdayOrderDay = Configure::read('app.timeHelper')->formatAsWeekday($orderDay); $weekdayOrderDay = $weekdayOrderDay % 7; - if (is_null($sendOrderListsWeekday)) { - $sendOrderListsWeekday = self::getSendOrderListsWeekday(); - } - - /* - $daysToAddToOrderPeriodLastDayMatrix = [ - 3 => [ - 2 => 5 => [] - ], - ]; - - $daysToAddToOrderPeriodLastDay = $daysToAddToOrderPeriodLastDayMatrix[$weekdayOrderDay][$weekdayDeliveryDate]; - */ + $weekdayDeliveryDate = Configure::read('app.timeHelper')->formatAsWeekday($deliveryDate); + $weekdayStringDeliveryDate = strtolower(date('l', $deliveryDate)); - // pr($weekdayOrderDay); - // pr($sendOrderListsWeekday); - // pr($weekdayDeliveryDate); + if (self::hasSaturdayThursdayConfig()) { + $calculateNextDeliveryDay = $weekdayOrderDay == 6 || ( + $weekdayOrderDay == 5 && $sendOrderListsWeekday == 5 + ); + } else { + $calculateNextDeliveryDay = $weekdayOrderDay >= $sendOrderListsWeekday + && $weekdayOrderDay <= $weekdayDeliveryDate; + } - if ($weekdayOrderDay >= $sendOrderListsWeekday && $weekdayOrderDay <= $weekdayDeliveryDate && $deliveryRhythmType != 'individual') { + if ($calculateNextDeliveryDay && $deliveryRhythmType != 'individual') { $preparedOrderDay = date(Configure::read('app.timeHelper')->getI18Format('DateShortAlt'), $orderDay); $deliveryDate = strtotime($preparedOrderDay . '+ ' . $deliveryRhythmCount . ' ' . $deliveryRhythmType . ' ' . $weekdayStringDeliveryDate); } @@ -211,11 +206,7 @@ public static function getOrderPeriodLastDay($day) public static function getDaysToAddToOrderPeriodLastDay() { - if (self::hasSaturdayThursdayConfig()) { - return 5; - } else { - return Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') + 1; - } + return Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') + 1; } public static function hasTuesdayFridayConfig() diff --git a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php index a233f39536..8489c543e4 100644 --- a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php +++ b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php @@ -37,7 +37,7 @@ public function testGetDeliveryDayTuesdayFriday() $this->assertGetDeliveryDay('25.07.2018', '03.08.2018'); } - public function xtestGetDeliveryDaySaturdayThursday() + public function testGetDeliveryDaySaturdayThursday() { $this->prepareSaturdayThursdayConfig(); $this->assertGetDeliveryDay('24.08.2022', '01.09.2022'); // wednesday @@ -317,5 +317,4 @@ private function assertGetLastOrderDay($product, $expected) $this->assertEquals($expected, $result); } - } From 061c749cf17a183a2b3a2f49f5159b547befaefc Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 12:57:22 +0200 Subject: [PATCH 027/646] custom logic for hasSaturdayThursdayConfig --- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php index 94ffbeada9..ed4baa6613 100644 --- a/src/Lib/DeliveryRhythm/DeliveryRhythm.php +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -149,13 +149,13 @@ public static function getOrderPeriodFirstDay($day) $date = strtotime('-' . $dateDiff . ' day ', $day); if (self::hasSaturdayThursdayConfig()) { - if (in_array($currentWeekday, [6,7]) && self::getDeliveryWeekday()) { - $date = strtotime('+7 day', $date); - } + $addOneWeekCondition = in_array($currentWeekday, [6,7]) && self::getDeliveryWeekday(); } else { - if ($currentWeekday > self::getDeliveryWeekday()) { - $date = strtotime('+7 day', $date); - } + $addOneWeekCondition = $currentWeekday > self::getDeliveryWeekday(); + } + + if ($addOneWeekCondition) { + $date = strtotime('+7 day', $date); } $date = date(Configure::read('app.timeHelper')->getI18Format('DateShortAlt'), $date); From 578a2f390bc29edfc825a21b64dbe05bdc185151 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 13:39:56 +0200 Subject: [PATCH 028/646] remove unused configs --- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 25 ----------------------- 1 file changed, 25 deletions(-) diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php index ed4baa6613..0921fd03ff 100644 --- a/src/Lib/DeliveryRhythm/DeliveryRhythm.php +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -209,31 +209,6 @@ public static function getDaysToAddToOrderPeriodLastDay() return Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') + 1; } - public static function hasTuesdayFridayConfig() - { - return self::compareConfig(5, 3); - } - - public static function hasWednesdayFridayConfig() - { - return self::compareConfig(5, 2); - } - - public static function hasThursdayFridayConfig() - { - return self::compareConfig(5, 1); - } - - public static function hasMondayTuesdayConfig() - { - return self::compareConfig(2, 1); - } - - public static function hasMondayThursdayConfig() - { - return self::compareConfig(4, 3); - } - public static function hasSaturdayThursdayConfig() { return self::compareConfig(4, 5); From a97b48456a8cb6d487912a6cb28c8f22ac9237cd Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sat, 27 Aug 2022 14:39:27 +0200 Subject: [PATCH 029/646] corrected date for sending orderlists --- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 12 ++++++++++++ src/Shell/SendOrderListsShell.php | 2 +- .../src/Lib/DeliveryRhythm/DeliveryRhythmTest.php | 14 ++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php index 0921fd03ff..2a823cb3b9 100644 --- a/src/Lib/DeliveryRhythm/DeliveryRhythm.php +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -102,6 +102,18 @@ public static function getNextDeliveryDay($day) return date(Configure::read('app.timeHelper')->getI18Format('DatabaseAlt'), self::getDeliveryDay(strtotime($orderPeriodFirstDay))); } + public static function getDeliveryDayForSendOrderListsCronjob($day) + { + $deliveryDay = self::getNextDeliveryDay($day); + if (self::hasSaturdayThursdayConfig()) { + $deliveryDay = date( + Configure::read('app.timeHelper')->getI18Format('DatabaseAlt'), + strtotime($deliveryDay . '-7 days'), + ); + } + return $deliveryDay; + } + public static function getDeliveryDay($orderDay, $sendOrderListsWeekday = null, $deliveryRhythmType = null, $deliveryRhythmCount = null) { if (is_null($deliveryRhythmType)) { diff --git a/src/Shell/SendOrderListsShell.php b/src/Shell/SendOrderListsShell.php index f4db7ace0a..bea91e99b3 100644 --- a/src/Shell/SendOrderListsShell.php +++ b/src/Shell/SendOrderListsShell.php @@ -40,7 +40,7 @@ public function main() if (Configure::read('appDb.FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY')) { $pickupDay = $this->cronjobRunDay; } else { - $pickupDay = DeliveryRhythm::getNextDeliveryDay(strtotime($this->cronjobRunDay)); + $pickupDay = DeliveryRhythm::getDeliveryDayForSendOrderListsCronjob(strtotime($this->cronjobRunDay)); } // 1) get all manufacturers (not only active ones) diff --git a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php index 8489c543e4..eb1bcf0b88 100644 --- a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php +++ b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php @@ -219,6 +219,20 @@ public function testGetFormattedNextDeliveryDayWednesdayFriday() $this->assertGetFormattedNextDeliveryDay('16.10.2018', '19.10.2018'); // tuesday } + public function testGetFormattedNextDeliveryDaySaturdayThursday() + { + $this->prepareSaturdayThursdayConfig(); + $this->assertGetFormattedNextDeliveryDay('08.10.2018', '12.10.2018'); // monday + $this->assertGetFormattedNextDeliveryDay('09.10.2018', '12.10.2018'); // tuesday + $this->assertGetFormattedNextDeliveryDay('10.10.2018', '12.10.2018'); // wednesday + $this->assertGetFormattedNextDeliveryDay('11.10.2018', '12.10.2018'); // thursday + $this->assertGetFormattedNextDeliveryDay('12.10.2018', '12.10.2018'); // friday + $this->assertGetFormattedNextDeliveryDay('13.10.2018', '19.10.2018'); // saturday + $this->assertGetFormattedNextDeliveryDay('14.10.2018', '19.10.2018'); // sunday + $this->assertGetFormattedNextDeliveryDay('15.10.2018', '19.10.2018'); // monday + $this->assertGetFormattedNextDeliveryDay('16.10.2018', '19.10.2018'); // tuesday + } + public function testGetLastOrderDayWeeklySendOrderListsDayNormal() { $product = [ From 20cc84a00511138cc8ef4f58e143f3dc051e3f78 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 14:47:53 +0200 Subject: [PATCH 030/646] tests --- .../Lib/DeliveryRhythm/DeliveryRhythmTest.php | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php index eb1bcf0b88..11b8d3406b 100644 --- a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php +++ b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php @@ -222,15 +222,26 @@ public function testGetFormattedNextDeliveryDayWednesdayFriday() public function testGetFormattedNextDeliveryDaySaturdayThursday() { $this->prepareSaturdayThursdayConfig(); - $this->assertGetFormattedNextDeliveryDay('08.10.2018', '12.10.2018'); // monday - $this->assertGetFormattedNextDeliveryDay('09.10.2018', '12.10.2018'); // tuesday - $this->assertGetFormattedNextDeliveryDay('10.10.2018', '12.10.2018'); // wednesday - $this->assertGetFormattedNextDeliveryDay('11.10.2018', '12.10.2018'); // thursday - $this->assertGetFormattedNextDeliveryDay('12.10.2018', '12.10.2018'); // friday - $this->assertGetFormattedNextDeliveryDay('13.10.2018', '19.10.2018'); // saturday - $this->assertGetFormattedNextDeliveryDay('14.10.2018', '19.10.2018'); // sunday - $this->assertGetFormattedNextDeliveryDay('15.10.2018', '19.10.2018'); // monday - $this->assertGetFormattedNextDeliveryDay('16.10.2018', '19.10.2018'); // tuesday + $this->assertGetFormattedNextDeliveryDay('22.08.2022', '01.09.2022'); // monday + $this->assertGetFormattedNextDeliveryDay('23.08.2022', '01.09.2022'); // tuesday + $this->assertGetFormattedNextDeliveryDay('24.08.2022', '01.09.2022'); // wednesday + $this->assertGetFormattedNextDeliveryDay('25.08.2022', '01.09.2022'); // thursday + $this->assertGetFormattedNextDeliveryDay('26.08.2022', '01.09.2022'); // friday + $this->assertGetFormattedNextDeliveryDay('27.08.2022', '08.09.2022'); // saturday + $this->assertGetFormattedNextDeliveryDay('28.08.2022', '08.09.2022'); // sunday + $this->assertGetFormattedNextDeliveryDay('29.08.2022', '08.09.2022'); // monday + $this->assertGetFormattedNextDeliveryDay('30.08.2022', '08.09.2022'); // tuesday + } + + public function testGetDeliveryDayForSendOrderListsCronjobWednesdayFriday() + { + $this->assertGetDeliveryDayForSendOrderListsCronjob('24.08.2022', '2022-08-26'); // wednesday + } + + public function testGetDeliveryDayForSendOrderListsCronjobSaturdayThursday() + { + $this->prepareSaturdayThursdayConfig(); + $this->assertGetDeliveryDayForSendOrderListsCronjob('27.08.2022', '2022-09-01'); // saturday } public function testGetLastOrderDayWeeklySendOrderListsDayNormal() @@ -319,6 +330,12 @@ private function assertGetFormattedNextDeliveryDay($currentDay, $expected) $this->assertEquals($expected, $result); } + private function assertGetDeliveryDayForSendOrderListsCronjob($currentDay, $expected) + { + $result = DeliveryRhythm::getDeliveryDayForSendOrderListsCronjob(strtotime($currentDay)); + $this->assertEquals($expected, $result); + } + private function assertGetLastOrderDay($product, $expected) { $result = DeliveryRhythm::getLastOrderDay( From 61381505139b3aa6c5b4bdc49e4741c697b62ff8 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 21:34:47 +0200 Subject: [PATCH 031/646] corrected next delivery day --- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 7 +--- src/Shell/SendOrderListsShell.php | 2 +- .../Lib/DeliveryRhythm/DeliveryRhythmTest.php | 35 +++++-------------- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php index 2a823cb3b9..86f086177d 100644 --- a/src/Lib/DeliveryRhythm/DeliveryRhythm.php +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -99,12 +99,7 @@ public static function getFormattedNextDeliveryDay($day) public static function getNextDeliveryDay($day) { $orderPeriodFirstDay = self::getOrderPeriodFirstDay($day); - return date(Configure::read('app.timeHelper')->getI18Format('DatabaseAlt'), self::getDeliveryDay(strtotime($orderPeriodFirstDay))); - } - - public static function getDeliveryDayForSendOrderListsCronjob($day) - { - $deliveryDay = self::getNextDeliveryDay($day); + $deliveryDay = date(Configure::read('app.timeHelper')->getI18Format('DatabaseAlt'), self::getDeliveryDay(strtotime($orderPeriodFirstDay))); if (self::hasSaturdayThursdayConfig()) { $deliveryDay = date( Configure::read('app.timeHelper')->getI18Format('DatabaseAlt'), diff --git a/src/Shell/SendOrderListsShell.php b/src/Shell/SendOrderListsShell.php index bea91e99b3..f4db7ace0a 100644 --- a/src/Shell/SendOrderListsShell.php +++ b/src/Shell/SendOrderListsShell.php @@ -40,7 +40,7 @@ public function main() if (Configure::read('appDb.FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY')) { $pickupDay = $this->cronjobRunDay; } else { - $pickupDay = DeliveryRhythm::getDeliveryDayForSendOrderListsCronjob(strtotime($this->cronjobRunDay)); + $pickupDay = DeliveryRhythm::getNextDeliveryDay(strtotime($this->cronjobRunDay)); } // 1) get all manufacturers (not only active ones) diff --git a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php index 11b8d3406b..6187a145bb 100644 --- a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php +++ b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php @@ -222,26 +222,15 @@ public function testGetFormattedNextDeliveryDayWednesdayFriday() public function testGetFormattedNextDeliveryDaySaturdayThursday() { $this->prepareSaturdayThursdayConfig(); - $this->assertGetFormattedNextDeliveryDay('22.08.2022', '01.09.2022'); // monday - $this->assertGetFormattedNextDeliveryDay('23.08.2022', '01.09.2022'); // tuesday - $this->assertGetFormattedNextDeliveryDay('24.08.2022', '01.09.2022'); // wednesday - $this->assertGetFormattedNextDeliveryDay('25.08.2022', '01.09.2022'); // thursday - $this->assertGetFormattedNextDeliveryDay('26.08.2022', '01.09.2022'); // friday - $this->assertGetFormattedNextDeliveryDay('27.08.2022', '08.09.2022'); // saturday - $this->assertGetFormattedNextDeliveryDay('28.08.2022', '08.09.2022'); // sunday - $this->assertGetFormattedNextDeliveryDay('29.08.2022', '08.09.2022'); // monday - $this->assertGetFormattedNextDeliveryDay('30.08.2022', '08.09.2022'); // tuesday - } - - public function testGetDeliveryDayForSendOrderListsCronjobWednesdayFriday() - { - $this->assertGetDeliveryDayForSendOrderListsCronjob('24.08.2022', '2022-08-26'); // wednesday - } - - public function testGetDeliveryDayForSendOrderListsCronjobSaturdayThursday() - { - $this->prepareSaturdayThursdayConfig(); - $this->assertGetDeliveryDayForSendOrderListsCronjob('27.08.2022', '2022-09-01'); // saturday + $this->assertGetFormattedNextDeliveryDay('22.08.2022', '25.08.2022'); // monday + $this->assertGetFormattedNextDeliveryDay('23.08.2022', '25.08.2022'); // tuesday + $this->assertGetFormattedNextDeliveryDay('24.08.2022', '25.08.2022'); // wednesday + $this->assertGetFormattedNextDeliveryDay('25.08.2022', '25.08.2022'); // thursday + $this->assertGetFormattedNextDeliveryDay('26.08.2022', '25.08.2022'); // friday + $this->assertGetFormattedNextDeliveryDay('27.08.2022', '01.09.2022'); // saturday + $this->assertGetFormattedNextDeliveryDay('28.08.2022', '01.09.2022'); // sunday + $this->assertGetFormattedNextDeliveryDay('29.08.2022', '01.09.2022'); // monday + $this->assertGetFormattedNextDeliveryDay('30.08.2022', '01.09.2022'); // tuesday } public function testGetLastOrderDayWeeklySendOrderListsDayNormal() @@ -330,12 +319,6 @@ private function assertGetFormattedNextDeliveryDay($currentDay, $expected) $this->assertEquals($expected, $result); } - private function assertGetDeliveryDayForSendOrderListsCronjob($currentDay, $expected) - { - $result = DeliveryRhythm::getDeliveryDayForSendOrderListsCronjob(strtotime($currentDay)); - $this->assertEquals($expected, $result); - } - private function assertGetLastOrderDay($product, $expected) { $result = DeliveryRhythm::getLastOrderDay( From b1cf7ce072d8842fb8abe41eafd082b7d02852a8 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 21:37:02 +0200 Subject: [PATCH 032/646] formated vs formatted --- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 4 ++-- src/Queue/Task/GenerateOrderListTask.php | 8 +++---- src/Shell/SendOrderListsShell.php | 14 ++++++------ src/View/Helper/MyTimeHelper.php | 2 +- .../src/Shell/SendOrderListsShellTest.php | 22 +++++++++---------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php index 86f086177d..67d2d305cd 100644 --- a/src/Lib/DeliveryRhythm/DeliveryRhythm.php +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -39,13 +39,13 @@ public static function getDeliveryDateByCurrentDayForDb() public static function getNextWeeklyDeliveryDays($maxDays=52) { $nextDeliveryDay = self::getDeliveryDateByCurrentDayForDb(); - return Configure::read('app.timeHelper')->getWeekdayFormatedDaysList($nextDeliveryDay, $maxDays, 7); + return Configure::read('app.timeHelper')->getWeekdayFormattedDaysList($nextDeliveryDay, $maxDays, 7); } public static function getNextDailyDeliveryDays($maxDays) { $nextDeliveryDay = Configure::read('app.timeHelper')->getTomorrowForDatabase(); - return Configure::read('app.timeHelper')->getWeekdayFormatedDaysList($nextDeliveryDay, $maxDays, 1); + return Configure::read('app.timeHelper')->getWeekdayFormattedDaysList($nextDeliveryDay, $maxDays, 1); } public static function getDeliveryDayByCurrentDay() diff --git a/src/Queue/Task/GenerateOrderListTask.php b/src/Queue/Task/GenerateOrderListTask.php index 9b8fe360de..7a3633b0d8 100644 --- a/src/Queue/Task/GenerateOrderListTask.php +++ b/src/Queue/Task/GenerateOrderListTask.php @@ -37,7 +37,7 @@ public function run(array $data, $jobId) : void { $pickupDayDbFormat = $data['pickupDayDbFormat']; - $pickupDayFormated = $data['pickupDayFormated']; + $pickupDayFormatted = $data['pickupDayFormatted']; $manufacturerId = $data['manufacturerId']; $orderDetailIds = $data['orderDetailIds']; $actionLogId = $data['actionLogId']; @@ -82,7 +82,7 @@ public function run(array $data, $jobId) : void $productPdfFile, $customerPdfFile, ]) - ->setSubject(__('Order_lists_for_the_day') . ' ' . $pickupDayFormated) + ->setSubject(__('Order_lists_for_the_day') . ' ' . $pickupDayFormatted) ->setViewVars([ 'manufacturer' => $manufacturer, 'showManufacturerUnsubscribeLink' => true, @@ -92,7 +92,7 @@ public function run(array $data, $jobId) : void } $email->afterRunParams = [ - 'actionLogIdentifier' => 'send-order-list-' . $manufacturerId . '-' . $pickupDayFormated, + 'actionLogIdentifier' => 'send-order-list-' . $manufacturerId . '-' . $pickupDayFormatted, 'actionLogId' => $actionLogId, 'manufacturerId' => $manufacturerId, 'orderDetailIds' => $orderDetailIds, @@ -101,7 +101,7 @@ public function run(array $data, $jobId) : void } - $actionLogIdentifier = 'generate-order-list-' . $manufacturerId . '-' . $pickupDayFormated; + $actionLogIdentifier = 'generate-order-list-' . $manufacturerId . '-' . $pickupDayFormatted; $this->updateActionLogSuccess($actionLogId, $actionLogIdentifier, $jobId); } diff --git a/src/Shell/SendOrderListsShell.php b/src/Shell/SendOrderListsShell.php index f4db7ace0a..ec5493ee79 100644 --- a/src/Shell/SendOrderListsShell.php +++ b/src/Shell/SendOrderListsShell.php @@ -113,15 +113,15 @@ public function main() continue; } - $pickupDayFormated = new FrozenDate($pickupDayDbFormat); - $pickupDayFormated = $pickupDayFormated->i18nFormat( + $pickupDayFormatted = new FrozenDate($pickupDayDbFormat); + $pickupDayFormatted = $pickupDayFormatted->i18nFormat( Configure::read('app.timeHelper')->getI18Format('DateLong2') ); $orderDetailIds = Hash::extract($orderDetails, '{n}.id_order_detail'); $this->QueuedJobs->createJob('GenerateOrderList', [ 'pickupDayDbFormat' => $pickupDayDbFormat, - 'pickupDayFormated' => $pickupDayFormated, + 'pickupDayFormatted' => $pickupDayFormatted, 'orderDetailIds' => $orderDetailIds, 'manufacturerId' => $manufacturer->id_manufacturer, 'manufactuerName' => $manufacturer->name, @@ -172,15 +172,15 @@ protected function getActionLogData($orderDetails, $manufacturers, $pickupDay): if (in_array($manufacturer->id_manufacturer, array_keys($tmpActionLogDatas))) { ksort($tmpActionLogDatas[$manufacturer->id_manufacturer]); foreach($tmpActionLogDatas[$manufacturer->id_manufacturer] as $pickupDayDbFormat => $tmpActionLogData) { - $pickupDayFormated = new FrozenDate($pickupDayDbFormat); - $pickupDayFormated = $pickupDayFormated->i18nFormat(Configure::read('app.timeHelper')->getI18Format('DateLong2')); - $identifier = $manufacturer->id_manufacturer . '-' . $pickupDayFormated; + $pickupDayFormatted = new FrozenDate($pickupDayDbFormat); + $pickupDayFormatted = $pickupDayFormatted->i18nFormat(Configure::read('app.timeHelper')->getI18Format('DateLong2')); + $identifier = $manufacturer->id_manufacturer . '-' . $pickupDayFormatted; $newData = '- '; $newData .= html_entity_decode($manufacturer->name) . ': ' . __('{0,plural,=1{1_product} other{#_products}}', [$tmpActionLogData['order_detail_amount_sum']]) . ' / ' . Configure::read('app.numberHelper')->formatAsCurrency($tmpActionLogData['order_detail_price_sum']); if ($pickupDayDbFormat != $pickupDay) { - $newData .= ' / ' . __('Delivery_day') . ': ' . $pickupDayFormated; + $newData .= ' / ' . __('Delivery_day') . ': ' . $pickupDayFormatted; } $actionLogDatas[] = $newData; } diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index be382d3b49..f5ff6452af 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -142,7 +142,7 @@ public function getInXDaysForDatabase($days) return date(Configure::read('DateFormat.DatabaseAlt'), strtotime($this->getCurrentDateForDatabase() . ' +' . $days . ' days')); } - public function getWeekdayFormatedDaysList($day, $maxDays, $factor) + public function getWeekdayFormattedDaysList($day, $maxDays, $factor) { $days = [ $day => $this->getDateFormattedWithWeekday(strtotime($day)) diff --git a/tests/TestCase/src/Shell/SendOrderListsShellTest.php b/tests/TestCase/src/Shell/SendOrderListsShellTest.php index 66e9507a58..cde2f73a25 100644 --- a/tests/TestCase/src/Shell/SendOrderListsShellTest.php +++ b/tests/TestCase/src/Shell/SendOrderListsShellTest.php @@ -81,16 +81,16 @@ public function testSendOrderListsIfOneOrderAvailable() $this->assertMailCount(2); - $pickupDayFormated = new FrozenDate($pickupDay); - $pickupDayFormated = $pickupDayFormated->i18nFormat( + $pickupDayFormatted = new FrozenDate($pickupDay); + $pickupDayFormatted = $pickupDayFormatted->i18nFormat( Configure::read('app.timeHelper')->getI18Format('DateLong2') ); - $this->assertMailSubjectContainsAt(1, 'Bestellungen für den ' . $pickupDayFormated); + $this->assertMailSubjectContainsAt(1, 'Bestellungen für den ' . $pickupDayFormatted); $this->assertMailContainsAt(1, 'im Anhang findest du zwei Bestelllisten'); - $pickupDayFormated = new FrozenDate($pickupDay); - $pickupDayFormated = $pickupDayFormated->i18nFormat( + $pickupDayFormatted = new FrozenDate($pickupDay); + $pickupDayFormatted = $pickupDayFormatted->i18nFormat( Configure::read('app.timeHelper')->getI18Format('DateLong2') ); $this->assertEquals(2, count(TestEmailTransport::getMessages()[1]->getAttachments())); @@ -111,12 +111,12 @@ public function testSendOrderListsIfMoreOrdersAvailable() $this->assertMailCount(3); - $pickupDayFormated = new FrozenDate($pickupDay); - $pickupDayFormated = $pickupDayFormated->i18nFormat( + $pickupDayFormatted = new FrozenDate($pickupDay); + $pickupDayFormatted = $pickupDayFormatted->i18nFormat( Configure::read('app.timeHelper')->getI18Format('DateLong2') ); - $this->assertMailSubjectContainsAt(1, 'Bestellungen für den ' . $pickupDayFormated); + $this->assertMailSubjectContainsAt(1, 'Bestellungen für den ' . $pickupDayFormatted); $this->assertMailContainsAt(1, 'im Anhang findest du zwei Bestelllisten'); $this->assertEquals(2, count(TestEmailTransport::getMessages()[1]->getAttachments())); @@ -140,12 +140,12 @@ public function testSendOrderListsWithSendOrderListFalse() $this->assertMailCount(2); - $pickupDayFormated = new FrozenDate($pickupDay); - $pickupDayFormated = $pickupDayFormated->i18nFormat( + $pickupDayFormatted = new FrozenDate($pickupDay); + $pickupDayFormatted = $pickupDayFormatted->i18nFormat( Configure::read('app.timeHelper')->getI18Format('DateLong2') ); - $this->assertMailSubjectContainsAt(1, 'Bestellungen für den ' . $pickupDayFormated); + $this->assertMailSubjectContainsAt(1, 'Bestellungen für den ' . $pickupDayFormatted); $this->assertMailContainsAt(1, 'im Anhang findest du zwei Bestelllisten'); $this->assertEquals(2, count(TestEmailTransport::getMessages()[1]->getAttachments())); From 1fb0fd367e91ed8d33eb6a78c9aa537417f9fe1a Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 21:58:58 +0200 Subject: [PATCH 033/646] refactoring --- .../Table/ProductsTableDeliveryRhythmTest.php | 613 ------------------ src/Controller/Component/CartComponent.php | 3 +- src/Lib/Catalog/Catalog.php | 5 +- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 97 +++ src/Model/Table/CartProductsTable.php | 7 +- src/Model/Table/CartsTable.php | 2 +- src/Model/Table/ProductsTable.php | 99 +-- .../ProductsFrontendControllerTest.php | 2 +- .../Lib/DeliveryRhythm/DeliveryRhythmTest.php | 576 ++++++++++++++++ 9 files changed, 684 insertions(+), 720 deletions(-) delete mode 100644 plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php diff --git a/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php b/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php deleted file mode 100644 index e02cc3333e..0000000000 --- a/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableDeliveryRhythmTest.php +++ /dev/null @@ -1,613 +0,0 @@ - - * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com - * @link https://www.foodcoopshop.com - */ -class ProductsTableDeliveryRhythmTest extends AppCakeTestCase -{ - - use AppIntegrationTestTrait; - use DeliveryRhythmConfigsTrait; - use LoginTrait; - - public $Product; - - public function setUp(): void - { - parent::setUp(); - $this->Product = $this->getTableLocator()->get('Products'); - } - - public function test1WeekWithFirstDeliveryDayAllowOrdersConfigOff() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '1', - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-11-02'), - 'is_stock_product' => '0' - ] - ), - 'currentDay' => '2018-10-07', - 'result' => '2018-11-02' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test1WeekWithFirstDeliveryDayAllowOrdersConfigOn() - { - $this->changeConfiguration('FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY', 1); - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '1', - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-11-02'), - 'is_stock_product' => '0' - ] - ), - 'currentDay' => '2018-10-07', - 'result' => 'delivery-rhythm-triggered-delivery-break', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test1WeekNormalNoFirstDeliveryDayWednesdayFriday() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '1', - 'is_stock_product' => '0' - ] - ), - 'currentDay' => '2018-10-07', - 'result' => '2018-10-12' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test1WeekNormalNoFirstDeliveryDaySaturdayThursday() - { - $this->prepareSaturdayThursdayConfig(); - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '1', - 'is_stock_product' => '0' - ] - ), - 'currentDay' => '2022-08-26', // friday - 'result' => '2022-09-01', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test2WeekDeliveryDaySaturdayThursday() - { - $this->prepareSaturdayThursdayConfig(); - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '2', - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2022-09-08'), - 'is_stock_product' => '0', - ] - ), - 'currentDay' => '2022-08-25', // thursday - 'result' => '2022-09-08', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test1WeekNormalNoFirstDeliveryDaySaturdayThursdayWithSendOrderListDayOneDayBeforeDefault() - { - $this->prepareSaturdayThursdayConfig(); - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '1', - 'is_stock_product' => '0', - 'delivery_rhythm_send_order_list_weekday' => 5, - ] - ), - 'currentDay' => '2022-08-26', - 'result' => '2022-09-08', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test1WeekWithSendOrderListDayOneDayBeforeDefault() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '1', - 'is_stock_product' => '0', - 'delivery_rhythm_send_order_list_weekday' => 2 - ] - ), - 'currentDay' => '2017-08-08', - 'result' => '2017-08-18' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test1WeekWithSendOrderListDayTwoDaysBeforeDefault() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '1', - 'is_stock_product' => '0', - 'delivery_rhythm_send_order_list_weekday' => 1 - ] - ), - 'currentDay' => '2020-04-05', - 'result' => '2020-04-10' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test2WeekWithSendOrderListDayTwoDaysBeforeDefaultAndChangedSendOrderListsDayDeltaAllowOrdersConfigOff() - { - $this->changeConfiguration('FCS_SEND_FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 3); - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '2', - 'is_stock_product' => '0', - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2021-02-05'), - 'delivery_rhythm_send_order_list_weekday' => 0, - ] - ), - 'currentDay' => '2021-08-01', - 'result' => '2021-08-20', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test2WeekWithSendOrderListDayTwoDaysBeforeDefaultAndChangedSendOrderListsDayDeltaAllowOrdersConfigOn() - { - $this->changeConfiguration('FCS_SEND_FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 3); - $this->changeConfiguration('FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY', 1); - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '2', - 'is_stock_product' => '0', - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2021-02-05'), - 'delivery_rhythm_send_order_list_weekday' => 0, - ] - ), - 'currentDay' => '2021-08-01', - 'result' => 'delivery-rhythm-triggered-delivery-break', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test1WeekWithSendOrderListDayMondayAllowOrdersConfigOff() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '1', - 'is_stock_product' => '0', - 'delivery_rhythm_send_order_list_weekday' => 1, - ] - ), - 'currentDay' => '2022-02-01', - 'result' => '2022-02-11', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test1WeekWithSendOrderListDayMondayAllowOrdersConfigOn() - { - $this->changeConfiguration('FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY', 1); - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '1', - 'is_stock_product' => '0', - 'delivery_rhythm_send_order_list_weekday' => 1, - ] - ), - 'currentDay' => '2022-02-01', - 'result' => 'delivery-rhythm-triggered-delivery-break', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test2WeekWithSendOrderListDayMondayAllowOrdersConfigOff() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '2', - 'is_stock_product' => '0', - 'delivery_rhythm_send_order_list_weekday' => 1, - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2019-03-01') - ] - ), - 'currentDay' => '2019-02-25', - 'result' => '2019-03-15', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test2WeekWithSendOrderListDayMondayAllowOrdersConfigOn() - { - $this->changeConfiguration('FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY', 1); - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '2', - 'is_stock_product' => '0', - 'delivery_rhythm_send_order_list_weekday' => 1, - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2019-03-01') - ] - ), - 'currentDay' => '2019-02-25', - 'result' => 'delivery-rhythm-triggered-delivery-break', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test2WeekWithSendOrderListDayThursday() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '2', - 'is_stock_product' => '0', - 'delivery_rhythm_send_order_list_weekday' => 4, - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2019-03-01') - ] - ), - 'currentDay' => '2019-03-08', - 'result' => '2019-03-15' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test1MonthFirstFridayWithSendOrderListDaySunday() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'month', - 'delivery_rhythm_count' => '1', - 'is_stock_product' => '0', - 'delivery_rhythm_send_order_list_weekday' => 1, - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2020-10-02') - ] - ), - 'currentDay' => '2020-09-28', - 'result' => '2020-11-06' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test2WeekNotCurrentWeekAAllowOrderConfigOff() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '2', - 'is_stock_product' => '0', - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-08-10') - ] - ), - 'currentDay' => '2018-08-14', - 'result' => '2018-08-24', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test2WeekNotCurrentWeekAAllowOrderConfigOn() - { - $this->changeConfiguration('FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY', 1); - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '2', - 'is_stock_product' => '0', - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-08-10') - ] - ), - 'currentDay' => '2018-08-14', - 'result' => 'delivery-rhythm-triggered-delivery-break', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test2WeekNotCurrentWeekBAllowOrderConfigOff() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '2', - 'is_stock_product' => '0', - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-07-06') - ] - ), - 'currentDay' => '2018-09-15', - 'result' => '2018-09-28', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test2WeekNotCurrentWeekBAllowOrderConfigOn() - { - $this->changeConfiguration('FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY', 1); - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '2', - 'is_stock_product' => '0', - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-07-06') - ] - ), - 'currentDay' => '2018-09-15', - 'result' => 'delivery-rhythm-triggered-delivery-break', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test2WeekCurrentWeekAllowOrderConfigOff() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '2', - 'is_stock_product' => '0', - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-08-03') - ] - ), - 'currentDay' => '2018-08-14', - 'result' => '2018-08-17', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test2WeekCurrentWeekAllowOrderConfigOn() - { - $this->changeConfiguration('FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY', 1); - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '2', - 'is_stock_product' => '0', - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-08-03') - ] - ), - 'currentDay' => '2018-08-14', - 'result' => '2018-08-17', - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test2WeekD() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '2', - 'is_stock_product' => '0', - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2019-03-22') - ] - ), - 'currentDay' => '2019-03-15', - 'result' => '2019-03-22' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test4Week() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'week', - 'delivery_rhythm_count' => '4', - 'is_stock_product' => '0', - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-08-03') - ] - ), - 'currentDay' => '2018-08-07', - 'result' => '2018-08-31' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test1MonthFirstWeekdayOfMonthA() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'month', - 'delivery_rhythm_count' => '1', - 'is_stock_product' => '0', - ] - ), - 'currentDay' => '2017-08-07', - 'result' => '2017-09-01' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function testFirstWeekdayOfMonthB() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'month', - 'delivery_rhythm_count' => '1', - 'is_stock_product' => '1', - ] - ), - 'currentDay' => '2017-08-07', - 'result' => '2017-08-11' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function testLastMonthLastWeekdayOfMonthA() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'month', - 'delivery_rhythm_count' => '0', - 'is_stock_product' => '0', - ] - ), - 'currentDay' => '2018-09-13', - 'result' => '2018-09-28' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function testLastMonthLastWeekdayOfMonthB() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'month', - 'delivery_rhythm_count' => '0', - 'is_stock_product' => '0', - ] - ), - 'currentDay' => '2018-08-07', - 'result' => '2018-08-31' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function testLastMonthLastWeekdayOfMonthC() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2021-02-26'), - 'delivery_rhythm_type' => 'month', - 'delivery_rhythm_count' => '0', - 'is_stock_product' => '0', - ] - ), - 'currentDay' => '2021-01-20', - 'result' => '2021-02-26' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test2Month() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'month', - 'delivery_rhythm_count' => '2', - 'is_stock_product' => '0', - ] - ), - 'currentDay' => '2020-11-20', - 'result' => '2020-12-11' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test3Month() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'month', - 'delivery_rhythm_count' => '3', - 'is_stock_product' => '0', - ] - ), - 'currentDay' => '2020-11-20', - 'result' => '2020-12-18' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function test4Month() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'month', - 'delivery_rhythm_count' => '4', - 'is_stock_product' => '0', - ] - ), - 'currentDay' => '2020-11-30', - 'result' => '2020-12-25' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - public function testIndividual() - { - $data = [ - 'product' => $this->Product->newEntity( - [ - 'delivery_rhythm_type' => 'individual', - 'delivery_rhythm_count' => '0', - 'is_stock_product' => '0', - 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-08-03') - ] - ), - 'currentDay' => '2017-08-07', - 'result' => '2018-08-03' - ]; - $this->assertPickupDay($data['product'], $data['currentDay'], $data['result']); - } - - private function assertPickupDay($product, $currentDay, $expectedResult) - { - $result = $this->Product->calculatePickupDayRespectingDeliveryRhythm($product, $currentDay); - $this->assertEquals($expectedResult, $result); - } - -} diff --git a/src/Controller/Component/CartComponent.php b/src/Controller/Component/CartComponent.php index 585351dda6..52ec280ad5 100644 --- a/src/Controller/Component/CartComponent.php +++ b/src/Controller/Component/CartComponent.php @@ -12,6 +12,7 @@ use Cake\Core\Configure; use Cake\I18n\FrozenDate; use Cake\Datasource\FactoryLocator; +use App\Lib\DeliveryRhythm\DeliveryRhythm; /** * FoodCoopShop - The open source software for your foodcoop @@ -215,7 +216,7 @@ public function finish() 'contain' => $contain, ])->first(); - $product->next_delivery_day = $this->Product->getNextDeliveryDay($product, $this->AppAuth); + $product->next_delivery_day = DeliveryRhythm::getNextDeliveryDayForProduct($product, $this->AppAuth); $products[] = $product; $stockAvailableQuantity = $product->stock_available->quantity; diff --git a/src/Lib/Catalog/Catalog.php b/src/Lib/Catalog/Catalog.php index ef214c742a..37f21af385 100644 --- a/src/Lib/Catalog/Catalog.php +++ b/src/Lib/Catalog/Catalog.php @@ -14,6 +14,7 @@ */ namespace App\Lib\Catalog; +use App\Lib\DeliveryRhythm\DeliveryRhythm; use Cake\Cache\Cache; use Cake\Core\Configure; use Cake\Database\Query; @@ -387,7 +388,7 @@ protected function hideProductsWithActivatedDeliveryRhythmOrDeliveryBreak($appAu $i = -1; foreach($products as $product) { $i++; - $deliveryDate = $this->Product->calculatePickupDayRespectingDeliveryRhythm($product); + $deliveryDate = DeliveryRhythm::getNextPickupDayForProduct($product); // deactivates the product if it can not be ordered this week if ($deliveryDate == 'delivery-rhythm-triggered-delivery-break') { @@ -479,7 +480,7 @@ public function prepareProducts($appAuth, $products) $products[$i]->deposit_product->deposit = 0; } - $products[$i]->next_delivery_day = $this->Product->getNextDeliveryDay($product, $appAuth); + $products[$i]->next_delivery_day = DeliveryRhythm::getNextDeliveryDayForProduct($product, $appAuth); foreach ($product->product_attributes as &$attribute) { diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php index 67d2d305cd..eee77af0e1 100644 --- a/src/Lib/DeliveryRhythm/DeliveryRhythm.php +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -211,6 +211,103 @@ public static function getOrderPeriodLastDay($day) return $date; } + public static function getNextDeliveryDayForProduct($product, $appAuth) + { + if (Configure::read('appDb.FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY')) { + $nextDeliveryDay = '1970-01-01'; + } elseif ($appAuth->isOrderForDifferentCustomerMode() || $appAuth->isSelfServiceModeByUrl()) { + $nextDeliveryDay = Configure::read('app.timeHelper')->getCurrentDateForDatabase(); + } else { + $nextDeliveryDay = self::getNextPickupDayForProduct($product); + } + return $nextDeliveryDay; + } + + public static function getNextPickupDayForProduct($product, $currentDay=null) + { + + if (is_null($currentDay)) { + $currentDay = Configure::read('app.timeHelper')->getCurrentDateForDatabase(); + } + + $sendOrderListsWeekday = null; + if (!is_null($product->delivery_rhythm_send_order_list_weekday)) { + $sendOrderListsWeekday = $product->delivery_rhythm_send_order_list_weekday; + } + + $pickupDay = self::getDbFormattedPickupDayByDbFormattedDate($currentDay, $sendOrderListsWeekday); + + // assure that $product->is_stock_product also contains check for $product->manufacturer->stock_management_enabled + if ($product->is_stock_product) { + return $pickupDay; + } + + if (Configure::read('appDb.FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY')) { + if ($product->delivery_rhythm_type == 'week' && $product->delivery_rhythm_count == 1) { + $regularPickupDay = self::getDbFormattedPickupDayByDbFormattedDate($currentDay); + if ($pickupDay != $regularPickupDay) { + return 'delivery-rhythm-triggered-delivery-break'; + } + } + } + + if ($product->delivery_rhythm_type == 'week') { + if (!is_null($product->delivery_rhythm_first_delivery_day)) { + $calculatedPickupDay = $product->delivery_rhythm_first_delivery_day->i18nFormat(Configure::read('app.timeHelper')->getI18Format('Database')); + while($calculatedPickupDay < $pickupDay) { + $calculatedPickupDay = strtotime($calculatedPickupDay . '+' . $product->delivery_rhythm_count . ' week'); + $calculatedPickupDay = date(Configure::read('app.timeHelper')->getI18Format('DatabaseAlt'), $calculatedPickupDay); + } + + if (Configure::read('appDb.FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY')) { + if (in_array($product->delivery_rhythm_count, [1, 2]) && $pickupDay != $calculatedPickupDay) { + return 'delivery-rhythm-triggered-delivery-break'; + } + } + + $pickupDay = $calculatedPickupDay; + } + } + + if ($product->delivery_rhythm_type == 'month') { + switch($product->delivery_rhythm_count) { + case '1': + $ordinal = 'first'; + break; + case '2': + $ordinal = 'second'; + break; + case '3': + $ordinal = 'third'; + break; + case '4': + $ordinal = 'fourth'; + break; + case '0': + $ordinal = 'last'; + break; + } + $deliveryDayAsWeekdayInEnglish = strtolower(date('l', strtotime($pickupDay))); + $calculatedPickupDay = date(Configure::read('app.timeHelper')->getI18Format('DatabaseAlt'), strtotime($currentDay . ' ' . $ordinal . ' ' . $deliveryDayAsWeekdayInEnglish . ' of this month')); + + if (!is_null($product->delivery_rhythm_first_delivery_day)) { + $calculatedPickupDay = $product->delivery_rhythm_first_delivery_day->i18nFormat(Configure::read('app.timeHelper')->getI18Format('Database')); + } + + while($calculatedPickupDay < $pickupDay) { + $calculatedPickupDay = date(Configure::read('app.timeHelper')->getI18Format('DatabaseAlt'), strtotime($calculatedPickupDay . ' ' . $ordinal . ' ' . $deliveryDayAsWeekdayInEnglish . ' of next month')); + } + $pickupDay = $calculatedPickupDay; + } + + if ($product->delivery_rhythm_type == 'individual') { + $pickupDay = $product->delivery_rhythm_first_delivery_day->i18nFormat(Configure::read('app.timeHelper')->getI18Format('Database')); + } + + return $pickupDay; + + } + public static function getDaysToAddToOrderPeriodLastDay() { return Configure::read('appDb.FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA') + 1; diff --git a/src/Model/Table/CartProductsTable.php b/src/Model/Table/CartProductsTable.php index d951995f62..56f4fa9926 100644 --- a/src/Model/Table/CartProductsTable.php +++ b/src/Model/Table/CartProductsTable.php @@ -5,6 +5,7 @@ use Cake\Core\Configure; use Cake\Datasource\FactoryLocator; use App\Lib\Error\Exception\InvalidParameterException; +use App\Lib\DeliveryRhythm\DeliveryRhythm; /** * FoodCoopShop - The open source software for your foodcoop @@ -134,7 +135,7 @@ public function add($appAuth, $productId, $attributeId, $amount, $orderedQuantit ]; } - $product->next_delivery_day = $this->Products->getNextDeliveryDay($product, $appAuth); + $product->next_delivery_day = DeliveryRhythm::getNextDeliveryDayForProduct($product, $appAuth); // stock available check for product $availableQuantity = $product->stock_available->quantity; @@ -344,10 +345,8 @@ public function add($appAuth, $productId, $attributeId, $amount, $orderedQuantit public function setPickupDays($cartProducts, $customerId, $cartType, $appAuth) { $pickupDayTable = FactoryLocator::get('Table')->get('PickupDays'); - $productTable = FactoryLocator::get('Table')->get('Products'); - foreach($cartProducts as &$cartProduct) { - $cartProduct->pickup_day = $productTable->getNextDeliveryDay($cartProduct->product, $appAuth); + $cartProduct->pickup_day = DeliveryRhythm::getNextDeliveryDayForProduct($cartProduct->product, $appAuth); } $pickupDays = []; diff --git a/src/Model/Table/CartsTable.php b/src/Model/Table/CartsTable.php index 978662631b..73f617d0d6 100644 --- a/src/Model/Table/CartsTable.php +++ b/src/Model/Table/CartsTable.php @@ -168,7 +168,7 @@ public function getCart($appAuth, $cartType): array $productData['productName'] = $cartProduct->product->name; $productData['manufacturerLink'] = $manufacturerLink; - $nextDeliveryDay = $this->Product->getNextDeliveryDay($cartProduct->product, $appAuth); + $nextDeliveryDay = DeliveryRhythm::getNextDeliveryDayForProduct($cartProduct->product, $appAuth); $nextDeliveryDay = strtotime($nextDeliveryDay); $productData['nextDeliveryDay'] = Configure::read('app.timeHelper')->getDateFormattedWithWeekday($nextDeliveryDay); diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index 6010de8d3a..3268e3bd01 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -4,6 +4,7 @@ use App\Controller\Component\StringComponent; use App\Lib\Catalog\Catalog; +use App\Lib\DeliveryRhythm\DeliveryRhythm; use App\Lib\Error\Exception\InvalidParameterException; use App\Lib\RemoteFile\RemoteFile; use App\Model\Traits\ProductCacheClearAfterSaveTrait; @@ -12,7 +13,6 @@ use Cake\Datasource\FactoryLocator; use Cake\Utility\Hash; use Cake\Validation\Validator; -use App\Lib\DeliveryRhythm\DeliveryRhythm; /** * FoodCoopShop - The open source software for your foodcoop @@ -204,108 +204,11 @@ private function getCorrectDayOfMonthValidator(Validator $validator, $field) return $validator; } - public function getNextDeliveryDay($product, $appAuth) - { - if (Configure::read('appDb.FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY')) { - $nextDeliveryDay = '1970-01-01'; - } elseif ($appAuth->isOrderForDifferentCustomerMode() || $appAuth->isSelfServiceModeByUrl()) { - $nextDeliveryDay = Configure::read('app.timeHelper')->getCurrentDateForDatabase(); - } else { - $nextDeliveryDay = $this->calculatePickupDayRespectingDeliveryRhythm($product); - } - return $nextDeliveryDay; - } - public function deliveryBreakEnabled($noDeliveryDaysAsString, $deliveryDate) { return $noDeliveryDaysAsString != '' && preg_match('`' . $deliveryDate . '`', $noDeliveryDaysAsString); } - public function calculatePickupDayRespectingDeliveryRhythm($product, $currentDay=null) - { - - if (is_null($currentDay)) { - $currentDay = Configure::read('app.timeHelper')->getCurrentDateForDatabase(); - } - - $sendOrderListsWeekday = null; - if (!is_null($product->delivery_rhythm_send_order_list_weekday)) { - $sendOrderListsWeekday = $product->delivery_rhythm_send_order_list_weekday; - } - - $pickupDay = DeliveryRhythm::getDbFormattedPickupDayByDbFormattedDate($currentDay, $sendOrderListsWeekday); - - // assure that $product->is_stock_product also contains check for $product->manufacturer->stock_management_enabled - if ($product->is_stock_product) { - return $pickupDay; - } - - if (Configure::read('appDb.FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY')) { - if ($product->delivery_rhythm_type == 'week' && $product->delivery_rhythm_count == 1) { - $regularPickupDay = DeliveryRhythm::getDbFormattedPickupDayByDbFormattedDate($currentDay); - if ($pickupDay != $regularPickupDay) { - return 'delivery-rhythm-triggered-delivery-break'; - } - } - } - - if ($product->delivery_rhythm_type == 'week') { - if (!is_null($product->delivery_rhythm_first_delivery_day)) { - $calculatedPickupDay = $product->delivery_rhythm_first_delivery_day->i18nFormat(Configure::read('app.timeHelper')->getI18Format('Database')); - while($calculatedPickupDay < $pickupDay) { - $calculatedPickupDay = strtotime($calculatedPickupDay . '+' . $product->delivery_rhythm_count . ' week'); - $calculatedPickupDay = date(Configure::read('app.timeHelper')->getI18Format('DatabaseAlt'), $calculatedPickupDay); - } - - if (Configure::read('appDb.FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY')) { - if (in_array($product->delivery_rhythm_count, [1, 2]) && $pickupDay != $calculatedPickupDay) { - return 'delivery-rhythm-triggered-delivery-break'; - } - } - - $pickupDay = $calculatedPickupDay; - } - } - - if ($product->delivery_rhythm_type == 'month') { - switch($product->delivery_rhythm_count) { - case '1': - $ordinal = 'first'; - break; - case '2': - $ordinal = 'second'; - break; - case '3': - $ordinal = 'third'; - break; - case '4': - $ordinal = 'fourth'; - break; - case '0': - $ordinal = 'last'; - break; - } - $deliveryDayAsWeekdayInEnglish = strtolower(date('l', strtotime($pickupDay))); - $calculatedPickupDay = date(Configure::read('app.timeHelper')->getI18Format('DatabaseAlt'), strtotime($currentDay . ' ' . $ordinal . ' ' . $deliveryDayAsWeekdayInEnglish . ' of this month')); - - if (!is_null($product->delivery_rhythm_first_delivery_day)) { - $calculatedPickupDay = $product->delivery_rhythm_first_delivery_day->i18nFormat(Configure::read('app.timeHelper')->getI18Format('Database')); - } - - while($calculatedPickupDay < $pickupDay) { - $calculatedPickupDay = date(Configure::read('app.timeHelper')->getI18Format('DatabaseAlt'), strtotime($calculatedPickupDay . ' ' . $ordinal . ' ' . $deliveryDayAsWeekdayInEnglish . ' of next month')); - } - $pickupDay = $calculatedPickupDay; - } - - if ($product->delivery_rhythm_type == 'individual') { - $pickupDay = $product->delivery_rhythm_first_delivery_day->i18nFormat(Configure::read('app.timeHelper')->getI18Format('Database')); - } - - return $pickupDay; - - } - /** * @param int $productId * @param int $manufacturerId diff --git a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php index 7e74bbf4b2..f2627d8e3d 100644 --- a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php +++ b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php @@ -177,7 +177,7 @@ public function testProductDetailHtmlProductCatalogWeekly() 'id_product' => $productId, ], ])->first(); - $nextDeliveryDay = $this->Product->getNextDeliveryDay($product, $this); + $nextDeliveryDay = DeliveryRhythm::getNextDeliveryDayForProduct($product, $this); $pickupDay = Configure::read('app.timeHelper')->getDateFormattedWithWeekday(strtotime($nextDeliveryDay)); $this->assertResponseContains(''.$pickupDay.''); } diff --git a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php index 6187a145bb..f5d1d8d10b 100644 --- a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php +++ b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php @@ -28,6 +28,7 @@ class DeliveryRhythmTest extends AppCakeTestCase public function setUp(): void { parent::setUp(); + $this->Product = $this->getTableLocator()->get('Products'); $this->MyTimeHelper = new MyTimeHelper(new View()); } @@ -293,6 +294,581 @@ public function testGetLastOrderDayIndividual() $this->assertGetLastOrderDay($product, '2020-12-12'); } + public function test1WeekWithFirstDeliveryDayAllowOrdersConfigOff() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '1', + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-11-02'), + 'is_stock_product' => '0', + ] + ), + 'currentDay' => '2018-10-07', + 'result' => '2018-11-02', + ]; + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test1WeekWithFirstDeliveryDayAllowOrdersConfigOn() + { + $this->changeConfiguration('FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY', 1); + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '1', + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-11-02'), + 'is_stock_product' => '0', + ] + ), + 'currentDay' => '2018-10-07', + 'result' => 'delivery-rhythm-triggered-delivery-break', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test1WeekNormalNoFirstDeliveryDayWednesdayFriday() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '1', + 'is_stock_product' => '0', + ] + ), + 'currentDay' => '2018-10-07', + 'result' => '2018-10-12', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test1WeekNormalNoFirstDeliveryDaySaturdayThursday() + { + $this->prepareSaturdayThursdayConfig(); + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '1', + 'is_stock_product' => '0', + ] + ), + 'currentDay' => '2022-08-26', // friday + 'result' => '2022-09-01', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test2WeekDeliveryDaySaturdayThursday() + { + $this->prepareSaturdayThursdayConfig(); + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '2', + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2022-09-08'), + 'is_stock_product' => '0', + ] + ), + 'currentDay' => '2022-08-25', // thursday + 'result' => '2022-09-08', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test1WeekNormalNoFirstDeliveryDaySaturdayThursdayWithSendOrderListDayOneDayBeforeDefault() + { + $this->prepareSaturdayThursdayConfig(); + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '1', + 'is_stock_product' => '0', + 'delivery_rhythm_send_order_list_weekday' => 5, + ] + ), + 'currentDay' => '2022-08-26', + 'result' => '2022-09-08', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test1WeekWithSendOrderListDayOneDayBeforeDefault() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '1', + 'is_stock_product' => '0', + 'delivery_rhythm_send_order_list_weekday' => 2, + ] + ), + 'currentDay' => '2017-08-08', + 'result' => '2017-08-18', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test1WeekWithSendOrderListDayTwoDaysBeforeDefault() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '1', + 'is_stock_product' => '0', + 'delivery_rhythm_send_order_list_weekday' => 1 + ] + ), + 'currentDay' => '2020-04-05', + 'result' => '2020-04-10', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test2WeekWithSendOrderListDayTwoDaysBeforeDefaultAndChangedSendOrderListsDayDeltaAllowOrdersConfigOff() + { + $this->changeConfiguration('FCS_SEND_FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 3); + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '2', + 'is_stock_product' => '0', + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2021-02-05'), + 'delivery_rhythm_send_order_list_weekday' => 0, + ] + ), + 'currentDay' => '2021-08-01', + 'result' => '2021-08-20', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test2WeekWithSendOrderListDayTwoDaysBeforeDefaultAndChangedSendOrderListsDayDeltaAllowOrdersConfigOn() + { + $this->changeConfiguration('FCS_SEND_FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 3); + $this->changeConfiguration('FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY', 1); + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '2', + 'is_stock_product' => '0', + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2021-02-05'), + 'delivery_rhythm_send_order_list_weekday' => 0, + ] + ), + 'currentDay' => '2021-08-01', + 'result' => 'delivery-rhythm-triggered-delivery-break', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test1WeekWithSendOrderListDayMondayAllowOrdersConfigOff() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '1', + 'is_stock_product' => '0', + 'delivery_rhythm_send_order_list_weekday' => 1, + ] + ), + 'currentDay' => '2022-02-01', + 'result' => '2022-02-11', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test1WeekWithSendOrderListDayMondayAllowOrdersConfigOn() + { + $this->changeConfiguration('FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY', 1); + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '1', + 'is_stock_product' => '0', + 'delivery_rhythm_send_order_list_weekday' => 1, + ] + ), + 'currentDay' => '2022-02-01', + 'result' => 'delivery-rhythm-triggered-delivery-break', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test2WeekWithSendOrderListDayMondayAllowOrdersConfigOff() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '2', + 'is_stock_product' => '0', + 'delivery_rhythm_send_order_list_weekday' => 1, + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2019-03-01'), + ] + ), + 'currentDay' => '2019-02-25', + 'result' => '2019-03-15', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test2WeekWithSendOrderListDayMondayAllowOrdersConfigOn() + { + $this->changeConfiguration('FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY', 1); + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '2', + 'is_stock_product' => '0', + 'delivery_rhythm_send_order_list_weekday' => 1, + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2019-03-01'), + ] + ), + 'currentDay' => '2019-02-25', + 'result' => 'delivery-rhythm-triggered-delivery-break', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test2WeekWithSendOrderListDayThursday() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '2', + 'is_stock_product' => '0', + 'delivery_rhythm_send_order_list_weekday' => 4, + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2019-03-01'), + ] + ), + 'currentDay' => '2019-03-08', + 'result' => '2019-03-15', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test1MonthFirstFridayWithSendOrderListDaySunday() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'month', + 'delivery_rhythm_count' => '1', + 'is_stock_product' => '0', + 'delivery_rhythm_send_order_list_weekday' => 1, + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2020-10-02'), + ] + ), + 'currentDay' => '2020-09-28', + 'result' => '2020-11-06', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test2WeekNotCurrentWeekAAllowOrderConfigOff() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '2', + 'is_stock_product' => '0', + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-08-10'), + ] + ), + 'currentDay' => '2018-08-14', + 'result' => '2018-08-24', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test2WeekNotCurrentWeekAAllowOrderConfigOn() + { + $this->changeConfiguration('FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY', 1); + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '2', + 'is_stock_product' => '0', + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-08-10'), + ] + ), + 'currentDay' => '2018-08-14', + 'result' => 'delivery-rhythm-triggered-delivery-break', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test2WeekNotCurrentWeekBAllowOrderConfigOff() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '2', + 'is_stock_product' => '0', + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-07-06'), + ] + ), + 'currentDay' => '2018-09-15', + 'result' => '2018-09-28', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test2WeekNotCurrentWeekBAllowOrderConfigOn() + { + $this->changeConfiguration('FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY', 1); + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '2', + 'is_stock_product' => '0', + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-07-06'), + ] + ), + 'currentDay' => '2018-09-15', + 'result' => 'delivery-rhythm-triggered-delivery-break', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test2WeekCurrentWeekAllowOrderConfigOff() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '2', + 'is_stock_product' => '0', + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-08-03'), + ] + ), + 'currentDay' => '2018-08-14', + 'result' => '2018-08-17', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test2WeekCurrentWeekAllowOrderConfigOn() + { + $this->changeConfiguration('FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY', 1); + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '2', + 'is_stock_product' => '0', + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-08-03'), + ] + ), + 'currentDay' => '2018-08-14', + 'result' => '2018-08-17', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test2WeekD() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '2', + 'is_stock_product' => '0', + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2019-03-22'), + ] + ), + 'currentDay' => '2019-03-15', + 'result' => '2019-03-22', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test4Week() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '4', + 'is_stock_product' => '0', + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-08-03'), + ] + ), + 'currentDay' => '2018-08-07', + 'result' => '2018-08-31', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test1MonthFirstWeekdayOfMonthA() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'month', + 'delivery_rhythm_count' => '1', + 'is_stock_product' => '0', + ] + ), + 'currentDay' => '2017-08-07', + 'result' => '2017-09-01', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function testFirstWeekdayOfMonthB() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'month', + 'delivery_rhythm_count' => '1', + 'is_stock_product' => '1', + ] + ), + 'currentDay' => '2017-08-07', + 'result' => '2017-08-11', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function testLastMonthLastWeekdayOfMonthA() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'month', + 'delivery_rhythm_count' => '0', + 'is_stock_product' => '0', + ] + ), + 'currentDay' => '2018-09-13', + 'result' => '2018-09-28', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function testLastMonthLastWeekdayOfMonthB() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'month', + 'delivery_rhythm_count' => '0', + 'is_stock_product' => '0', + ] + ), + 'currentDay' => '2018-08-07', + 'result' => '2018-08-31', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function testLastMonthLastWeekdayOfMonthC() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2021-02-26'), + 'delivery_rhythm_type' => 'month', + 'delivery_rhythm_count' => '0', + 'is_stock_product' => '0', + ] + ), + 'currentDay' => '2021-01-20', + 'result' => '2021-02-26', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test2Month() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'month', + 'delivery_rhythm_count' => '2', + 'is_stock_product' => '0', + ] + ), + 'currentDay' => '2020-11-20', + 'result' => '2020-12-11', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test3Month() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'month', + 'delivery_rhythm_count' => '3', + 'is_stock_product' => '0', + ] + ), + 'currentDay' => '2020-11-20', + 'result' => '2020-12-18', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function test4Month() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'month', + 'delivery_rhythm_count' => '4', + 'is_stock_product' => '0', + ] + ), + 'currentDay' => '2020-11-30', + 'result' => '2020-12-25', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + public function testIndividual() + { + $data = [ + 'product' => $this->Product->newEntity( + [ + 'delivery_rhythm_type' => 'individual', + 'delivery_rhythm_count' => '0', + 'is_stock_product' => '0', + 'delivery_rhythm_first_delivery_day' => new FrozenDate('2018-08-03'), + ] + ), + 'currentDay' => '2017-08-07', + 'result' => '2018-08-03', + ]; + $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + } + + private function assertPickupDayForProduct($product, $currentDay, $expectedResult) + { + $result = DeliveryRhythm::getNextPickupDayForProduct($product, $currentDay); + $this->assertEquals($expectedResult, $result); + } private function assertGetOrderPeriodFirstDay($currentDay, $expected) { From 9f2578113d913210fc14207bb00061145a45db18 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 22:08:03 +0200 Subject: [PATCH 034/646] correct traits --- tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php index f5d1d8d10b..cf8e9c1adf 100644 --- a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php +++ b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php @@ -16,14 +16,18 @@ use App\Lib\DeliveryRhythm\DeliveryRhythm; use App\Test\TestCase\AppCakeTestCase; use App\Test\TestCase\Traits\DeliveryRhythmConfigsTrait; +use App\Test\TestCase\Traits\LoginTrait; use App\View\Helper\MyTimeHelper; use Cake\I18n\FrozenDate; use Cake\View\View; +use Cake\TestSuite\IntegrationTestTrait; class DeliveryRhythmTest extends AppCakeTestCase { use DeliveryRhythmConfigsTrait; + use IntegrationTestTrait; + use LoginTrait; public function setUp(): void { From 35f2d8ddf07b90f5de96b0336dfd5a0059515b4e Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 30 Aug 2022 22:10:11 +0200 Subject: [PATCH 035/646] test fixes --- .../Lib/DeliveryRhythm/DeliveryRhythmTest.php | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php index cf8e9c1adf..80228fe40f 100644 --- a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php +++ b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php @@ -330,7 +330,7 @@ public function test1WeekWithFirstDeliveryDayAllowOrdersConfigOn() 'currentDay' => '2018-10-07', 'result' => 'delivery-rhythm-triggered-delivery-break', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test1WeekNormalNoFirstDeliveryDayWednesdayFriday() @@ -346,7 +346,7 @@ public function test1WeekNormalNoFirstDeliveryDayWednesdayFriday() 'currentDay' => '2018-10-07', 'result' => '2018-10-12', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test1WeekNormalNoFirstDeliveryDaySaturdayThursday() @@ -363,7 +363,7 @@ public function test1WeekNormalNoFirstDeliveryDaySaturdayThursday() 'currentDay' => '2022-08-26', // friday 'result' => '2022-09-01', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test2WeekDeliveryDaySaturdayThursday() @@ -381,7 +381,7 @@ public function test2WeekDeliveryDaySaturdayThursday() 'currentDay' => '2022-08-25', // thursday 'result' => '2022-09-08', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test1WeekNormalNoFirstDeliveryDaySaturdayThursdayWithSendOrderListDayOneDayBeforeDefault() @@ -399,7 +399,7 @@ public function test1WeekNormalNoFirstDeliveryDaySaturdayThursdayWithSendOrderLi 'currentDay' => '2022-08-26', 'result' => '2022-09-08', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test1WeekWithSendOrderListDayOneDayBeforeDefault() @@ -416,7 +416,7 @@ public function test1WeekWithSendOrderListDayOneDayBeforeDefault() 'currentDay' => '2017-08-08', 'result' => '2017-08-18', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test1WeekWithSendOrderListDayTwoDaysBeforeDefault() @@ -433,7 +433,7 @@ public function test1WeekWithSendOrderListDayTwoDaysBeforeDefault() 'currentDay' => '2020-04-05', 'result' => '2020-04-10', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test2WeekWithSendOrderListDayTwoDaysBeforeDefaultAndChangedSendOrderListsDayDeltaAllowOrdersConfigOff() @@ -452,7 +452,7 @@ public function test2WeekWithSendOrderListDayTwoDaysBeforeDefaultAndChangedSendO 'currentDay' => '2021-08-01', 'result' => '2021-08-20', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test2WeekWithSendOrderListDayTwoDaysBeforeDefaultAndChangedSendOrderListsDayDeltaAllowOrdersConfigOn() @@ -472,7 +472,7 @@ public function test2WeekWithSendOrderListDayTwoDaysBeforeDefaultAndChangedSendO 'currentDay' => '2021-08-01', 'result' => 'delivery-rhythm-triggered-delivery-break', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test1WeekWithSendOrderListDayMondayAllowOrdersConfigOff() @@ -489,7 +489,7 @@ public function test1WeekWithSendOrderListDayMondayAllowOrdersConfigOff() 'currentDay' => '2022-02-01', 'result' => '2022-02-11', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test1WeekWithSendOrderListDayMondayAllowOrdersConfigOn() @@ -507,7 +507,7 @@ public function test1WeekWithSendOrderListDayMondayAllowOrdersConfigOn() 'currentDay' => '2022-02-01', 'result' => 'delivery-rhythm-triggered-delivery-break', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test2WeekWithSendOrderListDayMondayAllowOrdersConfigOff() @@ -525,7 +525,7 @@ public function test2WeekWithSendOrderListDayMondayAllowOrdersConfigOff() 'currentDay' => '2019-02-25', 'result' => '2019-03-15', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test2WeekWithSendOrderListDayMondayAllowOrdersConfigOn() @@ -544,7 +544,7 @@ public function test2WeekWithSendOrderListDayMondayAllowOrdersConfigOn() 'currentDay' => '2019-02-25', 'result' => 'delivery-rhythm-triggered-delivery-break', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test2WeekWithSendOrderListDayThursday() @@ -562,7 +562,7 @@ public function test2WeekWithSendOrderListDayThursday() 'currentDay' => '2019-03-08', 'result' => '2019-03-15', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test1MonthFirstFridayWithSendOrderListDaySunday() @@ -580,7 +580,7 @@ public function test1MonthFirstFridayWithSendOrderListDaySunday() 'currentDay' => '2020-09-28', 'result' => '2020-11-06', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test2WeekNotCurrentWeekAAllowOrderConfigOff() @@ -597,7 +597,7 @@ public function test2WeekNotCurrentWeekAAllowOrderConfigOff() 'currentDay' => '2018-08-14', 'result' => '2018-08-24', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test2WeekNotCurrentWeekAAllowOrderConfigOn() @@ -615,7 +615,7 @@ public function test2WeekNotCurrentWeekAAllowOrderConfigOn() 'currentDay' => '2018-08-14', 'result' => 'delivery-rhythm-triggered-delivery-break', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test2WeekNotCurrentWeekBAllowOrderConfigOff() @@ -632,7 +632,7 @@ public function test2WeekNotCurrentWeekBAllowOrderConfigOff() 'currentDay' => '2018-09-15', 'result' => '2018-09-28', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test2WeekNotCurrentWeekBAllowOrderConfigOn() @@ -650,7 +650,7 @@ public function test2WeekNotCurrentWeekBAllowOrderConfigOn() 'currentDay' => '2018-09-15', 'result' => 'delivery-rhythm-triggered-delivery-break', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test2WeekCurrentWeekAllowOrderConfigOff() @@ -667,7 +667,7 @@ public function test2WeekCurrentWeekAllowOrderConfigOff() 'currentDay' => '2018-08-14', 'result' => '2018-08-17', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test2WeekCurrentWeekAllowOrderConfigOn() @@ -685,7 +685,7 @@ public function test2WeekCurrentWeekAllowOrderConfigOn() 'currentDay' => '2018-08-14', 'result' => '2018-08-17', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test2WeekD() @@ -702,7 +702,7 @@ public function test2WeekD() 'currentDay' => '2019-03-15', 'result' => '2019-03-22', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test4Week() @@ -719,7 +719,7 @@ public function test4Week() 'currentDay' => '2018-08-07', 'result' => '2018-08-31', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test1MonthFirstWeekdayOfMonthA() @@ -735,7 +735,7 @@ public function test1MonthFirstWeekdayOfMonthA() 'currentDay' => '2017-08-07', 'result' => '2017-09-01', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function testFirstWeekdayOfMonthB() @@ -751,7 +751,7 @@ public function testFirstWeekdayOfMonthB() 'currentDay' => '2017-08-07', 'result' => '2017-08-11', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function testLastMonthLastWeekdayOfMonthA() @@ -767,7 +767,7 @@ public function testLastMonthLastWeekdayOfMonthA() 'currentDay' => '2018-09-13', 'result' => '2018-09-28', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function testLastMonthLastWeekdayOfMonthB() @@ -783,7 +783,7 @@ public function testLastMonthLastWeekdayOfMonthB() 'currentDay' => '2018-08-07', 'result' => '2018-08-31', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function testLastMonthLastWeekdayOfMonthC() @@ -800,7 +800,7 @@ public function testLastMonthLastWeekdayOfMonthC() 'currentDay' => '2021-01-20', 'result' => '2021-02-26', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test2Month() @@ -816,7 +816,7 @@ public function test2Month() 'currentDay' => '2020-11-20', 'result' => '2020-12-11', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test3Month() @@ -832,7 +832,7 @@ public function test3Month() 'currentDay' => '2020-11-20', 'result' => '2020-12-18', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function test4Month() @@ -848,7 +848,7 @@ public function test4Month() 'currentDay' => '2020-11-30', 'result' => '2020-12-25', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } public function testIndividual() @@ -865,10 +865,10 @@ public function testIndividual() 'currentDay' => '2017-08-07', 'result' => '2018-08-03', ]; - $this->assertPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); + $this->assertGetNextPickupDayForProduct($data['product'], $data['currentDay'], $data['result']); } - private function assertPickupDayForProduct($product, $currentDay, $expectedResult) + private function assertGetNextPickupDayForProduct($product, $currentDay, $expectedResult) { $result = DeliveryRhythm::getNextPickupDayForProduct($product, $currentDay); $this->assertEquals($expectedResult, $result); From 456f4230d16451e9253daffc1d8969c960fc0765 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 7 Sep 2022 22:28:59 +0200 Subject: [PATCH 036/646] make email order reminder fit for saturday-thursday config --- src/Shell/EmailOrderReminderShell.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Shell/EmailOrderReminderShell.php b/src/Shell/EmailOrderReminderShell.php index e7a8b74edf..776a95ae45 100644 --- a/src/Shell/EmailOrderReminderShell.php +++ b/src/Shell/EmailOrderReminderShell.php @@ -40,7 +40,14 @@ public function main() return true; } - $nextDeliveryDay = DeliveryRhythm::getNextDeliveryDay(strtotime($this->cronjobRunDay)); + $productsTable = $this->getTableLocator()->get('Products'); + $dummyProduct = $productsTable->newEntity([ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '1', + 'is_stock_product' => '0', + ]); + $nextDeliveryDay = DeliveryRhythm::getNextPickupDayForProduct($dummyProduct, $this->cronjobRunDay); + if (Configure::read('appDb.FCS_NO_DELIVERY_DAYS_GLOBAL') != '') { $this->Product = $this->getTableLocator()->get('Products'); if ($this->Product->deliveryBreakEnabled(Configure::read('appDb.FCS_NO_DELIVERY_DAYS_GLOBAL'), $nextDeliveryDay)) { From 5e83fe893f4fe691edc214c857e5bb3b9ba0067c Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 12 Sep 2022 08:13:35 +0200 Subject: [PATCH 037/646] Merge branch 'main' into develop --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index e5b820341f..fe9f137b2b 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.5.0 \ No newline at end of file +3.6.0-dev \ No newline at end of file From 3821abaa620b303f6196b197c07d2f10e110cb86 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 12 Sep 2022 09:05:22 +0200 Subject: [PATCH 038/646] split changelogs for quicker loading --- CHANGELOG.md | 235 +-------------------------------------- devtools/CHANGELOG-v3.md | 235 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 236 insertions(+), 234 deletions(-) create mode 100644 devtools/CHANGELOG-v3.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d9bf0dbb3..58ddbfbaca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,237 +59,4 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe Datum: 12.03.2022 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/17) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.4.2...v3.5.0) -# v3.4.2 - -### Security update -Fixed security issue in CKEditor. - -Datum: 18.03.2022 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/16) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.4.1...v3.4.2) - -# v3.4.1 - -### Bugfix -- Fix error on creating build. [PR#802](https://github.com/foodcoopshop/foodcoopshop/pull/802) - -Datum: 06.03.2022 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/16) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.4.0...v3.4.1) - -# v3.4.0 - -### Herzlichen Dank an alle beteiligten Personen -* [Confuset](https://github.com/Confuset) -* [mrothauer](https://github.com/mrothauer) -* [ocapito](https://github.com/ocapito) -* [pabneukistl](https://github.com/pabneukistl) - -### Verbesserungen -- Die Summe im Warenkorb ist jetzt in Warenwert, Pfandsumme und Gesamtbetrag aufgesplittet. [I#636](https://github.com/foodcoopshop/foodcoopshop/issues/636) / [PR#699](https://github.com/foodcoopshop/foodcoopshop/pull/699) -- Der Instagram-Account kann nun in den Einstellungen angegeben werden, außerdem ist der Bereich für die Social-Media-Links im Footer neu gestaltet. [I#642](https://github.com/foodcoopshop/foodcoopshop/issues/642) / [PR#706](https://github.com/foodcoopshop/foodcoopshop/pull/706) -- Im Selbstbedienungs-Modus werden die Produkte erst nach Suche, Scannen oder Kategorie-Auswahl angezeigt. Außerdem steht im Kategorien-Dropdown jetzt die Produkt-Anzahl. [I#703](https://github.com/foodcoopshop/foodcoopshop/issues/703) / [PR#704](https://github.com/foodcoopshop/foodcoopshop/pull/704) -- Für Admins und Superadmins ist es jetzt möglich, über den Selbstbedienungs-Modus für andere Mitglieder zu bestellen. Der Vorteil gegenüber der Sofort-Bestellung besteht darin, dass das tatsächlich entnommene Gewicht direkt beim Bestellen eingegeben werden kann. [I#703](https://github.com/foodcoopshop/foodcoopshop/issues/703) / [PR#718](https://github.com/foodcoopshop/foodcoopshop/pull/718) -- Beim Bild-Upload ist jetzt neben dem JPG-Format auch PNG und GIF verwendbar. [I#702](https://github.com/foodcoopshop/foodcoopshop/issues/702) / [PR#720](https://github.com/foodcoopshop/foodcoopshop/pull/720) -- Selbstbedienungs-Modus: Bereits bestehende Barcodes (EAN-13) können nun Produkten und Varianten zugewiesen und zum Scannen verwendet werden. [I#707](https://github.com/foodcoopshop/foodcoopshop/issues/706) / [PR#729](https://github.com/foodcoopshop/foodcoopshop/pull/729) -- Der CSV-Upload für die Guthaben-Aufladungen unterstützt jetzt auch die Volksbank. [I#732](https://github.com/foodcoopshop/foodcoopshop/issues/732) / [PR#733](https://github.com/foodcoopshop/foodcoopshop/pull/733) -- Der zweiwöchige Lieferrhythmus kann jetzt so eingestellt werden, dass die Produkte nur noch in der Woche vor der Lieferung bestellt werden können. In der anderen Woche sind bei aktivierter Einstellung die Produkte beim Bestellen zwar sichtbar, aber nicht bestellbar. Auch bei einem vorgezogenen Bestellschluss, kann nur mehr in der Woche vor der Lieferung bestellt werden (gilt für ein- und zweiwöchig). Alle anderen Lieferrhythmen sind von der neuen Einstellung nicht betroffen. [I#716](https://github.com/foodcoopshop/foodcoopshop/issues/716) / [PR#734](https://github.com/foodcoopshop/foodcoopshop/pull/734) [C](https://github.com/foodcoopshop/foodcoopshop/commit/3e375b05e301c478b6dd0ecd34fdb969e20645bf) [PR#792](https://github.com/foodcoopshop/foodcoopshop/pull/792) [PR#793](https://github.com/foodcoopshop/foodcoopshop/pull/793) -- Im neuen Bereich "Benachrichtigungen" im User-Profil kann der User selbst folgende Benachrichtigungs-E-Mails deaktivieren: Guthaben-Erinnerungs-Mail, Rechnung, Abholtag-Erinnerung, Überweisung wurde ins Guthaben-System übernommen. [I#739](https://github.com/foodcoopshop/foodcoopshop/issues/739) / [I#752](https://github.com/foodcoopshop/foodcoopshop/issues/752) / [PR#740](https://github.com/foodcoopshop/foodcoopshop/pull/740) / [PR#754](https://github.com/foodcoopshop/foodcoopshop/pull/754) -- Als "abgeholt" markierte Bestellungen werden nun im unteren Bereich der Liste "Admin-Bereich / Bestellungen" gruppiert angezeigt. Damit bleibt die Liste auch bei vielen Bestellungen übersichtlich. [C](https://github.com/foodcoopshop/foodcoopshop/commit/cc53502b57b5d42e6ba5f01b2bb9d91383cca253) -- Statusmeldungen (z.B. "Dein Profil wurde erfolgreich geändert.") schließen sich jetzt automatisch nach 5 Sekunden. Fehlermeldungen müssen nach wie vor manuell geschlossen werden. [PR#746](https://github.com/foodcoopshop/foodcoopshop/pull/746) -- Die 🥕 Karotte für neue Mitglieder wird angezeigt, wenn Bestellungen für maximal 2 Abholtage vorhanden sind. [C](https://github.com/foodcoopshop/foodcoopshop/commit/6fe59562a5e96813425a138e27de57d8fb482135) -- Neue Hersteller-Einstellung: "Sollen die Bestelllisten auch Lagerprodukte enthalten?". [I#756](https://github.com/foodcoopshop/foodcoopshop/issues/756) / [PR#758](https://github.com/foodcoopshop/foodcoopshop/pull/758) -- Beim Ändern des Abholtages werden Mitglieder jetzt nicht mehr automatisch per E-Mail benachrichtigt. Die Benachrichtigung kann aber durch eine Checkbox aktiviert werden. [I#787](https://github.com/foodcoopshop/foodcoopshop/issues/787) / [PR#788](https://github.com/foodcoopshop/foodcoopshop/pull/788) - -### Neue Funktionen für den [Einzelhandels-Modus](https://foodcoopshop.github.io/de/dorfladen-online.html) -- Im Selbstbedienungs-Modus wird jetzt nach jedem Einkauf automatisch die Rechnung erstellt. Sie wird auch automatisch gedruckt, wenn die Funktion "Rechnungen per E-Mail erhalten" deaktiviert wurde. [I#696](https://github.com/foodcoopshop/foodcoopshop/issues/696) / [PR#697](https://github.com/foodcoopshop/foodcoopshop/pull/697) -- Die Rechnungen werden nun automatisch gedruckt, bar bezahlt wurde und die Funktion "Rechnungen per E-Mail erhalten" deaktiviert ist. [I#698](https://github.com/foodcoopshop/foodcoopshop/issues/698) / [PR#769](https://github.com/foodcoopshop/foodcoopshop/pull/769) -- Kunden haben jetzt im neuen Menüpunkt "Meine Rechnungen" eine schöne Rechnungs-Übersicht mit Download-Funktion. [I#646](https://github.com/foodcoopshop/foodcoopshop/issues/646) / [PR#705](https://github.com/foodcoopshop/foodcoopshop/pull/705) -- Es gibt nun eine neue Kunden-Einstellung, die Bestellungen zu Einkaufspreisen (für Eigenverbrauch) oder zu Nullpreisen (Vorbestellung von Produkten, die später nochmal verkauft werden) ermöglicht. [I#672](https://github.com/foodcoopshop/foodcoopshop/issues/672) / [PR#712](https://github.com/foodcoopshop/foodcoopshop/pull/712) -- Falls die Funktion zum Erfassen der Einkaufspreise aktiviert ist, können Hersteller nun folgende Daten der eigenen Produkte nicht mehr ändern: Einkaufspreis, Verkaufspreis, Pfand, Steuer. Außerdem wird auf den Bestelllisten der Preis nicht mehr angezeigt. [I#710](https://github.com/foodcoopshop/foodcoopshop/issues/710) [I#711](https://github.com/foodcoopshop/foodcoopshop/issues/711) / [PR#714](https://github.com/foodcoopshop/foodcoopshop/pull/714) [PR#715](https://github.com/foodcoopshop/foodcoopshop/pull/715) -- Weiters werden Produkte bzw. Varianten ohne Einkaufspreis nicht mehr im Produktkatalog angezeigt und können so nicht bestellt werden. [I#745](https://github.com/foodcoopshop/foodcoopshop/issues/745) / [PR#748](https://github.com/foodcoopshop/foodcoopshop/pull/748) -- Die Verkaufspreise können jetzt auch auf Basis eines Aufschlages automatisch berechnet werden. [I#721](https://github.com/foodcoopshop/foodcoopshop/issues/721) / [PR#722](https://github.com/foodcoopshop/foodcoopshop/pull/722) -- Der Aufschlag, also die Differenz zwischen Netto-Einkaufpreis und Netto-Verkaufspreis wird im Admin-Bereich jetzt als Prozent- und Euro-Betrag angezeigt. [I#723](https://github.com/foodcoopshop/foodcoopshop/issues/723) / [PR#736](https://github.com/foodcoopshop/foodcoopshop/pull/736) -- Möglichkeit zum Erstellen eines Lieferscheines für die Hersteller. Die Datei (Excel-Format) enthält alle notwendigen Daten für die Erstellung einer Rechnung an den Betreiber (u.a. die Einkaufspreise). [I#627](https://github.com/foodcoopshop/foodcoopshop/issues/627) / [PR#738](https://github.com/foodcoopshop/foodcoopshop/pull/738) -- Diese Lieferscheine werden ab sofort auch automatisch 1x monatlich (immer am 1.) an die Hersteller versendet. Das Hakerl in den Hersteller-Einstellungen muss dafür aktiviert werden. [I#772](https://github.com/foodcoopshop/foodcoopshop/issues/772) / [PR#789](https://github.com/foodcoopshop/foodcoopshop/pull/789) -- Optimierungen für Barverkäufe. [I#742](https://github.com/foodcoopshop/foodcoopshop/issues/742) / [PR#743](https://github.com/foodcoopshop/foodcoopshop/pull/743) / [PR#747](https://github.com/foodcoopshop/foodcoopshop/pull/747) -- Gutscheine lassen sich nun anhand [dieser Anleitung](https://foodcoopshop.github.io/de/dorfladen-online-gutscheine.html) super im System abbilden. [I#750](https://github.com/foodcoopshop/foodcoopshop/issues/750) / [PR#762](https://github.com/foodcoopshop/foodcoopshop/pull/762) - -### Bugfixes / Updates / Performance -- Bei Installation mit vielen Produkten (> 500) waren Frontend-Seiten mit Produktlisten (Kategorie-Detailseite und Hersteller-Profil) sehr langsam. Jetzt laufen diese deutlich schneller. [I#700](https://github.com/foodcoopshop/foodcoopshop/issues/700) / [PR#764](https://github.com/foodcoopshop/foodcoopshop/pull/764) -- Fehlerhafte SQL-Abfrage mit MariaDB beim Erstellen der Bestelllisten. [I#724](https://github.com/foodcoopshop/foodcoopshop/issues/724) / [PR#726](https://github.com/foodcoopshop/foodcoopshop/pull/726) -- Die Sortierung von Mitgliedern / Herstellern funktioniert jetzt systemweit (z.B. in Admin-Bereich / Bestellungen) auch mit beginnenden Umlauten bzw. Kleinbuchstaben. [C1](5edbc970cc688f7a116ffba04170b391cc5a2e77) / [C2](aa12d4d18d14834dc82a84aa0b8dc068b1356f6d) -- CakePHP Update v4.3. [I#728](https://github.com/foodcoopshop/foodcoopshop/issues/728) / [PR#731](https://github.com/foodcoopshop/foodcoopshop/pull/731) -- BackupDatabaseShell now uses defined port. [PR#749](https://github.com/foodcoopshop/foodcoopshop/pull/749) - -Datum: 06.03.2022 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/16) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.3.0...v3.4.0) - -# v3.3.0 - -### Herzlichen Dank an alle beteiligten Personen -* [mrothauer](https://github.com/mrothauer) - -### Neue Funktionen -- Pfand-Rückgaben für Mitglieder können nun auch dann eingegeben werden, auch wenn das Mitglied in der aktuellen Woche nicht bestellt hat. Der Button "Pfand-Rückgabe" wird immer angezeigt, das Mitglied kann dann aus einer Dropdown-Liste ausgewählt werden. [I#654](https://github.com/foodcoopshop/foodcoopshop/issues/654) / [PR#655](https://github.com/foodcoopshop/foodcoopshop/pull/655) -- Produkte können jetzt auch einem Lagerort zugewiesen werden (z.B. Keine Kühlung, Kühlschrank, Tiefkühler). In der Liste "Bestellungen als PDF" werden die Produkte entsprechend sortiert angezeigt. [I#662](https://github.com/foodcoopshop/foodcoopshop/issues/662) / [PR#690](https://github.com/foodcoopshop/foodcoopshop/pull/690) -- Das Frontend wurde optisch aufgepeppt: Blog-Artikel, Hauptmenü, das mobile Menü, die Produkt-Liste und der Footer sind nun frischer. Weiters ist die Haupt-Schrift etwas größer und die Fett-Schrift dezenter. [I#643](https://github.com/foodcoopshop/foodcoopshop/issues/643) / [PR#648](https://github.com/foodcoopshop/foodcoopshop/pull/648) - -### Verbesserungen -- Bei der Produktbeschreibung wird jetzt ein Hinweis angezeigt, falls bereits offene Bestellungen vorhanden sind. Irrtümliche doppelte Bestellungen werden so vermieden. [I#681](https://github.com/foodcoopshop/foodcoopshop/issues/681) / [PR#694](https://github.com/foodcoopshop/foodcoopshop/pull/694) -- Bei Produkten ohne Bild wird jetzt das Hersteller-Logo angezeigt. Falls kein Hersteller-Logo vorhanden ist, wird das definierte Standard-Bild anzeigt. [I#490](https://github.com/foodcoopshop/foodcoopshop/issues/490) / [PR#693](https://github.com/foodcoopshop/foodcoopshop/pull/693) -- Beim Erstellen eines neuen Blog-Artikels kann nun angegeben werden, wie lange er auf der Startseite angezeigt werden soll. Danach verschwindet er automatisch. [I#601](https://github.com/foodcoopshop/foodcoopshop/issues/601) / [PR#664](https://github.com/foodcoopshop/foodcoopshop/pull/664) -- Beim Registrieren mit automatischer Aktivierung muss ab sofort die E-Mail-Adresse bestätigt werden, sonst bleibt der neue User inaktiv. [I#656](https://github.com/foodcoopshop/foodcoopshop/issues/656) / [PR#657](https://github.com/foodcoopshop/foodcoopshop/pull/657) -- Das Bestelldatum wird nun im Tooltip über dem Bestellstatus-Icon angezeigt. [I#652](https://github.com/foodcoopshop/foodcoopshop/issues/652) / [PR#653](https://github.com/foodcoopshop/foodcoopshop/pull/653) -- Alle Formulare sind jetzt noch besser gegen potenzielle Angriffe abgesichert. [I#659](https://github.com/foodcoopshop/foodcoopshop/issues/659) / [PR#661](https://github.com/foodcoopshop/foodcoopshop/pull/661) - -### Neue Funktionen für den [Einzelhandels-Modus](https://foodcoopshop.github.io/de/dorfladen-online.html) -- Nahtlose Integration der Registrierkasse HelloCash für den Einzelhandels-Modus. [Zur Online-Doku](https://foodcoopshop.github.io/de/registrierkasse-hello-cash.html). [I#683](https://github.com/foodcoopshop/foodcoopshop/issues/683) / [PR#686](https://github.com/foodcoopshop/foodcoopshop/pull/686) / [I#687](https://github.com/foodcoopshop/foodcoopshop/issues/687) / [PR#691](https://github.com/foodcoopshop/foodcoopshop/pull/691) -- Für Produkte kann nun auch der Einkaufspreis und dessen Umsatzsteuer angegeben werden. Diese Daten werden dann bei den Bestellungen mitgespeichert und liefern so die Datengrundlage für die neue Gewinnermittlung. [I#660](https://github.com/foodcoopshop/foodcoopshop/issues/660) / [PR#680](https://github.com/foodcoopshop/foodcoopshop/pull/680) / [I#671](https://github.com/foodcoopshop/foodcoopshop/issues/671) / [PR#692](https://github.com/foodcoopshop/foodcoopshop/pull/692) - -### Bugfixes -- Guthaben-Aufladungen mit CSV-Upload: Wenn ein Mitglied nicht ausgewählt wurde und man speichern wollte, wurde nicht die Fehlermeldung beim Mitglied angezeigt, sondern die allgemeine Fehlerseite. [I#677](https://github.com/foodcoopshop/foodcoopshop/issues/677) / [PR#678](https://github.com/foodcoopshop/foodcoopshop/pull/678) -- Mehrwöchiger Lieferrhythmus für Produkte mit Standard-Bestellschluss Montag und vorgezogener Bestellschluss Samstag wurde falsch berechnet. [PR#701](https://github.com/foodcoopshop/foodcoopshop/pull/701) - -### Code Cleaning -- Die alte Funktion zum Verwalten der Mitgliedbeiträge wurde entfernt. [Anleitung zum Umstellen auf das neue System](https://foodcoopshop.github.io/de/mitgliedsbeitraege.html). [I#666](https://github.com/foodcoopshop/foodcoopshop/issues/666) / [PR#667](https://github.com/foodcoopshop/foodcoopshop/pull/667) -- Sauberere SQL-Statements durch Verwendung von QueryExpression. [I#644](https://github.com/foodcoopshop/foodcoopshop/issues/644) / [PR#645](https://github.com/foodcoopshop/foodcoopshop/pull/645) - -Datum: 06.09.2021 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/15) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.2.2...v3.3.0) - -# v3.2.2 - -### Security Fix -* Das Registrierungsformular und das Formular zum Bearbeiten des User-Profils sind nun besser abgesichert. - -Datum: 12.04.2021 / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.2.1...v3.2.2) - -# v3.2.1 - -### Bugfixes -* Wenn ein Hersteller die eigenen Einstellungen speichert, wird die Ansprechperson jetzt nicht mehr gelöscht. -* Layout-Fix im Overlay für die Produkt-Beschreibung. -* Kamera-Icon wurde auf der Login-Seite für den Selbstbedienung-Modus auf Smartphones nicht angezeigt. -* Wenn die Erstinstallation <= v3.0 war, müssen [zwei Migrations manuell ausgeführt werden](https://foodcoopshop.github.io/en/migration-guide.html). - -Datum: 23.03.2021 / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.2.0...v3.2.1) - -# v3.2.0 - -### Herzlichen Dank an alle beteiligten Personen -* [AndreasEgger](https://github.com/AndreasEgger) -* [mantensteiner](https://github.com/mantensteiner) -* [markuskoban](https://github.com/markuskoban) -* [mrothauer](https://github.com/mrothauer) -* [reicharm](https://github.com/reicharm) - -### Neue Funktionen -- Das neue Modul zur Erstellung von Kunden-Rechnungen ermöglicht die Verwendung der Software im Einzelhandel. [Zur Online-Doku](https://foodcoopshop.github.io/de/dorfladen-online.html). [I#572](https://github.com/foodcoopshop/foodcoopshop/issues/572) / [PR#580](https://github.com/foodcoopshop/foodcoopshop/pull/580) / [PR#584](https://github.com/foodcoopshop/foodcoopshop/pull/584) / [PR#599](https://github.com/foodcoopshop/foodcoopshop/pull/599) -- Die Verwaltung der Mitgliedsbeiträge ist nun stark vereinfacht. [Zur Online-Doku](https://foodcoopshop.github.io/de/mitgliedsbeitraege.html). [I#471](https://github.com/foodcoopshop/foodcoopshop/issues/471) / [PR#608](https://github.com/foodcoopshop/foodcoopshop/pull/608) -- 📷 Beim Einkaufen im Selbstbedienungs-Modus kann man nun direkt mit der Smartphone-Kamera (ganz ohne App) die Barcodes scannen. [I#557](https://github.com/foodcoopshop/foodcoopshop/issues/557) / [PR#563](https://github.com/foodcoopshop/foodcoopshop/pull/563) -- Die stark verbesserte Pfand-Übersicht bringt endlich Licht 💡 in den Pfand-Dschungel 🐵, der sich bei manchen Initiativen über die Jahre ergeben hat. [I#570](https://github.com/foodcoopshop/foodcoopshop/issues/570) / [PR#571](https://github.com/foodcoopshop/foodcoopshop/pull/571) -- ☑ Beim Kontrollieren der Bestellungen bleiben die Produkte jetzt angehakt, wenn z.B. Gewicht oder Preis geändert wird. Wenn die Hakerl nicht wieder entfernt werden, sind sie nach 24 Stunden automatisch weg. [I#616](https://github.com/foodcoopshop/foodcoopshop/issues/616) / [PR#617](https://github.com/foodcoopshop/foodcoopshop/pull/617) -- Das eingestellte Guthaben-Limit kann nun beim normalen Bestellen nicht mehr unterschritten werden. Bei Sofort-Bestellungen und Preis- bzw. Gewichtsanpassungen ist dies aber weiterhin möglich. [I#555](https://github.com/foodcoopshop/foodcoopshop/issues/555) / [PR#574](https://github.com/foodcoopshop/foodcoopshop/pull/574) / [PR#603](https://github.com/foodcoopshop/foodcoopshop/pull/603) / [PR#635](https://github.com/foodcoopshop/foodcoopshop/pull/635) -- Die Guthaben-Höhe, ab der die Guthaben-Erinnerungsmail versendet wird, kann nun individuell eingestellt werden. Eine Erhöhung auf z.B. 50 € ist für Initiativen sinnvoll, die den CSV-Upload verwenden. [I#621](https://github.com/foodcoopshop/foodcoopshop/issues/621) / [PR#622](https://github.com/foodcoopshop/foodcoopshop/pull/622) -- Das individuelle Farbschema wird jetzt auch im Admin-Bereich angewendet. [I#613](https://github.com/foodcoopshop/foodcoopshop/issues/613) / [PR#630](https://github.com/foodcoopshop/foodcoopshop/pull/630) - -### Kleinere Verbesserungen -- Es gibt neue Lieferrhythmen: "jeder 2., 3. bzw. 4. Freitag im Monat" [I#581](https://github.com/foodcoopshop/foodcoopshop/issues/581) / [PR#582](https://github.com/foodcoopshop/foodcoopshop/pull/582) / Validierung: [PR#624](https://github.com/foodcoopshop/foodcoopshop/pull/624) -- Slideshow-Bilder auf der Startseite können jetzt verlinkt und außerdem auch "nur für Mitglieder" angezeigt werden. [I#600](https://github.com/foodcoopshop/foodcoopshop/issues/600) / [PR#606](https://github.com/foodcoopshop/foodcoopshop/pull/606) -- Die automatisch versendeten E-Mails bei Preis- und Gewichtsanpassungen von bestellten Produkten können nun global abgestellt werden. [I#576](https://github.com/foodcoopshop/foodcoopshop/issues/576) / [PR#577](https://github.com/foodcoopshop/foodcoopshop/pull/577) -- Fehlerhafte Gewichtsänderungen (z.B. 700 kg statt 700 g) können nun nicht mehr getätigt werden. [I#590](https://github.com/foodcoopshop/foodcoopshop/issues/590) / [PR#593](https://github.com/foodcoopshop/foodcoopshop/pull/593) -- Beim Ändern des Abgeholt-Status wird nun überprüft, ob das Gewicht für alle Produkte eingetragen wurde. [I#614](https://github.com/foodcoopshop/foodcoopshop/issues/614) / [PR#615](https://github.com/foodcoopshop/foodcoopshop/pull/615) -- Zur besseren Übersicht wird das "Bestellbar bis"-Datum jetzt bei jedem Produkt angezeigt. Außer bei Produkten mit wöchentlichem Lieferrhythmus und Standard-Bestellschluss. [I#585](https://github.com/foodcoopshop/foodcoopshop/issues/585) / [PR#594](https://github.com/foodcoopshop/foodcoopshop/pull/594) -- Produktbilder im Hochformat werden jetzt in der Lightbox besser dargestellt. [I#579](https://github.com/foodcoopshop/foodcoopshop/issues/579) / [PR#596](https://github.com/foodcoopshop/foodcoopshop/pull/596) -- Möglichkeit zur kompletten Deaktivierung des Pfand-Systems. [I#604](https://github.com/foodcoopshop/foodcoopshop/issues/604) / [PR#607](https://github.com/foodcoopshop/foodcoopshop/pull/607) -- Es wird nun ein Cookie-Banner eingeblendet und die Datenschutzerklärung ist wieder aktuell bezüglich der verwendeten Cookies. [I#619](https://github.com/foodcoopshop/foodcoopshop/issues/619) / [PR#620](https://github.com/foodcoopshop/foodcoopshop/pull/620) -- Auf den Produkt-Bestelllisten scheint nun auch die Summe der Produkt-Einheit (kg, g) auf. [I#333](https://github.com/foodcoopshop/foodcoopshop/issues/333) / [PR#578](https://github.com/foodcoopshop/foodcoopshop/pull/578) -- Die Software ist kompatibel mit PHP 8.0. -- Das Logo kann jetzt auch in anderen Formaten verwendet werden. Neuer Standard ist PNG. [PR#637](https://github.com/foodcoopshop/foodcoopshop/pull/637) - -### Bugfixes -- Bestelllisten- und Rechnungsversand werden jetzt über eine Queue versendet. Das verhindert seltene, aber nervige Fehler beim Versenden. [I#410](https://github.com/foodcoopshop/foodcoopshop/issues/410) / [I#560](https://github.com/foodcoopshop/foodcoopshop/issues/560) / [I#562](https://github.com/foodcoopshop/foodcoopshop/issues/562) / [PR#561](https://github.com/foodcoopshop/foodcoopshop/pull/561) / [PR#566](https://github.com/foodcoopshop/foodcoopshop/pull/566) / [PR#553](https://github.com/foodcoopshop/foodcoopshop/pull/553) -- Hochgeladene Bilder (z.B. Slideshow) waren machmal leicht unscharf. [I#558](https://github.com/foodcoopshop/foodcoopshop/issues/558) / [PR#573](https://github.com/foodcoopshop/foodcoopshop/pull/573) -- Deutsche IBANs können nun eingetragen werden, das Feld war zu kurz. [I#559](https://github.com/foodcoopshop/foodcoopshop/issues/559) / [PR#564](https://github.com/foodcoopshop/foodcoopshop/pull/564) -- Lieferrhythmus "erster Freitag im Monat" kombiniert mit "Sonntag Bestellschluss" hat nicht korrekt funktioniert. [I#567](https://github.com/foodcoopshop/foodcoopshop/issues/567) / [PR#568](https://github.com/foodcoopshop/foodcoopshop/pull/568) -- Monatlicher Lieferrhythmus kombiniert mit "erster Liefertag" hat nicht korrekt funktioniert. [I#623](https://github.com/foodcoopshop/foodcoopshop/issues/623) / [PR#624](https://github.com/foodcoopshop/foodcoopshop/pull/624) - -### Code Cleaning -- Die Übersetzung auf Polnisch wurde entfernt. Sie wurde nicht mehr verwendet und auch nicht mehr upgedatet. [I#631](https://github.com/foodcoopshop/foodcoopshop/issues/631) / [PR#632](https://github.com/foodcoopshop/foodcoopshop/pull/632) -- CI-Umstellung von Travis auf Github Actions [PR#556](https://github.com/foodcoopshop/foodcoopshop/pull/556) - -### Deprecations -- ⚠️⚠️⚠️ Wer das [Stundenabrechnungs-Modul](https://foodcoopshop.github.io/de/stundenabrechnungs-modul.html) aktiv verwendet, soll sich bitte bei mir melden. Ich habe nämlich den Eindruck, dass es kaum in Gebrauch ist. Da aber die Wartung Aufwand bedeutet, werde ich das Modul - sofern sich bis dahin niemand meldet - ab v3.3 (Herbst 2021) aus der Software entfernen. - -Datum: 08.03.2021 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/14) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.1.0...v3.2.0) - -# v3.1.0 - -### Herzlichen Dank an alle beteiligten Personen -* [AndreasEgger](https://github.com/AndreasEgger) -* [dpakach](https://github.com/dpakach) -* [mrothauer](https://github.com/mrothauer) -* [swoichha](https://github.com/swoichha) -* [vmvbruck](https://github.com/vmvbruck) - -### Neue Funktionen -- Automatischer Kontoabgleich für das Guthaben-System (CSV-Upload). [Zur Online-Doku](https://foodcoopshop.github.io/de/guthaben-system-mit-automatischem-kontoabgleich). [I#463](https://github.com/foodcoopshop/foodcoopshop/issues/463) / [PR#474](https://github.com/foodcoopshop/foodcoopshop/pull/474) -- Mitglieder können nun Feedback zu Produkten abgeben, der Hersteller wird automatisch per E-Mail darüber informiert. [I#391](https://github.com/foodcoopshop/foodcoopshop/issues/391) / [PR#536](https://github.com/foodcoopshop/foodcoopshop/pull/536) -- Viele Overlays (z.B. "Gewicht ändern", "Bild-Upload", "Abmelden") sind nun benutzerfreundlicher und systemweit vereinheitlicht. [I#328](https://github.com/foodcoopshop/foodcoopshop/issues/328) / [PR#524](https://github.com/foodcoopshop/foodcoopshop/pull/524) / [PR#530](https://github.com/foodcoopshop/foodcoopshop/pull/530) / [PR#537](https://github.com/foodcoopshop/foodcoopshop/pull/537) / [PR#538](https://github.com/foodcoopshop/foodcoopshop/pull/538) -- Verbesserungen bei der Gewichtsanpassung: Auch gleiches Gewicht ist nach dem Speichern nicht mehr rot hinterlegt. / Bei bereits verrechneten Bestellungen wird das Gewicht niemals rot angezeigt. / Neues Gewicht ist in der E-Mail-Betreffzeile - damit Fehler wie z.B. 540 kg (statt g) schneller auffallen. / Kein E-Mail-Versand falls das Gewicht gleich bleibt. [I#423](https://github.com/foodcoopshop/foodcoopshop/issues/423) / [PR#479](https://github.com/foodcoopshop/foodcoopshop/pull/479) -- Es ist jetzt möglich, als Bestellschluss für bestimmte Produkte auch **zwei Tage** vor dem Standard-Bestellschluss auszuwählen. Bisher war das nur für den Vortag möglich. [I#487](https://github.com/foodcoopshop/foodcoopshop/issues/487) / [PR#489](https://github.com/foodcoopshop/foodcoopshop/pull/489) -- 😍 Ab sofort können Emojis verwendet werden: Z.B. in Blog-Artikeln, Seiten oder beim Stornieren. Im Editor gibt's dazu ein neues Icon, beim Tippen von einem Doppelpunkt und zwei Buchstaben wird automatisch eine Liste mit Emojis angezeigt. [I#464](https://github.com/foodcoopshop/foodcoopshop/issues/464) / [PR#478](https://github.com/foodcoopshop/foodcoopshop/pull/478) -- Falls Produkte auch für uneingeloggte Mitglieder angezeigt werden, wird nun auch der In-den-Warenkorb-Button angezeigt. Wenn man darauf klickt, erhält man die Meldung, dass man sich zuerst registrieren muss. [I#499](https://github.com/foodcoopshop/foodcoopshop/issues/499) / [PR#500](https://github.com/foodcoopshop/foodcoopshop/pull/500) -- Neue Produkte werden nun auch auf der Startseite angezeigt. Das kann in den Einstellungen ausgestellt werden. [I#504](https://github.com/foodcoopshop/foodcoopshop/issues/504) / [PR#506](https://github.com/foodcoopshop/foodcoopshop/pull/506) -- Kunden von Hofläden können den Abholtag selbst beim Bestellabschluss auswählen. [Zur Online-Doku](https://foodcoopshop.github.io/de/hofladen-online.html). [PR#542](https://github.com/foodcoopshop/foodcoopshop/pull/542) - -### Bugfixes / Optimierungen -- Beim Ändern der Anzahl bzw. Anzahl-Einstellungen von Produkten wird der alte Wert nun wieder unter Aktivitäten angezeigt. [I#514](https://github.com/foodcoopshop/foodcoopshop/issues/514) / [PR#515](https://github.com/foodcoopshop/foodcoopshop/pull/515) -- Horizontales Scrollen auf kleinen Bildschirmen hat das Layout zerschossen. [I#497](https://github.com/foodcoopshop/foodcoopshop/issues/497) / [PR#498](https://github.com/foodcoopshop/foodcoopshop/pull/498) -- Man bleibt jetzt 30 Tage lang angemeldet, wenn man die Funkion "Angemeldet bleiben" verwendet. Bisher waren es 6. [I#492](https://github.com/foodcoopshop/foodcoopshop/issues/492) / [PR#493](https://github.com/foodcoopshop/foodcoopshop/pull/493) -- Die Daten für die Mitglieder-Drodowns im Admin-Bereich werden nun erst nach dem Daraufklicken geladen. Das lädt die Seiten schneller, besonders bei Initativen mit vielen Mitgliedern. [I#477](https://github.com/foodcoopshop/foodcoopshop/issues/477) / [PR#501](https://github.com/foodcoopshop/foodcoopshop/pull/501) -- Die automatische Zeichenbeschränkung in Formularen hat nicht mehr funktioniert (z.B. Feld "Kammer", Feld "Vorname") und führte zu einem Datenbank-Fehler. [I#485](https://github.com/foodcoopshop/foodcoopshop/issues/485) / [I#521](https://github.com/foodcoopshop/foodcoopshop/issues/521) / [PR#488](https://github.com/foodcoopshop/foodcoopshop/pull/525) / [PR#525](https://github.com/foodcoopshop/foodcoopshop/pull/488) -- Infotext bei der Lieferpause ist jetzt leichter verständlich. [I#469](https://github.com/foodcoopshop/foodcoopshop/issues/469) / [PR#482](https://github.com/foodcoopshop/foodcoopshop/pull/482) -- Bestelllisten sind ab und zu nicht über die Fallback-Konfiguration versendet worden. [I#495](https://github.com/foodcoopshop/foodcoopshop/issues/495) / [PR#496](https://github.com/foodcoopshop/foodcoopshop/pull/496) -- Der neue PDF-Writer kann nun PDFs unabhängig von Controllern erzeugen (als Attachment, Inline oder File). [I#412](https://github.com/foodcoopshop/foodcoopshop/issues/412) / [PR#508](https://github.com/foodcoopshop/foodcoopshop/pull/508) -- Bei der Validierung der E-Mail-Adressen wird jetzt auch der MX-Eintrag überprüft. Das vermeidet das Eintragen von ungültigen E-Mail-Adressen, die zwar syntaktisch korrekt sind, bei denen sich aber beim Domainnamen ein Tippfehler eingeschlichen hat. [I#465](https://github.com/foodcoopshop/foodcoopshop/issues/465) / [PR#516](https://github.com/foodcoopshop/foodcoopshop/pull/516) -- Home- und Blog-Slider: OwlCarousel2 wurde ersetzt mit Swiper. [I#512](https://github.com/foodcoopshop/foodcoopshop/issues/512) / [PR#535](https://github.com/foodcoopshop/foodcoopshop/pull/535) -- All tests now work without HttpClient and use IntegrationTestTrait, the tests are now about 45% faster! [I#404](https://github.com/foodcoopshop/foodcoopshop/issues/404) / [PR#550](https://github.com/foodcoopshop/foodcoopshop/pull/550) / [PR#529](https://github.com/foodcoopshop/foodcoopshop/pull/529) / [PR#531](https://github.com/foodcoopshop/foodcoopshop/pull/531) / [PR#532](https://github.com/foodcoopshop/foodcoopshop/pull/532) -- FoodCoopShop verwendet jetzt CakePHP v4.1.x. [I#541](https://github.com/foodcoopshop/foodcoopshop/issues/541) / [PR#545](https://github.com/foodcoopshop/foodcoopshop/pull/545) - -Datum: 07.09.2020 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/13) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.0.2...v3.1.0) - -# v3.0.2 - -### Bugfix -- Produkte waren fehlerhafterweise bestellbar, wenn das Produkt früher mal als Lagerprodukt deklariert war und das Feld "Bestellbar bis zu einer Anzahl von" einen Wert < 0 enthielt. -- Es gab immer wieder Probleme beim automatischen Vermindern der Anzahl, wenn im gleichen Warenkorb ein Produkt mit einer Variante vorhanden war und dieses Produkt genau vor dem entsprechenden Produkt gereiht war. War schwer zu finden... / [PR#484](https://github.com/foodcoopshop/foodcoopshop/pull/484) - -Datum: 26.03.2020 / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.0.1...v3.0.2) - -# v3.0.1 - -### Bugfix -- Kategorien wurden nicht korrekt sortiert. / [C](https://github.com/foodcoopshop/foodcoopshop/commit/35d940d82912200d6aab60dd6adc5fedbb68b4de) - -Datum: 22.03.2020 / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.0.0...v3.0.1) - -# v3.0.0 - -### Herzlichen Dank an alle beteiligten Personen -* [AndreasEgger](https://github.com/AndreasEgger) -* [mrothauer](https://github.com/mrothauer) - -### Neue Funktionen -- Bei Produkten kann nun als Anzahl "immer verfügbar" eingestellt werden. Weiters kann mittels "Standard-Anzahl pro Lieferrhythmus" festgelegt werden, auf welche verfügbare Anzahl nach erfolgtem Bestelllisten-Versand automatisch wieder hochgezählt wird. Details in der [Online-Dokumentation](https://foodcoopshop.github.io/de/produkte). [I#452](https://github.com/foodcoopshop/foodcoopshop/issues/452) / [I#324](https://github.com/foodcoopshop/foodcoopshop/issues/324) / [PR#457](https://github.com/foodcoopshop/foodcoopshop/pull/457) / -- Das Hauptmenü des Frontends wird nun eingeblendet, sobald man nach oben scrollt. [I#438](https://github.com/foodcoopshop/foodcoopshop/issues/438) / [PR#440](https://github.com/foodcoopshop/foodcoopshop/pull/440) -- Produkte von Sammelbestellungen, bei denen die Bestellfrist bereits erreicht wurde, können über die Sofort-Bestellung jetzt trotzdem bestellt werden. Das ist praktisch für Nachbuchungen. [I#443](https://github.com/foodcoopshop/foodcoopshop/issues/454) / [PR#454](https://github.com/foodcoopshop/foodcoopshop/pull/440) - -### Bugfixes / Updates -- Die Auto-Login-Funktion ("Angemeldet bleiben") hat nicht mehr richtig funktioniert. [I#439](https://github.com/foodcoopshop/foodcoopshop/issues/439) / [PR#444](https://github.com/foodcoopshop/foodcoopshop/pull/444) -- Beim Löschen eines Mitgliedes werden die Bestellungen nun auf "mit dem Hersteller verrechnet" überprüft (und nicht mehr, ob sie 2 Monate alt sind). Weiters wird überprüft, ob die Guthaben-Aufladungen der letzten zwei Jahre bestätigt sind. [I#451](https://github.com/foodcoopshop/foodcoopshop/issues/451) / [PR#456](https://github.com/foodcoopshop/foodcoopshop/pull/456) -- Unter "Aktivitäten" wird ab sofort bei Einträgen des Rechnungsversands die korrekte Uhrzeit angezeigt. Diese war bisher auf 00:00 gesetzt. [I#451](https://github.com/foodcoopshop/foodcoopshop/issues/451) / [PR#455](https://github.com/foodcoopshop/foodcoopshop/pull/455) -- FoodCoopShop verwendet jetzt [CakePHP v4.0](https://book.cakephp.org/4/en/index.html). [I#445](https://github.com/foodcoopshop/foodcoopshop/issues/445) / [PR#446](https://github.com/foodcoopshop/foodcoopshop/pull/446) -- FoodCoopShop ist jetzt mit PHP 7.4 kompatibel. [I#448](https://github.com/foodcoopshop/foodcoopshop/issues/448) / [PR#449](https://github.com/foodcoopshop/foodcoopshop/pull/449) -- Die Begrenzung der maximalen Zeichenanzahl bei Seiten, Blog-Artikel, Produkt- und Herstellerbeschreibung wurde erhöht. [I#460](https://github.com/foodcoopshop/foodcoopshop/issues/460) / [PR#462](https://github.com/foodcoopshop/foodcoopshop/pull/462) -- Neue Kategorien waren nicht mehr alfabetisch sortiert. [I#458](https://github.com/foodcoopshop/foodcoopshop/issues/458) / [PR#459](https://github.com/foodcoopshop/foodcoopshop/pull/459) -- Legacy-Code von FCS v2 wurde entfernt. [PR#468](https://github.com/foodcoopshop/foodcoopshop/pull/468) - -Datum: 20.03.2020 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/12) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v2.7.1...3.0.0) - -[Zum Changelog von FoodCoopShop v2.x](devtools/CHANGELOG-v2.md) +[Zum Changelog von FoodCoopShop v3.0-v3.4](devtools/CHANGELOG-v3.md) diff --git a/devtools/CHANGELOG-v3.md b/devtools/CHANGELOG-v3.md new file mode 100644 index 0000000000..7c587e88aa --- /dev/null +++ b/devtools/CHANGELOG-v3.md @@ -0,0 +1,235 @@ + +# v3.4.2 + +### Security update +Fixed security issue in CKEditor. + +Datum: 18.03.2022 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/16) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.4.1...v3.4.2) + +# v3.4.1 + +### Bugfix +- Fix error on creating build. [PR#802](https://github.com/foodcoopshop/foodcoopshop/pull/802) + +Datum: 06.03.2022 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/16) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.4.0...v3.4.1) + +# v3.4.0 + +### Herzlichen Dank an alle beteiligten Personen +* [Confuset](https://github.com/Confuset) +* [mrothauer](https://github.com/mrothauer) +* [ocapito](https://github.com/ocapito) +* [pabneukistl](https://github.com/pabneukistl) + +### Verbesserungen +- Die Summe im Warenkorb ist jetzt in Warenwert, Pfandsumme und Gesamtbetrag aufgesplittet. [I#636](https://github.com/foodcoopshop/foodcoopshop/issues/636) / [PR#699](https://github.com/foodcoopshop/foodcoopshop/pull/699) +- Der Instagram-Account kann nun in den Einstellungen angegeben werden, außerdem ist der Bereich für die Social-Media-Links im Footer neu gestaltet. [I#642](https://github.com/foodcoopshop/foodcoopshop/issues/642) / [PR#706](https://github.com/foodcoopshop/foodcoopshop/pull/706) +- Im Selbstbedienungs-Modus werden die Produkte erst nach Suche, Scannen oder Kategorie-Auswahl angezeigt. Außerdem steht im Kategorien-Dropdown jetzt die Produkt-Anzahl. [I#703](https://github.com/foodcoopshop/foodcoopshop/issues/703) / [PR#704](https://github.com/foodcoopshop/foodcoopshop/pull/704) +- Für Admins und Superadmins ist es jetzt möglich, über den Selbstbedienungs-Modus für andere Mitglieder zu bestellen. Der Vorteil gegenüber der Sofort-Bestellung besteht darin, dass das tatsächlich entnommene Gewicht direkt beim Bestellen eingegeben werden kann. [I#703](https://github.com/foodcoopshop/foodcoopshop/issues/703) / [PR#718](https://github.com/foodcoopshop/foodcoopshop/pull/718) +- Beim Bild-Upload ist jetzt neben dem JPG-Format auch PNG und GIF verwendbar. [I#702](https://github.com/foodcoopshop/foodcoopshop/issues/702) / [PR#720](https://github.com/foodcoopshop/foodcoopshop/pull/720) +- Selbstbedienungs-Modus: Bereits bestehende Barcodes (EAN-13) können nun Produkten und Varianten zugewiesen und zum Scannen verwendet werden. [I#707](https://github.com/foodcoopshop/foodcoopshop/issues/706) / [PR#729](https://github.com/foodcoopshop/foodcoopshop/pull/729) +- Der CSV-Upload für die Guthaben-Aufladungen unterstützt jetzt auch die Volksbank. [I#732](https://github.com/foodcoopshop/foodcoopshop/issues/732) / [PR#733](https://github.com/foodcoopshop/foodcoopshop/pull/733) +- Der zweiwöchige Lieferrhythmus kann jetzt so eingestellt werden, dass die Produkte nur noch in der Woche vor der Lieferung bestellt werden können. In der anderen Woche sind bei aktivierter Einstellung die Produkte beim Bestellen zwar sichtbar, aber nicht bestellbar. Auch bei einem vorgezogenen Bestellschluss, kann nur mehr in der Woche vor der Lieferung bestellt werden (gilt für ein- und zweiwöchig). Alle anderen Lieferrhythmen sind von der neuen Einstellung nicht betroffen. [I#716](https://github.com/foodcoopshop/foodcoopshop/issues/716) / [PR#734](https://github.com/foodcoopshop/foodcoopshop/pull/734) [C](https://github.com/foodcoopshop/foodcoopshop/commit/3e375b05e301c478b6dd0ecd34fdb969e20645bf) [PR#792](https://github.com/foodcoopshop/foodcoopshop/pull/792) [PR#793](https://github.com/foodcoopshop/foodcoopshop/pull/793) +- Im neuen Bereich "Benachrichtigungen" im User-Profil kann der User selbst folgende Benachrichtigungs-E-Mails deaktivieren: Guthaben-Erinnerungs-Mail, Rechnung, Abholtag-Erinnerung, Überweisung wurde ins Guthaben-System übernommen. [I#739](https://github.com/foodcoopshop/foodcoopshop/issues/739) / [I#752](https://github.com/foodcoopshop/foodcoopshop/issues/752) / [PR#740](https://github.com/foodcoopshop/foodcoopshop/pull/740) / [PR#754](https://github.com/foodcoopshop/foodcoopshop/pull/754) +- Als "abgeholt" markierte Bestellungen werden nun im unteren Bereich der Liste "Admin-Bereich / Bestellungen" gruppiert angezeigt. Damit bleibt die Liste auch bei vielen Bestellungen übersichtlich. [C](https://github.com/foodcoopshop/foodcoopshop/commit/cc53502b57b5d42e6ba5f01b2bb9d91383cca253) +- Statusmeldungen (z.B. "Dein Profil wurde erfolgreich geändert.") schließen sich jetzt automatisch nach 5 Sekunden. Fehlermeldungen müssen nach wie vor manuell geschlossen werden. [PR#746](https://github.com/foodcoopshop/foodcoopshop/pull/746) +- Die 🥕 Karotte für neue Mitglieder wird angezeigt, wenn Bestellungen für maximal 2 Abholtage vorhanden sind. [C](https://github.com/foodcoopshop/foodcoopshop/commit/6fe59562a5e96813425a138e27de57d8fb482135) +- Neue Hersteller-Einstellung: "Sollen die Bestelllisten auch Lagerprodukte enthalten?". [I#756](https://github.com/foodcoopshop/foodcoopshop/issues/756) / [PR#758](https://github.com/foodcoopshop/foodcoopshop/pull/758) +- Beim Ändern des Abholtages werden Mitglieder jetzt nicht mehr automatisch per E-Mail benachrichtigt. Die Benachrichtigung kann aber durch eine Checkbox aktiviert werden. [I#787](https://github.com/foodcoopshop/foodcoopshop/issues/787) / [PR#788](https://github.com/foodcoopshop/foodcoopshop/pull/788) + +### Neue Funktionen für den [Einzelhandels-Modus](https://foodcoopshop.github.io/de/dorfladen-online.html) +- Im Selbstbedienungs-Modus wird jetzt nach jedem Einkauf automatisch die Rechnung erstellt. Sie wird auch automatisch gedruckt, wenn die Funktion "Rechnungen per E-Mail erhalten" deaktiviert wurde. [I#696](https://github.com/foodcoopshop/foodcoopshop/issues/696) / [PR#697](https://github.com/foodcoopshop/foodcoopshop/pull/697) +- Die Rechnungen werden nun automatisch gedruckt, bar bezahlt wurde und die Funktion "Rechnungen per E-Mail erhalten" deaktiviert ist. [I#698](https://github.com/foodcoopshop/foodcoopshop/issues/698) / [PR#769](https://github.com/foodcoopshop/foodcoopshop/pull/769) +- Kunden haben jetzt im neuen Menüpunkt "Meine Rechnungen" eine schöne Rechnungs-Übersicht mit Download-Funktion. [I#646](https://github.com/foodcoopshop/foodcoopshop/issues/646) / [PR#705](https://github.com/foodcoopshop/foodcoopshop/pull/705) +- Es gibt nun eine neue Kunden-Einstellung, die Bestellungen zu Einkaufspreisen (für Eigenverbrauch) oder zu Nullpreisen (Vorbestellung von Produkten, die später nochmal verkauft werden) ermöglicht. [I#672](https://github.com/foodcoopshop/foodcoopshop/issues/672) / [PR#712](https://github.com/foodcoopshop/foodcoopshop/pull/712) +- Falls die Funktion zum Erfassen der Einkaufspreise aktiviert ist, können Hersteller nun folgende Daten der eigenen Produkte nicht mehr ändern: Einkaufspreis, Verkaufspreis, Pfand, Steuer. Außerdem wird auf den Bestelllisten der Preis nicht mehr angezeigt. [I#710](https://github.com/foodcoopshop/foodcoopshop/issues/710) [I#711](https://github.com/foodcoopshop/foodcoopshop/issues/711) / [PR#714](https://github.com/foodcoopshop/foodcoopshop/pull/714) [PR#715](https://github.com/foodcoopshop/foodcoopshop/pull/715) +- Weiters werden Produkte bzw. Varianten ohne Einkaufspreis nicht mehr im Produktkatalog angezeigt und können so nicht bestellt werden. [I#745](https://github.com/foodcoopshop/foodcoopshop/issues/745) / [PR#748](https://github.com/foodcoopshop/foodcoopshop/pull/748) +- Die Verkaufspreise können jetzt auch auf Basis eines Aufschlages automatisch berechnet werden. [I#721](https://github.com/foodcoopshop/foodcoopshop/issues/721) / [PR#722](https://github.com/foodcoopshop/foodcoopshop/pull/722) +- Der Aufschlag, also die Differenz zwischen Netto-Einkaufpreis und Netto-Verkaufspreis wird im Admin-Bereich jetzt als Prozent- und Euro-Betrag angezeigt. [I#723](https://github.com/foodcoopshop/foodcoopshop/issues/723) / [PR#736](https://github.com/foodcoopshop/foodcoopshop/pull/736) +- Möglichkeit zum Erstellen eines Lieferscheines für die Hersteller. Die Datei (Excel-Format) enthält alle notwendigen Daten für die Erstellung einer Rechnung an den Betreiber (u.a. die Einkaufspreise). [I#627](https://github.com/foodcoopshop/foodcoopshop/issues/627) / [PR#738](https://github.com/foodcoopshop/foodcoopshop/pull/738) +- Diese Lieferscheine werden ab sofort auch automatisch 1x monatlich (immer am 1.) an die Hersteller versendet. Das Hakerl in den Hersteller-Einstellungen muss dafür aktiviert werden. [I#772](https://github.com/foodcoopshop/foodcoopshop/issues/772) / [PR#789](https://github.com/foodcoopshop/foodcoopshop/pull/789) +- Optimierungen für Barverkäufe. [I#742](https://github.com/foodcoopshop/foodcoopshop/issues/742) / [PR#743](https://github.com/foodcoopshop/foodcoopshop/pull/743) / [PR#747](https://github.com/foodcoopshop/foodcoopshop/pull/747) +- Gutscheine lassen sich nun anhand [dieser Anleitung](https://foodcoopshop.github.io/de/dorfladen-online-gutscheine.html) super im System abbilden. [I#750](https://github.com/foodcoopshop/foodcoopshop/issues/750) / [PR#762](https://github.com/foodcoopshop/foodcoopshop/pull/762) + +### Bugfixes / Updates / Performance +- Bei Installation mit vielen Produkten (> 500) waren Frontend-Seiten mit Produktlisten (Kategorie-Detailseite und Hersteller-Profil) sehr langsam. Jetzt laufen diese deutlich schneller. [I#700](https://github.com/foodcoopshop/foodcoopshop/issues/700) / [PR#764](https://github.com/foodcoopshop/foodcoopshop/pull/764) +- Fehlerhafte SQL-Abfrage mit MariaDB beim Erstellen der Bestelllisten. [I#724](https://github.com/foodcoopshop/foodcoopshop/issues/724) / [PR#726](https://github.com/foodcoopshop/foodcoopshop/pull/726) +- Die Sortierung von Mitgliedern / Herstellern funktioniert jetzt systemweit (z.B. in Admin-Bereich / Bestellungen) auch mit beginnenden Umlauten bzw. Kleinbuchstaben. [C1](5edbc970cc688f7a116ffba04170b391cc5a2e77) / [C2](aa12d4d18d14834dc82a84aa0b8dc068b1356f6d) +- CakePHP Update v4.3. [I#728](https://github.com/foodcoopshop/foodcoopshop/issues/728) / [PR#731](https://github.com/foodcoopshop/foodcoopshop/pull/731) +- BackupDatabaseShell now uses defined port. [PR#749](https://github.com/foodcoopshop/foodcoopshop/pull/749) + +Datum: 06.03.2022 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/16) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.3.0...v3.4.0) + +# v3.3.0 + +### Herzlichen Dank an alle beteiligten Personen +* [mrothauer](https://github.com/mrothauer) + +### Neue Funktionen +- Pfand-Rückgaben für Mitglieder können nun auch dann eingegeben werden, auch wenn das Mitglied in der aktuellen Woche nicht bestellt hat. Der Button "Pfand-Rückgabe" wird immer angezeigt, das Mitglied kann dann aus einer Dropdown-Liste ausgewählt werden. [I#654](https://github.com/foodcoopshop/foodcoopshop/issues/654) / [PR#655](https://github.com/foodcoopshop/foodcoopshop/pull/655) +- Produkte können jetzt auch einem Lagerort zugewiesen werden (z.B. Keine Kühlung, Kühlschrank, Tiefkühler). In der Liste "Bestellungen als PDF" werden die Produkte entsprechend sortiert angezeigt. [I#662](https://github.com/foodcoopshop/foodcoopshop/issues/662) / [PR#690](https://github.com/foodcoopshop/foodcoopshop/pull/690) +- Das Frontend wurde optisch aufgepeppt: Blog-Artikel, Hauptmenü, das mobile Menü, die Produkt-Liste und der Footer sind nun frischer. Weiters ist die Haupt-Schrift etwas größer und die Fett-Schrift dezenter. [I#643](https://github.com/foodcoopshop/foodcoopshop/issues/643) / [PR#648](https://github.com/foodcoopshop/foodcoopshop/pull/648) + +### Verbesserungen +- Bei der Produktbeschreibung wird jetzt ein Hinweis angezeigt, falls bereits offene Bestellungen vorhanden sind. Irrtümliche doppelte Bestellungen werden so vermieden. [I#681](https://github.com/foodcoopshop/foodcoopshop/issues/681) / [PR#694](https://github.com/foodcoopshop/foodcoopshop/pull/694) +- Bei Produkten ohne Bild wird jetzt das Hersteller-Logo angezeigt. Falls kein Hersteller-Logo vorhanden ist, wird das definierte Standard-Bild anzeigt. [I#490](https://github.com/foodcoopshop/foodcoopshop/issues/490) / [PR#693](https://github.com/foodcoopshop/foodcoopshop/pull/693) +- Beim Erstellen eines neuen Blog-Artikels kann nun angegeben werden, wie lange er auf der Startseite angezeigt werden soll. Danach verschwindet er automatisch. [I#601](https://github.com/foodcoopshop/foodcoopshop/issues/601) / [PR#664](https://github.com/foodcoopshop/foodcoopshop/pull/664) +- Beim Registrieren mit automatischer Aktivierung muss ab sofort die E-Mail-Adresse bestätigt werden, sonst bleibt der neue User inaktiv. [I#656](https://github.com/foodcoopshop/foodcoopshop/issues/656) / [PR#657](https://github.com/foodcoopshop/foodcoopshop/pull/657) +- Das Bestelldatum wird nun im Tooltip über dem Bestellstatus-Icon angezeigt. [I#652](https://github.com/foodcoopshop/foodcoopshop/issues/652) / [PR#653](https://github.com/foodcoopshop/foodcoopshop/pull/653) +- Alle Formulare sind jetzt noch besser gegen potenzielle Angriffe abgesichert. [I#659](https://github.com/foodcoopshop/foodcoopshop/issues/659) / [PR#661](https://github.com/foodcoopshop/foodcoopshop/pull/661) + +### Neue Funktionen für den [Einzelhandels-Modus](https://foodcoopshop.github.io/de/dorfladen-online.html) +- Nahtlose Integration der Registrierkasse HelloCash für den Einzelhandels-Modus. [Zur Online-Doku](https://foodcoopshop.github.io/de/registrierkasse-hello-cash.html). [I#683](https://github.com/foodcoopshop/foodcoopshop/issues/683) / [PR#686](https://github.com/foodcoopshop/foodcoopshop/pull/686) / [I#687](https://github.com/foodcoopshop/foodcoopshop/issues/687) / [PR#691](https://github.com/foodcoopshop/foodcoopshop/pull/691) +- Für Produkte kann nun auch der Einkaufspreis und dessen Umsatzsteuer angegeben werden. Diese Daten werden dann bei den Bestellungen mitgespeichert und liefern so die Datengrundlage für die neue Gewinnermittlung. [I#660](https://github.com/foodcoopshop/foodcoopshop/issues/660) / [PR#680](https://github.com/foodcoopshop/foodcoopshop/pull/680) / [I#671](https://github.com/foodcoopshop/foodcoopshop/issues/671) / [PR#692](https://github.com/foodcoopshop/foodcoopshop/pull/692) + +### Bugfixes +- Guthaben-Aufladungen mit CSV-Upload: Wenn ein Mitglied nicht ausgewählt wurde und man speichern wollte, wurde nicht die Fehlermeldung beim Mitglied angezeigt, sondern die allgemeine Fehlerseite. [I#677](https://github.com/foodcoopshop/foodcoopshop/issues/677) / [PR#678](https://github.com/foodcoopshop/foodcoopshop/pull/678) +- Mehrwöchiger Lieferrhythmus für Produkte mit Standard-Bestellschluss Montag und vorgezogener Bestellschluss Samstag wurde falsch berechnet. [PR#701](https://github.com/foodcoopshop/foodcoopshop/pull/701) + +### Code Cleaning +- Die alte Funktion zum Verwalten der Mitgliedbeiträge wurde entfernt. [Anleitung zum Umstellen auf das neue System](https://foodcoopshop.github.io/de/mitgliedsbeitraege.html). [I#666](https://github.com/foodcoopshop/foodcoopshop/issues/666) / [PR#667](https://github.com/foodcoopshop/foodcoopshop/pull/667) +- Sauberere SQL-Statements durch Verwendung von QueryExpression. [I#644](https://github.com/foodcoopshop/foodcoopshop/issues/644) / [PR#645](https://github.com/foodcoopshop/foodcoopshop/pull/645) + +Datum: 06.09.2021 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/15) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.2.2...v3.3.0) + +# v3.2.2 + +### Security Fix +* Das Registrierungsformular und das Formular zum Bearbeiten des User-Profils sind nun besser abgesichert. + +Datum: 12.04.2021 / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.2.1...v3.2.2) + +# v3.2.1 + +### Bugfixes +* Wenn ein Hersteller die eigenen Einstellungen speichert, wird die Ansprechperson jetzt nicht mehr gelöscht. +* Layout-Fix im Overlay für die Produkt-Beschreibung. +* Kamera-Icon wurde auf der Login-Seite für den Selbstbedienung-Modus auf Smartphones nicht angezeigt. +* Wenn die Erstinstallation <= v3.0 war, müssen [zwei Migrations manuell ausgeführt werden](https://foodcoopshop.github.io/en/migration-guide.html). + +Datum: 23.03.2021 / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.2.0...v3.2.1) + +# v3.2.0 + +### Herzlichen Dank an alle beteiligten Personen +* [AndreasEgger](https://github.com/AndreasEgger) +* [mantensteiner](https://github.com/mantensteiner) +* [markuskoban](https://github.com/markuskoban) +* [mrothauer](https://github.com/mrothauer) +* [reicharm](https://github.com/reicharm) + +### Neue Funktionen +- Das neue Modul zur Erstellung von Kunden-Rechnungen ermöglicht die Verwendung der Software im Einzelhandel. [Zur Online-Doku](https://foodcoopshop.github.io/de/dorfladen-online.html). [I#572](https://github.com/foodcoopshop/foodcoopshop/issues/572) / [PR#580](https://github.com/foodcoopshop/foodcoopshop/pull/580) / [PR#584](https://github.com/foodcoopshop/foodcoopshop/pull/584) / [PR#599](https://github.com/foodcoopshop/foodcoopshop/pull/599) +- Die Verwaltung der Mitgliedsbeiträge ist nun stark vereinfacht. [Zur Online-Doku](https://foodcoopshop.github.io/de/mitgliedsbeitraege.html). [I#471](https://github.com/foodcoopshop/foodcoopshop/issues/471) / [PR#608](https://github.com/foodcoopshop/foodcoopshop/pull/608) +- 📷 Beim Einkaufen im Selbstbedienungs-Modus kann man nun direkt mit der Smartphone-Kamera (ganz ohne App) die Barcodes scannen. [I#557](https://github.com/foodcoopshop/foodcoopshop/issues/557) / [PR#563](https://github.com/foodcoopshop/foodcoopshop/pull/563) +- Die stark verbesserte Pfand-Übersicht bringt endlich Licht 💡 in den Pfand-Dschungel 🐵, der sich bei manchen Initiativen über die Jahre ergeben hat. [I#570](https://github.com/foodcoopshop/foodcoopshop/issues/570) / [PR#571](https://github.com/foodcoopshop/foodcoopshop/pull/571) +- ☑ Beim Kontrollieren der Bestellungen bleiben die Produkte jetzt angehakt, wenn z.B. Gewicht oder Preis geändert wird. Wenn die Hakerl nicht wieder entfernt werden, sind sie nach 24 Stunden automatisch weg. [I#616](https://github.com/foodcoopshop/foodcoopshop/issues/616) / [PR#617](https://github.com/foodcoopshop/foodcoopshop/pull/617) +- Das eingestellte Guthaben-Limit kann nun beim normalen Bestellen nicht mehr unterschritten werden. Bei Sofort-Bestellungen und Preis- bzw. Gewichtsanpassungen ist dies aber weiterhin möglich. [I#555](https://github.com/foodcoopshop/foodcoopshop/issues/555) / [PR#574](https://github.com/foodcoopshop/foodcoopshop/pull/574) / [PR#603](https://github.com/foodcoopshop/foodcoopshop/pull/603) / [PR#635](https://github.com/foodcoopshop/foodcoopshop/pull/635) +- Die Guthaben-Höhe, ab der die Guthaben-Erinnerungsmail versendet wird, kann nun individuell eingestellt werden. Eine Erhöhung auf z.B. 50 € ist für Initiativen sinnvoll, die den CSV-Upload verwenden. [I#621](https://github.com/foodcoopshop/foodcoopshop/issues/621) / [PR#622](https://github.com/foodcoopshop/foodcoopshop/pull/622) +- Das individuelle Farbschema wird jetzt auch im Admin-Bereich angewendet. [I#613](https://github.com/foodcoopshop/foodcoopshop/issues/613) / [PR#630](https://github.com/foodcoopshop/foodcoopshop/pull/630) + +### Kleinere Verbesserungen +- Es gibt neue Lieferrhythmen: "jeder 2., 3. bzw. 4. Freitag im Monat" [I#581](https://github.com/foodcoopshop/foodcoopshop/issues/581) / [PR#582](https://github.com/foodcoopshop/foodcoopshop/pull/582) / Validierung: [PR#624](https://github.com/foodcoopshop/foodcoopshop/pull/624) +- Slideshow-Bilder auf der Startseite können jetzt verlinkt und außerdem auch "nur für Mitglieder" angezeigt werden. [I#600](https://github.com/foodcoopshop/foodcoopshop/issues/600) / [PR#606](https://github.com/foodcoopshop/foodcoopshop/pull/606) +- Die automatisch versendeten E-Mails bei Preis- und Gewichtsanpassungen von bestellten Produkten können nun global abgestellt werden. [I#576](https://github.com/foodcoopshop/foodcoopshop/issues/576) / [PR#577](https://github.com/foodcoopshop/foodcoopshop/pull/577) +- Fehlerhafte Gewichtsänderungen (z.B. 700 kg statt 700 g) können nun nicht mehr getätigt werden. [I#590](https://github.com/foodcoopshop/foodcoopshop/issues/590) / [PR#593](https://github.com/foodcoopshop/foodcoopshop/pull/593) +- Beim Ändern des Abgeholt-Status wird nun überprüft, ob das Gewicht für alle Produkte eingetragen wurde. [I#614](https://github.com/foodcoopshop/foodcoopshop/issues/614) / [PR#615](https://github.com/foodcoopshop/foodcoopshop/pull/615) +- Zur besseren Übersicht wird das "Bestellbar bis"-Datum jetzt bei jedem Produkt angezeigt. Außer bei Produkten mit wöchentlichem Lieferrhythmus und Standard-Bestellschluss. [I#585](https://github.com/foodcoopshop/foodcoopshop/issues/585) / [PR#594](https://github.com/foodcoopshop/foodcoopshop/pull/594) +- Produktbilder im Hochformat werden jetzt in der Lightbox besser dargestellt. [I#579](https://github.com/foodcoopshop/foodcoopshop/issues/579) / [PR#596](https://github.com/foodcoopshop/foodcoopshop/pull/596) +- Möglichkeit zur kompletten Deaktivierung des Pfand-Systems. [I#604](https://github.com/foodcoopshop/foodcoopshop/issues/604) / [PR#607](https://github.com/foodcoopshop/foodcoopshop/pull/607) +- Es wird nun ein Cookie-Banner eingeblendet und die Datenschutzerklärung ist wieder aktuell bezüglich der verwendeten Cookies. [I#619](https://github.com/foodcoopshop/foodcoopshop/issues/619) / [PR#620](https://github.com/foodcoopshop/foodcoopshop/pull/620) +- Auf den Produkt-Bestelllisten scheint nun auch die Summe der Produkt-Einheit (kg, g) auf. [I#333](https://github.com/foodcoopshop/foodcoopshop/issues/333) / [PR#578](https://github.com/foodcoopshop/foodcoopshop/pull/578) +- Die Software ist kompatibel mit PHP 8.0. +- Das Logo kann jetzt auch in anderen Formaten verwendet werden. Neuer Standard ist PNG. [PR#637](https://github.com/foodcoopshop/foodcoopshop/pull/637) + +### Bugfixes +- Bestelllisten- und Rechnungsversand werden jetzt über eine Queue versendet. Das verhindert seltene, aber nervige Fehler beim Versenden. [I#410](https://github.com/foodcoopshop/foodcoopshop/issues/410) / [I#560](https://github.com/foodcoopshop/foodcoopshop/issues/560) / [I#562](https://github.com/foodcoopshop/foodcoopshop/issues/562) / [PR#561](https://github.com/foodcoopshop/foodcoopshop/pull/561) / [PR#566](https://github.com/foodcoopshop/foodcoopshop/pull/566) / [PR#553](https://github.com/foodcoopshop/foodcoopshop/pull/553) +- Hochgeladene Bilder (z.B. Slideshow) waren machmal leicht unscharf. [I#558](https://github.com/foodcoopshop/foodcoopshop/issues/558) / [PR#573](https://github.com/foodcoopshop/foodcoopshop/pull/573) +- Deutsche IBANs können nun eingetragen werden, das Feld war zu kurz. [I#559](https://github.com/foodcoopshop/foodcoopshop/issues/559) / [PR#564](https://github.com/foodcoopshop/foodcoopshop/pull/564) +- Lieferrhythmus "erster Freitag im Monat" kombiniert mit "Sonntag Bestellschluss" hat nicht korrekt funktioniert. [I#567](https://github.com/foodcoopshop/foodcoopshop/issues/567) / [PR#568](https://github.com/foodcoopshop/foodcoopshop/pull/568) +- Monatlicher Lieferrhythmus kombiniert mit "erster Liefertag" hat nicht korrekt funktioniert. [I#623](https://github.com/foodcoopshop/foodcoopshop/issues/623) / [PR#624](https://github.com/foodcoopshop/foodcoopshop/pull/624) + +### Code Cleaning +- Die Übersetzung auf Polnisch wurde entfernt. Sie wurde nicht mehr verwendet und auch nicht mehr upgedatet. [I#631](https://github.com/foodcoopshop/foodcoopshop/issues/631) / [PR#632](https://github.com/foodcoopshop/foodcoopshop/pull/632) +- CI-Umstellung von Travis auf Github Actions [PR#556](https://github.com/foodcoopshop/foodcoopshop/pull/556) + +### Deprecations +- ⚠️⚠️⚠️ Wer das [Stundenabrechnungs-Modul](https://foodcoopshop.github.io/de/stundenabrechnungs-modul.html) aktiv verwendet, soll sich bitte bei mir melden. Ich habe nämlich den Eindruck, dass es kaum in Gebrauch ist. Da aber die Wartung Aufwand bedeutet, werde ich das Modul - sofern sich bis dahin niemand meldet - ab v3.3 (Herbst 2021) aus der Software entfernen. + +Datum: 08.03.2021 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/14) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.1.0...v3.2.0) + +# v3.1.0 + +### Herzlichen Dank an alle beteiligten Personen +* [AndreasEgger](https://github.com/AndreasEgger) +* [dpakach](https://github.com/dpakach) +* [mrothauer](https://github.com/mrothauer) +* [swoichha](https://github.com/swoichha) +* [vmvbruck](https://github.com/vmvbruck) + +### Neue Funktionen +- Automatischer Kontoabgleich für das Guthaben-System (CSV-Upload). [Zur Online-Doku](https://foodcoopshop.github.io/de/guthaben-system-mit-automatischem-kontoabgleich). [I#463](https://github.com/foodcoopshop/foodcoopshop/issues/463) / [PR#474](https://github.com/foodcoopshop/foodcoopshop/pull/474) +- Mitglieder können nun Feedback zu Produkten abgeben, der Hersteller wird automatisch per E-Mail darüber informiert. [I#391](https://github.com/foodcoopshop/foodcoopshop/issues/391) / [PR#536](https://github.com/foodcoopshop/foodcoopshop/pull/536) +- Viele Overlays (z.B. "Gewicht ändern", "Bild-Upload", "Abmelden") sind nun benutzerfreundlicher und systemweit vereinheitlicht. [I#328](https://github.com/foodcoopshop/foodcoopshop/issues/328) / [PR#524](https://github.com/foodcoopshop/foodcoopshop/pull/524) / [PR#530](https://github.com/foodcoopshop/foodcoopshop/pull/530) / [PR#537](https://github.com/foodcoopshop/foodcoopshop/pull/537) / [PR#538](https://github.com/foodcoopshop/foodcoopshop/pull/538) +- Verbesserungen bei der Gewichtsanpassung: Auch gleiches Gewicht ist nach dem Speichern nicht mehr rot hinterlegt. / Bei bereits verrechneten Bestellungen wird das Gewicht niemals rot angezeigt. / Neues Gewicht ist in der E-Mail-Betreffzeile - damit Fehler wie z.B. 540 kg (statt g) schneller auffallen. / Kein E-Mail-Versand falls das Gewicht gleich bleibt. [I#423](https://github.com/foodcoopshop/foodcoopshop/issues/423) / [PR#479](https://github.com/foodcoopshop/foodcoopshop/pull/479) +- Es ist jetzt möglich, als Bestellschluss für bestimmte Produkte auch **zwei Tage** vor dem Standard-Bestellschluss auszuwählen. Bisher war das nur für den Vortag möglich. [I#487](https://github.com/foodcoopshop/foodcoopshop/issues/487) / [PR#489](https://github.com/foodcoopshop/foodcoopshop/pull/489) +- 😍 Ab sofort können Emojis verwendet werden: Z.B. in Blog-Artikeln, Seiten oder beim Stornieren. Im Editor gibt's dazu ein neues Icon, beim Tippen von einem Doppelpunkt und zwei Buchstaben wird automatisch eine Liste mit Emojis angezeigt. [I#464](https://github.com/foodcoopshop/foodcoopshop/issues/464) / [PR#478](https://github.com/foodcoopshop/foodcoopshop/pull/478) +- Falls Produkte auch für uneingeloggte Mitglieder angezeigt werden, wird nun auch der In-den-Warenkorb-Button angezeigt. Wenn man darauf klickt, erhält man die Meldung, dass man sich zuerst registrieren muss. [I#499](https://github.com/foodcoopshop/foodcoopshop/issues/499) / [PR#500](https://github.com/foodcoopshop/foodcoopshop/pull/500) +- Neue Produkte werden nun auch auf der Startseite angezeigt. Das kann in den Einstellungen ausgestellt werden. [I#504](https://github.com/foodcoopshop/foodcoopshop/issues/504) / [PR#506](https://github.com/foodcoopshop/foodcoopshop/pull/506) +- Kunden von Hofläden können den Abholtag selbst beim Bestellabschluss auswählen. [Zur Online-Doku](https://foodcoopshop.github.io/de/hofladen-online.html). [PR#542](https://github.com/foodcoopshop/foodcoopshop/pull/542) + +### Bugfixes / Optimierungen +- Beim Ändern der Anzahl bzw. Anzahl-Einstellungen von Produkten wird der alte Wert nun wieder unter Aktivitäten angezeigt. [I#514](https://github.com/foodcoopshop/foodcoopshop/issues/514) / [PR#515](https://github.com/foodcoopshop/foodcoopshop/pull/515) +- Horizontales Scrollen auf kleinen Bildschirmen hat das Layout zerschossen. [I#497](https://github.com/foodcoopshop/foodcoopshop/issues/497) / [PR#498](https://github.com/foodcoopshop/foodcoopshop/pull/498) +- Man bleibt jetzt 30 Tage lang angemeldet, wenn man die Funkion "Angemeldet bleiben" verwendet. Bisher waren es 6. [I#492](https://github.com/foodcoopshop/foodcoopshop/issues/492) / [PR#493](https://github.com/foodcoopshop/foodcoopshop/pull/493) +- Die Daten für die Mitglieder-Drodowns im Admin-Bereich werden nun erst nach dem Daraufklicken geladen. Das lädt die Seiten schneller, besonders bei Initativen mit vielen Mitgliedern. [I#477](https://github.com/foodcoopshop/foodcoopshop/issues/477) / [PR#501](https://github.com/foodcoopshop/foodcoopshop/pull/501) +- Die automatische Zeichenbeschränkung in Formularen hat nicht mehr funktioniert (z.B. Feld "Kammer", Feld "Vorname") und führte zu einem Datenbank-Fehler. [I#485](https://github.com/foodcoopshop/foodcoopshop/issues/485) / [I#521](https://github.com/foodcoopshop/foodcoopshop/issues/521) / [PR#488](https://github.com/foodcoopshop/foodcoopshop/pull/525) / [PR#525](https://github.com/foodcoopshop/foodcoopshop/pull/488) +- Infotext bei der Lieferpause ist jetzt leichter verständlich. [I#469](https://github.com/foodcoopshop/foodcoopshop/issues/469) / [PR#482](https://github.com/foodcoopshop/foodcoopshop/pull/482) +- Bestelllisten sind ab und zu nicht über die Fallback-Konfiguration versendet worden. [I#495](https://github.com/foodcoopshop/foodcoopshop/issues/495) / [PR#496](https://github.com/foodcoopshop/foodcoopshop/pull/496) +- Der neue PDF-Writer kann nun PDFs unabhängig von Controllern erzeugen (als Attachment, Inline oder File). [I#412](https://github.com/foodcoopshop/foodcoopshop/issues/412) / [PR#508](https://github.com/foodcoopshop/foodcoopshop/pull/508) +- Bei der Validierung der E-Mail-Adressen wird jetzt auch der MX-Eintrag überprüft. Das vermeidet das Eintragen von ungültigen E-Mail-Adressen, die zwar syntaktisch korrekt sind, bei denen sich aber beim Domainnamen ein Tippfehler eingeschlichen hat. [I#465](https://github.com/foodcoopshop/foodcoopshop/issues/465) / [PR#516](https://github.com/foodcoopshop/foodcoopshop/pull/516) +- Home- und Blog-Slider: OwlCarousel2 wurde ersetzt mit Swiper. [I#512](https://github.com/foodcoopshop/foodcoopshop/issues/512) / [PR#535](https://github.com/foodcoopshop/foodcoopshop/pull/535) +- All tests now work without HttpClient and use IntegrationTestTrait, the tests are now about 45% faster! [I#404](https://github.com/foodcoopshop/foodcoopshop/issues/404) / [PR#550](https://github.com/foodcoopshop/foodcoopshop/pull/550) / [PR#529](https://github.com/foodcoopshop/foodcoopshop/pull/529) / [PR#531](https://github.com/foodcoopshop/foodcoopshop/pull/531) / [PR#532](https://github.com/foodcoopshop/foodcoopshop/pull/532) +- FoodCoopShop verwendet jetzt CakePHP v4.1.x. [I#541](https://github.com/foodcoopshop/foodcoopshop/issues/541) / [PR#545](https://github.com/foodcoopshop/foodcoopshop/pull/545) + +Datum: 07.09.2020 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/13) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.0.2...v3.1.0) + +# v3.0.2 + +### Bugfix +- Produkte waren fehlerhafterweise bestellbar, wenn das Produkt früher mal als Lagerprodukt deklariert war und das Feld "Bestellbar bis zu einer Anzahl von" einen Wert < 0 enthielt. +- Es gab immer wieder Probleme beim automatischen Vermindern der Anzahl, wenn im gleichen Warenkorb ein Produkt mit einer Variante vorhanden war und dieses Produkt genau vor dem entsprechenden Produkt gereiht war. War schwer zu finden... / [PR#484](https://github.com/foodcoopshop/foodcoopshop/pull/484) + +Datum: 26.03.2020 / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.0.1...v3.0.2) + +# v3.0.1 + +### Bugfix +- Kategorien wurden nicht korrekt sortiert. / [C](https://github.com/foodcoopshop/foodcoopshop/commit/35d940d82912200d6aab60dd6adc5fedbb68b4de) + +Datum: 22.03.2020 / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.0.0...v3.0.1) + +# v3.0.0 + +### Herzlichen Dank an alle beteiligten Personen +* [AndreasEgger](https://github.com/AndreasEgger) +* [mrothauer](https://github.com/mrothauer) + +### Neue Funktionen +- Bei Produkten kann nun als Anzahl "immer verfügbar" eingestellt werden. Weiters kann mittels "Standard-Anzahl pro Lieferrhythmus" festgelegt werden, auf welche verfügbare Anzahl nach erfolgtem Bestelllisten-Versand automatisch wieder hochgezählt wird. Details in der [Online-Dokumentation](https://foodcoopshop.github.io/de/produkte). [I#452](https://github.com/foodcoopshop/foodcoopshop/issues/452) / [I#324](https://github.com/foodcoopshop/foodcoopshop/issues/324) / [PR#457](https://github.com/foodcoopshop/foodcoopshop/pull/457) / +- Das Hauptmenü des Frontends wird nun eingeblendet, sobald man nach oben scrollt. [I#438](https://github.com/foodcoopshop/foodcoopshop/issues/438) / [PR#440](https://github.com/foodcoopshop/foodcoopshop/pull/440) +- Produkte von Sammelbestellungen, bei denen die Bestellfrist bereits erreicht wurde, können über die Sofort-Bestellung jetzt trotzdem bestellt werden. Das ist praktisch für Nachbuchungen. [I#443](https://github.com/foodcoopshop/foodcoopshop/issues/454) / [PR#454](https://github.com/foodcoopshop/foodcoopshop/pull/440) + +### Bugfixes / Updates +- Die Auto-Login-Funktion ("Angemeldet bleiben") hat nicht mehr richtig funktioniert. [I#439](https://github.com/foodcoopshop/foodcoopshop/issues/439) / [PR#444](https://github.com/foodcoopshop/foodcoopshop/pull/444) +- Beim Löschen eines Mitgliedes werden die Bestellungen nun auf "mit dem Hersteller verrechnet" überprüft (und nicht mehr, ob sie 2 Monate alt sind). Weiters wird überprüft, ob die Guthaben-Aufladungen der letzten zwei Jahre bestätigt sind. [I#451](https://github.com/foodcoopshop/foodcoopshop/issues/451) / [PR#456](https://github.com/foodcoopshop/foodcoopshop/pull/456) +- Unter "Aktivitäten" wird ab sofort bei Einträgen des Rechnungsversands die korrekte Uhrzeit angezeigt. Diese war bisher auf 00:00 gesetzt. [I#451](https://github.com/foodcoopshop/foodcoopshop/issues/451) / [PR#455](https://github.com/foodcoopshop/foodcoopshop/pull/455) +- FoodCoopShop verwendet jetzt [CakePHP v4.0](https://book.cakephp.org/4/en/index.html). [I#445](https://github.com/foodcoopshop/foodcoopshop/issues/445) / [PR#446](https://github.com/foodcoopshop/foodcoopshop/pull/446) +- FoodCoopShop ist jetzt mit PHP 7.4 kompatibel. [I#448](https://github.com/foodcoopshop/foodcoopshop/issues/448) / [PR#449](https://github.com/foodcoopshop/foodcoopshop/pull/449) +- Die Begrenzung der maximalen Zeichenanzahl bei Seiten, Blog-Artikel, Produkt- und Herstellerbeschreibung wurde erhöht. [I#460](https://github.com/foodcoopshop/foodcoopshop/issues/460) / [PR#462](https://github.com/foodcoopshop/foodcoopshop/pull/462) +- Neue Kategorien waren nicht mehr alfabetisch sortiert. [I#458](https://github.com/foodcoopshop/foodcoopshop/issues/458) / [PR#459](https://github.com/foodcoopshop/foodcoopshop/pull/459) +- Legacy-Code von FCS v2 wurde entfernt. [PR#468](https://github.com/foodcoopshop/foodcoopshop/pull/468) + +Datum: 20.03.2020 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/12) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v2.7.1...3.0.0) + +[Zum Changelog von FoodCoopShop v2.x](devtools/CHANGELOG-v2.md) From 2a1ff3d09d7bedc164dab9356630c2141e28ccf9 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 12 Sep 2022 13:53:36 +0200 Subject: [PATCH 039/646] correct release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58ddbfbaca..125db7110f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,6 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe - Neuer CSS-Compressor: CssMin wurde durch CleanCss ersetzt. [PR#856](https://github.com/foodcoopshop/foodcoopshop/pull/856) - Fontawesome v6 Update. [PR#855](https://github.com/foodcoopshop/foodcoopshop/pull/855) -Datum: 12.03.2022 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/17) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.4.2...v3.5.0) +Datum: 12.09.2022 / [Mehr Details zum Release](https://github.com/foodcoopshop/foodcoopshop/projects/17) / [Alle Änderungen anzeigen](https://github.com/foodcoopshop/foodcoopshop/compare/v3.4.2...v3.5.0) [Zum Changelog von FoodCoopShop v3.0-v3.4](devtools/CHANGELOG-v3.md) From 3f68e84572047ec9639cebad569454819a9103f6 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 12 Sep 2022 17:08:48 +0200 Subject: [PATCH 040/646] vendor updates --- composer.lock | 36 ++++++++++----------- webroot/package-lock.json | 66 +++++++++++++-------------------------- webroot/package.json | 4 +-- 3 files changed, 42 insertions(+), 64 deletions(-) diff --git a/composer.lock b/composer.lock index efc9f77d47..51b900ce2e 100644 --- a/composer.lock +++ b/composer.lock @@ -1623,16 +1623,16 @@ }, { "name": "matomo/device-detector", - "version": "6.0.2", + "version": "6.0.3", "source": { "type": "git", "url": "https://github.com/matomo-org/device-detector.git", - "reference": "c01910dde14c95708019513ea0ee36c5a174fd4c" + "reference": "6ba69e1afd24b45d66b6de7b04553213f7ef2151" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/c01910dde14c95708019513ea0ee36c5a174fd4c", - "reference": "c01910dde14c95708019513ea0ee36c5a174fd4c", + "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/6ba69e1afd24b45d66b6de7b04553213f7ef2151", + "reference": "6ba69e1afd24b45d66b6de7b04553213f7ef2151", "shasum": "" }, "require": { @@ -1688,7 +1688,7 @@ "source": "https://github.com/matomo-org/matomo", "wiki": "https://dev.matomo.org/" }, - "time": "2022-07-12T07:49:25+00:00" + "time": "2022-09-12T11:43:29+00:00" }, { "name": "mobiledetect/mobiledetectlib", @@ -4796,16 +4796,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.8.4", + "version": "1.8.5", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "eed4c9da531f6ebb4787235b6fb486e2c20f34e5" + "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/eed4c9da531f6ebb4787235b6fb486e2c20f34e5", - "reference": "eed4c9da531f6ebb4787235b6fb486e2c20f34e5", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6598a5ff12ca4499a836815e08b4d77a2ddeb20", + "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20", "shasum": "" }, "require": { @@ -4835,7 +4835,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.8.4" + "source": "https://github.com/phpstan/phpstan/tree/1.8.5" }, "funding": [ { @@ -4851,7 +4851,7 @@ "type": "tidelift" } ], - "time": "2022-09-03T13:08:04+00:00" + "time": "2022-09-07T16:05:32+00:00" }, { "name": "phpunit/php-code-coverage", @@ -6278,16 +6278,16 @@ }, { "name": "sebastian/type", - "version": "3.1.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "fb44e1cc6e557418387ad815780360057e40753e" + "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb44e1cc6e557418387ad815780360057e40753e", - "reference": "fb44e1cc6e557418387ad815780360057e40753e", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", "shasum": "" }, "require": { @@ -6299,7 +6299,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -6322,7 +6322,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.1.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" }, "funding": [ { @@ -6330,7 +6330,7 @@ "type": "github" } ], - "time": "2022-08-29T06:55:37+00:00" + "time": "2022-09-12T14:47:03+00:00" }, { "name": "sebastian/version", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index 269cd4db49..e7cfdc89c3 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -9,7 +9,7 @@ "license": "AGPL-3.0", "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", - "@ericblade/quagga2": "^1.7.1", + "@ericblade/quagga2": "^1.7.2", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.1", @@ -29,7 +29,7 @@ "lazysizes": "^5.3.2", "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", - "svelte": "^3.50.0", + "svelte": "^3.50.1", "swiper": "8.3.2", "tooltipster": "^4.2.8", "uglify-js": "^3.17.0", @@ -53,9 +53,9 @@ } }, "node_modules/@ericblade/quagga2": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.1.tgz", - "integrity": "sha512-brx0N6MHTCgsFE/b5EiMVKguUpBhddmKwpgxXDUpVEthw4n6v3OWE+EkI1SgYYUJn/MPqy6B/QwTARcymm9O6w==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.2.tgz", + "integrity": "sha512-Uae90msCxpNRGlRVNQ4VpmuIUUyPntI4nlYR5qY3Gl3fFjIk+0UhK88C2icLEOk6rZ1yuJRl7iJ2RLXMXKwkuQ==", "dependencies": { "@babel/polyfill": "^7.12.1", "get-pixels": "^3.3.3", @@ -70,7 +70,7 @@ "node": ">= 10.0" }, "optionalDependencies": { - "fsevents": "2.1.2" + "fsevents": "2.3.2" } }, "node_modules/@fortawesome/fontawesome-free": { @@ -287,19 +287,6 @@ "fsevents": "~2.3.2" } }, - "node_modules/chokidar/node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/ckeditor4": { "version": "4.19.1", "resolved": "https://registry.npmjs.org/ckeditor4/-/ckeditor4-4.19.1.tgz", @@ -478,10 +465,9 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/fsevents": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", - "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", - "deprecated": "\"Please update to latest v2.3 or v2.2\"", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "hasInstallScript": true, "optional": true, "os": [ @@ -1012,9 +998,9 @@ "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==" }, "node_modules/svelte": { - "version": "3.50.0", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.50.0.tgz", - "integrity": "sha512-zXeOUDS7+85i+RxLN+0iB6PMbGH7OhEgjETcD1fD8ZrhuhNFxYxYEHU41xuhkHIulJavcu3PKbPyuCrBxdxskQ==", + "version": "3.50.1", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.50.1.tgz", + "integrity": "sha512-bS4odcsdj5D5jEg6riZuMg5NKelzPtmsCbD9RG+8umU03TeNkdWnP6pqbCm0s8UQNBkqk29w/Bdubn3C+HWSwA==", "engines": { "node": ">= 8" } @@ -1170,12 +1156,12 @@ } }, "@ericblade/quagga2": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.1.tgz", - "integrity": "sha512-brx0N6MHTCgsFE/b5EiMVKguUpBhddmKwpgxXDUpVEthw4n6v3OWE+EkI1SgYYUJn/MPqy6B/QwTARcymm9O6w==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.2.tgz", + "integrity": "sha512-Uae90msCxpNRGlRVNQ4VpmuIUUyPntI4nlYR5qY3Gl3fFjIk+0UhK88C2icLEOk6rZ1yuJRl7iJ2RLXMXKwkuQ==", "requires": { "@babel/polyfill": "^7.12.1", - "fsevents": "2.1.2", + "fsevents": "2.3.2", "get-pixels": "^3.3.3", "gl-mat2": "^1.0.1", "gl-vec2": "^1.3.0", @@ -1336,14 +1322,6 @@ "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" - }, - "dependencies": { - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "optional": true - } } }, "ckeditor4": { @@ -1489,9 +1467,9 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "fsevents": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", - "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "optional": true }, "get-pixels": { @@ -1907,9 +1885,9 @@ "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==" }, "svelte": { - "version": "3.50.0", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.50.0.tgz", - "integrity": "sha512-zXeOUDS7+85i+RxLN+0iB6PMbGH7OhEgjETcD1fD8ZrhuhNFxYxYEHU41xuhkHIulJavcu3PKbPyuCrBxdxskQ==" + "version": "3.50.1", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.50.1.tgz", + "integrity": "sha512-bS4odcsdj5D5jEg6riZuMg5NKelzPtmsCbD9RG+8umU03TeNkdWnP6pqbCm0s8UQNBkqk29w/Bdubn3C+HWSwA==" }, "swiper": { "version": "8.3.2", diff --git a/webroot/package.json b/webroot/package.json index ed5371c42e..5e1fec8869 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", - "@ericblade/quagga2": "^1.7.1", + "@ericblade/quagga2": "^1.7.2", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.1", @@ -35,7 +35,7 @@ "lazysizes": "^5.3.2", "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", - "svelte": "^3.50.0", + "svelte": "^3.50.1", "swiper": "8.3.2", "tooltipster": "^4.2.8", "uglify-js": "^3.17.0", From 98679efa4bd206e5f6e0f42f301d44c7ee16ce94 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 13 Sep 2022 11:34:25 +0200 Subject: [PATCH 041/646] code cleaning --- tests/TestCase/src/Model/Table/CronjobsTableTest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/TestCase/src/Model/Table/CronjobsTableTest.php b/tests/TestCase/src/Model/Table/CronjobsTableTest.php index a79af2237a..1e0d5b06d8 100644 --- a/tests/TestCase/src/Model/Table/CronjobsTableTest.php +++ b/tests/TestCase/src/Model/Table/CronjobsTableTest.php @@ -54,7 +54,6 @@ public function testPreviousCronjobLogFailure() { $time = '2018-10-22 23:00:00'; $this->Cronjob->cronjobRunDay = $this->Time->getTimeObjectUTC($time)->toUnixString(); - $this->Cronjob->cronjobRunDay = strtotime($time); $this->Cronjob->CronjobLogs->save( $this->Cronjob->CronjobLogs->newEntity( [ @@ -75,7 +74,6 @@ public function testPreviousCronjobLogRunning() { $time = '2018-10-22 23:00:00'; $this->Cronjob->cronjobRunDay = $this->Time->getTimeObjectUTC($time)->toUnixString(); - $this->Cronjob->cronjobRunDay = strtotime($time); $this->Cronjob->CronjobLogs->save( $this->Cronjob->CronjobLogs->newEntity( [ From eb3aa84a4fa452a1f55afca150da084b6459bb0f Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 13 Sep 2022 11:51:12 +0200 Subject: [PATCH 042/646] since all emails are sent with worker socket exception can not be triggered in cronjobs any more --- src/Model/Table/CronjobsTable.php | 5 +--- .../TestCronjobWithSocketExceptionShell.php | 28 ------------------- .../src/Model/Table/CronjobsTableTest.php | 22 --------------- 3 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 src/Shell/TestCronjobWithSocketExceptionShell.php diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 13773171b9..e6b5d55a26 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -131,10 +131,7 @@ private function executeCronjobAndSaveLog($cronjob, $cronjobRunDayObject) $success = $shell->main(); $success = $success !== true ? CronjobLogsTable::FAILURE : CronjobLogsTable::SUCCESS; } catch (\Exception $e) { - $success = CronjobLogsTable::SUCCESS; - if (get_class($e) != 'Cake\Network\Exception\SocketException') { - $success = CronjobLogsTable::FAILURE; - } + $success = CronjobLogsTable::FAILURE; } $entity->success = $success; diff --git a/src/Shell/TestCronjobWithSocketExceptionShell.php b/src/Shell/TestCronjobWithSocketExceptionShell.php deleted file mode 100644 index dcd8daa014..0000000000 --- a/src/Shell/TestCronjobWithSocketExceptionShell.php +++ /dev/null @@ -1,28 +0,0 @@ - - * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com - * @link https://www.foodcoopshop.com - */ - -namespace App\Shell; - -use Cake\Network\Exception\SocketException; - -class TestCronjobWithSocketExceptionShell extends AppShell -{ - - public function main() - { - throw new SocketException(); - } - -} diff --git a/tests/TestCase/src/Model/Table/CronjobsTableTest.php b/tests/TestCase/src/Model/Table/CronjobsTableTest.php index 1e0d5b06d8..71529c94a8 100644 --- a/tests/TestCase/src/Model/Table/CronjobsTableTest.php +++ b/tests/TestCase/src/Model/Table/CronjobsTableTest.php @@ -142,28 +142,6 @@ public function testCronjobWithInvalidParameterException() $this->assertEquals($executedCronjobs[0]['created'], $time); } - /** - * SocketException are triggered when email could not be sent - * set cronjob success to 1 to avoid that it is called again - */ - public function testCronjobWithSocketException() - { - $time = '2018-10-23 22:31:00'; - $this->Cronjob->cronjobRunDay = $this->Time->getTimeObjectUTC($time)->toUnixString(); - $this->Cronjob->save( - $this->Cronjob->patchEntity( - $this->Cronjob->get(1), - [ - 'name' => 'TestCronjobWithSocketException' - ], - ) - ); - $executedCronjobs = $this->Cronjob->run(); - $this->assertEquals(1, count($executedCronjobs)); - $this->assertEquals($executedCronjobs[0]['success'], 1); - $this->assertEquals($executedCronjobs[0]['created'], $time); - } - public function testCronjobAlreadyExecutedOnCurrentDay() { $this->Cronjob->cronjobRunDay = $this->Time->getTimeObjectUTC('2018-10-25 22:30:02')->toUnixString(); From e35b2ef75db2583268a9f9de81638efa51b6ed2e Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 14 Sep 2022 07:55:38 +0200 Subject: [PATCH 043/646] auto delete unused cronjob logs after 60 days --- src/Model/Table/CronjobLogsTable.php | 17 +++++++++++++++++ src/Model/Table/CronjobsTable.php | 2 ++ 2 files changed, 19 insertions(+) diff --git a/src/Model/Table/CronjobLogsTable.php b/src/Model/Table/CronjobLogsTable.php index 2980174a76..cda7c54837 100644 --- a/src/Model/Table/CronjobLogsTable.php +++ b/src/Model/Table/CronjobLogsTable.php @@ -2,6 +2,8 @@ namespace App\Model\Table; +use App\Lib\Error\Exception\InvalidParameterException; + /** * FoodCoopShop - The open source software for your foodcoop * @@ -22,4 +24,19 @@ class CronjobLogsTable extends AppTable public const SUCCESS = 1; public const FAILURE = 0; + public function deleteOldLogs($timestamp) + { + + $timestamp = (int) $timestamp; + if ($timestamp <= 0) { + throw new InvalidParameterException('invalid timestamp: ' . $timestamp); + } + + $diffInDays = 60; + $this->deleteAll([ + 'DATEDIFF(DATE_FORMAT(FROM_UNIXTIME(' . $timestamp . '), \'%Y-%m-%d\'), created) > ' . $diffInDays, + ]); + + } + } diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index e6b5d55a26..10069f8a0c 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -41,6 +41,8 @@ public function run() $this->cronjobRunDay = Configure::read('app.timeHelper')->getTimeObjectUTC(date(Configure::read('DateFormat.DatabaseWithTimeAlt')))->toUnixString(); } + $this->CronjobLogs->deleteOldLogs($this->cronjobRunDay); + $cronjobs = $this->find('all', [ 'conditions' => [ 'Cronjobs.active' => APP_ON, From b9c9495207a040fb0d81aab47c3512359986a171 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 14 Sep 2022 09:08:00 +0200 Subject: [PATCH 044/646] add translated cronjobs list view --- .../Admin/resources/locales/de_DE/admin.mo | Bin 70403 -> 70640 bytes .../Admin/resources/locales/de_DE/admin.po | 19 ++- plugins/Admin/resources/locales/default.pot | 17 ++- .../Admin/resources/locales/en_US/admin.mo | Bin 65819 -> 66051 bytes .../Admin/resources/locales/en_US/admin.po | 19 ++- .../src/Controller/CronjobsController.php | 34 +++++ plugins/Admin/templates/Cronjobs/index.php | 118 ++++++++++++++++++ plugins/Admin/templates/element/menu.php | 9 ++ resources/locales/de_DE/default.mo | Bin 73955 -> 74449 bytes resources/locales/de_DE/default.po | 46 +++++-- resources/locales/default.pot | 40 +++++- resources/locales/en_US/default.mo | Bin 69519 -> 70136 bytes resources/locales/en_US/default.po | 48 +++++-- src/Model/Entity/Cronjob.php | 53 ++++++++ src/Model/Table/CronjobsTable.php | 18 +++ src/View/Helper/MyTimeHelper.php | 15 +++ src/View/Helper/SlugHelper.php | 11 ++ .../src/Controller/PagesControllerTest.php | 2 + 18 files changed, 422 insertions(+), 27 deletions(-) create mode 100644 plugins/Admin/src/Controller/CronjobsController.php create mode 100644 plugins/Admin/templates/Cronjobs/index.php create mode 100644 src/Model/Entity/Cronjob.php diff --git a/plugins/Admin/resources/locales/de_DE/admin.mo b/plugins/Admin/resources/locales/de_DE/admin.mo index d154c2eada854645062890e3762b7f718612a3e9..8fb4a06be3d5ee053ae73f55ecc31430d73acdf7 100644 GIT binary patch delta 17234 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 F{{z8gGRXh{ delta 16992 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 V%H`9k(J9;hN%h*}a&sFT@;_M_6z%{3 diff --git a/plugins/Admin/resources/locales/de_DE/admin.po b/plugins/Admin/resources/locales/de_DE/admin.po index c26e46a113..0b7046d215 100644 --- a/plugins/Admin/resources/locales/de_DE/admin.po +++ b/plugins/Admin/resources/locales/de_DE/admin.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-08-18 17:24+0200\n" -"PO-Revision-Date: 2022-08-18 18:21+0200\n" +"POT-Creation-Date: 2022-09-14 08:52+0200\n" +"PO-Revision-Date: 2022-09-14 09:00+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: de_DE\n" @@ -84,6 +84,9 @@ msgstr "Test E-Mail versenden" msgid "Test_email" msgstr "Test E-Mail" +msgid "Cronjobs" +msgstr "Cronjobs" + msgid "all_members" msgstr "alle Mitglieder" @@ -942,6 +945,18 @@ msgstr "Standard-Bild für Hersteller, Breite:" msgid "Default_image_for_blog_post,_width:" msgstr "Standard-Bild für Blog-Artikel, Breite: " +msgid "Time_interval" +msgstr "Intervall" + +msgid "Day_of_month" +msgstr "Tag (Monat)" + +msgid "Weekday" +msgstr "Wochentag" + +msgid "Not_before_time" +msgstr "Uhrzeit" + msgid "Old_password" msgstr "Altes Passwort" diff --git a/plugins/Admin/resources/locales/default.pot b/plugins/Admin/resources/locales/default.pot index 5b126bac2b..b131e248bc 100644 --- a/plugins/Admin/resources/locales/default.pot +++ b/plugins/Admin/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-08-18 17:24+0200\n" +"POT-Creation-Date: 2022-09-14 08:52+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -83,6 +83,9 @@ msgstr "" msgid "Test_email" msgstr "" +msgid "Cronjobs" +msgstr "" + msgid "all_members" msgstr "" @@ -941,6 +944,18 @@ msgstr "" msgid "Default_image_for_blog_post,_width:" msgstr "" +msgid "Time_interval" +msgstr "" + +msgid "Day_of_month" +msgstr "" + +msgid "Weekday" +msgstr "" + +msgid "Not_before_time" +msgstr "" + msgid "Old_password" msgstr "" diff --git a/plugins/Admin/resources/locales/en_US/admin.mo b/plugins/Admin/resources/locales/en_US/admin.mo index b42370495c15a48cb425ce1f69f6c0382b4cfbd6..fb2738284eba26e538d712faf39228382a4274af 100644 GIT binary patch delta 17206 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 TtNy#b?>t!buJ5UjC;0py63CQH delta 16958 zcmZA82YgT0|Htt!GG!7(j0h21Bq%Xr(#( z+8U`^RipN(@q4{$O&y1{PiVa!Q<7W3fWm=9fb87$<-!dM11fX3*B9Z=WliMenP2H|APk6)r5 zU_1J{9G7c9mE0swqAqaVdJjX1pP^0+u4iso0aJ)up)UL*=D_o)2f2m8_!KqJfcj=; z!qA_%IBEteVGQ?o)uWP#qcH@JV0pZTdcwR7%mu5W2G|@sVLPmaJ5e+93N@g-@0x*^ z!7$>6=#71mOS*=jW?&~en&O|RWW(Q4Bfn&Qf^NkAapnnwun2Jk>H=}7J<|fKV}JC( zb;veyZAQ(=G1OB0j@9rUY6eQjGyl3!m3Wsc9P6Pc_Ofw*)CFdt)_4hOsyAX;+>cti z`=}@POfY*UKkB?l)ZVFvdXVNePC^YlC4u?Z+I~u+D6T}!z){=rs`WqA6Xa}YZde?3 z;aJpwTcXItW!2C~4q5;fq>sJ(F5v6bIYQ+5*zVwOhcNeiL!(Wt3SK;57j zY5;xF2R}wV;dIoJ&O+T_B}U>_)Opv?3$@`ik`zIr&)hN z?dof&&HBW~fsM@!7Dhkv4bT@`qHf$7_2i>a4>S{*F~_xria&|Hs2iQI@t>#*{ENEa zE2~cvvqT}NJrRxC)wNMeG0Enqqh8-ds0Z7P8hASDf$yWg-v7K!&5etrHboWGl(x2Z zL0vcnJK+%2TW}6_;}@vCQ>z&t9qf);s$;0BK7%>%B5H~5p+7#tP`&@znwvxs)RRV| zmY^o;#NMbW9EAZm7rk*MYKAtVcK>c0pGIBhGU`F@*!VfR6MMEW?SANFCy}3uHd8Uw z)Wo88b2ro`8IBsjSEwi2jwLY-%i=$%frhj+Q(YP(h!d@YP-{OQ)o%ml#I%;oznROKh^xJssT^32FcP)I9Z-A3nLs6&$``09T7%l{J5X!25A}sSgBh=*jbGtAZhwXw-#kqoyzcwP%{x zxGidmJD_ef8Fiy2r~z+6-Ea@a;~CV9g?7{ou>J$6=yh{Y9ap2)W)Es$2QdUsqxQmW zjK-&^nJU@I3@jRTUM19dvDSFhCTxYeemiS_^l?Z`Pz7gLze3$;73zsMV-S9i+3*;u z{S@ZJ3#cc(hiZR`I?vVF^m9kG2cr5HL@jj`I-1IwRJ0l5tx1@NxI5}bqfonc5^Aca zpk`n*s^4`ifUhtT^K~)bjd;{%`v8mJEYwVHL!Ec33-hnFx=BII{z8!x&htIfFm$tkDwkT)}f*sG(=r63H6@#K#gz? zy5kZof-A8w9>y@dZDYS4CN5`fiiKz&fCX^|YKb=3{86iOn@T7RzCF#9mqtBl4C?hu zM0ZR^EkRe*z&=22%3-Jnn2Kd_9yY*(SOfj|n(4-kFb3a8CdIWBX?I+n@0%Z^4KR#` zsaPJ@p=Kf-_2hxQ%@kHZeJARnK1}VgA`Zj;xDIP!Xdm-Kt0P7bk3c=hV)Vfk8M6MH zsCbarjarifs44peJ@Gzf$LFXgcI#`_G%srABC!)Dq8F}5owp5jy*;SwA44ti8Pvf4 z!qVK|^@fU`xbz3+$vU7q4na4ZfW9~db)mVa8+?s^xB_+K&8W9x7pmWJ)Xe>A^Up9J zv3H8OZc)tm{l6p?eY2~hJ`j!34?Cky=!ZTy1+_Qkp!UWZEQ&v%29%B($W7F)zmK}E zXFv0LhM?a6hNyvc@5lOQe6vaDMoZ8iccSt~Yf%7+_8eL=CJ2R>sPx{{8S1T#lOZ zas$mkE1~+=Lk+A22I2tBf#Wb6&T^=z<2($yMg=kr;rJQJZldY6iZ- zjLn7G&CgIvmTNFSnz1a_$I)00_oL2xhzVGFNX9QRj%x^&R_cKIVucLlFAZ45It}$H z{R`Fp0vlt#VP>u0$5O;JT@m@f!egs@jdkC@BB3U>z!Z$aeOM14VinXs8fYK`QE$x_tb`{~H})K3W~4GI-vvwKd`!jz z7>wa#d8l?&s!`FJ%|#912I|B-0S&ftH_WeyEJYIO0Xv7jN3Q z)g*pjB>ox;VLCQM*JQJ28X?=m)n_tO){V+l5)Ck(msux#j+)Bvusx>RIChGe@(-{C z`N>!xH)36Uip8+nr)KYTLB-?I9oL|yej{oIes-wnhTc=n2cjgZV^#FVT9^wHYE20L}8MXO_U{jod+Wl8h1IRwz3@8#y6Su;WI2Ju|4RT$_l}g2f#9`FboI)S` z8`beKYQ(QF48uP+Ggc3Eqi!~yj2iH_SPR!KFv!Xg+r-<)3oHIsEwOOk+r z*aCIEZkQE&IaJiK4{8YpqTb6VtL}BsP}(0hT%EX+CIa)nEfj=;BeGb zmqhLUSkx0I+qg4UBOZ&~&vEUdq8oaCZ9XLBF`4*d)R*p0EQlV9%vu&j^{<7su@4r; zbyzG5|9*&CiYJTBUJ6-aW+(z{kdH!b=6>j*_kXnQFdn06n2yCT4GZB-)Cpcojd@VJ zwy!tBHi zP&aOddYw9;HrI#N(Wo0w#QgXb>W1Ir$M^?ofE|~ar5lJD@BerzdJATtM!E{MDR)@Y zP&04{WAH2{V!(3q8YSa9#6wXxT!-2#Cr|@?iCxish56m@ebmfsUcvlpvz#CihJRrZ zbX#fOhT>SCI2ttrLs3sK4zuBG)WGLkH`@HqsLgo{r{HDO`Mtk2ulZoCPCWBl=HG+L z2@=}HXHipp548j@QBRy>m6?GA)P>q$ICe!(oMhwasPj`%YrGdVkds&uub`GLc(r*; z$~si^M72>Tv_!38H*~|1HXefoi07i#b~6^mlc*VZj5^P6jj<@|0ji;H*wp5Gpawh| z-O-sqC4|bSs5M@W8Bbu{i@Lxu^uoVT-~8LC8T$|QdgfYdp0qqFUk^32$*8sNh8m!Q zJ~#(?K*zO|ie_LX>cTs)JpPP2@g?fU!RySFhhZ_|dZ^9T2TS2+sMmEnYRb=BZ=p8z zOVoq@uHP*Xe%_2jcqPqZ2}rTftz&!cX1!^Y21=X-51*UN1U zM=en_24FnKV_Wpp`~Qt?Sc9R&KcJ@cchtzAp`O_LJ9FbG)QxMR_Czz(l%`lmpw@UI z>PtEe^;X?Ry-fid&E9E+PEQgesA#ROpr-n7%z+P3o6v2Oxv@8DfO&0P88veaP)pDf zb)JJ-x)~UNYtb8bqGsqI>b3u66Z5ac4HCN0Bh-^*O*OGUYG4Iy9FA&_Ms228)XcQB zj>Ig)OHsRf8R~&nV*;k4rv5c*pmCd-{|GAYZ8q=c7}S(*K@IFQs^ewMiT5!(x@|Fk zUkJdO#I2F9t7{JGiK}ik{Sr`1(F%3lWXz2tP@f%<9al-O?8xF>1=eX%r7u=$Oc zm3S*^DZWQtXfM{s|F93%{@(m;cO9k>zrk^svcvqWxR0}lYyP0WcJr@b$bcPJxt;t( zBJmCe;%wAZt-yD1KbFDgs6A3_mzlbXs2OU6n&Nh-rRs`$eFvkKa0Y5dzQ*#n+IkVa z^!^9#HYbKyOJiO-#-aw)+U9$rZZsTq!Lb;OpP}}~a@3M+NA31QsJG{|jnCQmPt=25 z#}MxCDzL}gs1j<#?_w@&iQ292V-lvKX255!dEG)#{pz8XrY&k8L%i0yThbr~w^7J<$o&Krh(* zKd63>QRij*(cC8&YBN@Ms6N{}9n(ctuj3KC{ zj7If~wKhi$tfy@sV)M>8o0yAw!f#L`-hmqNA=DoE&F0flH@J(s;0r8=-UrQqtDrk^ zJ=BaOpst&QH8BNs{(7vg_kRZ!-S8=Ds@;DwH!g%aF$y!@3T#Q-67_nnviW_eCq03B z{jQ=0@CY??FHke-cF1hX0Mr1&v8>+za#R|VNX9r^i`pEIZ9eDE{PsfJ8EfD{tdH)8 z%`dGDu>^5n)J)9AB6t8bgEvv%iRY*fQ;s8M&y~e~+~3uiN-aEvTKk+w%_hu^dXj4B zgSD-R=t0~THFKR%14uznoQrz$MX1+s73#~l3k%{2Y=U>t@uCuY%$(Q&b-~7{8?;BQ zaaYv92BMyDFvjC@)Kc6-y)9nH&1+m7eTmDUu2Tgyuv+Mcaj5&YKF<7WWF2kC0jQ}P zhMKyCm=D*Y8~%j)fE-1gciG1GQ5SYQVP_CEW4Td#qc8?wB`k^!Py_07g85fv5DDF2 zBius)B^Qa&m;+~`zHG}dC+|A4TOTiQ@PQlQ7~>^GoPx>`1%{ zgVFnnnW@64B^!+z&@rrpFEIiu{AHH1Ext#*2zA33s2M1K)!6r{V>+%NQJsd{SQJZM zGi%ov+YqN0O;6s!Ji{)_L1Q8(@`NrvDh!QY^;ycoH?xvj3PV?|>zUhvV0{ z6g4AG?c3%(9gc-bEVl7JbSM5B!|@&_V9*`27dl`N@mN&9*{IiZA!@0XV<7HA&FFE| zgFHl?m-BAMeH~XZD!M@;md62D5SL*A+=mf(8MPPO@0s_yJ7y#9joC2;HIU(`0XV1` zm}}!hsLh;?E$}I}(fi-M;}Z@_1l9w z|0fK?m#8Hz_`p19EGq7d?%dxsmWnpfB+QBXQA=?a^Wih>hCvU_fQF$P@oLlzY(TAT zDwe|wSOa|@*?+=CU1um(#hIws-b-yor7o{mlFh9@zYAoA-Eb2ABgiko>6gN}{eGZS!><+t3U(vbGqAy--gy+&a#- ze~Ma~1*o@U18RUrQM>;FYKpI*Zg?Gg;a%IF^ujzyGHOpay{YH|6Hrq*8+GF^Q3F|y zy5LsS8ty>#+l5+!AF&-CM-8CVf9A$fsO!d{Hg%lMw?l2-uE-v8T)n82A~6@^aUa%2 z-6>wxRyu z?eocNz<%VMx%LEYDjfmD18HbMeGc`P)W5eUZzFC+{S?KA@&)BOr6NU3qvL&ps|Gn8 zA6bV`|ANwk@;SL2l>1qk|AAaIhF~WRe^J-51;4~rcn?e2d~Y?{V-M%-AzuPd<5HVH zM|_TWBJm2FJ8aKa7-nW3)viHlP9QRWisSVFxW9zgc!|2g{F zKH1qgDYR!Ezfs>w+j}-QjQSuNOA@D2nmGLN9*LXw4DE+xI*rAJHrIgo9z};g&f}c+ zCUhOZvE=^3Y?vLp(!Lwl;op?ZV>R`g_BzUWP|$g=(mXy`=4BFb~>ZLtoP zq=UX-dY5Az)4;``{MJIP!mD3}zmC zwBDgM%0p*;nZBaKMf{jpU!n@c1t{^9Wu#^(&+(JNwT1W(n;S-M68%OH|7UY&iTx-# z9%5PY(<#}ww(g(t8}1Skd#Pu&Cn=wudSz8OKAyURIVC+K;+3KPfci_Uj<>L)ZOg?uH7PBLe+eKaMPK;jol9Cd%nmz;BuvQY2;U>bbwNfk(bLT)!@E%`H)qtx$Fbo@elGWFLs z{)pTJa_PkSg+)hY;y#pSs29d6#LmYA?^1aON05xey2NGiTg*Hb z)28DD4z>9gSfAVg8%NXjIq?XJe(R}9{&#ZkP+k#tB>s;2ztmSLul3J7){;o1oT40~ z{7Q+T@k37f8u|Ug)q?tu&F)w-9q&&V&e*Y>e{ z?JTi##U{&RVNU2r=Mxx&I$l%0rXFr%N+;sb5>K= zMt?x@us2^zzbaYm^S>haBjXfaBP>m6M!7+0X)i+6b$;ghPp4r5u|Fq`$KiDT9cSToijEod z=|S-&{+0L*r5y2H+ujZJzww?`U&?0nqjaF`Cw@tpM0v$IQ^~DICy75AQ2aPiM)b=qg%qaPh1kW#l6V)^qkKWVXXgAL zC2@eFBO480nX2n!>K>F|C`q(G!kM(~qy7&brSzkWBW_69MEecQJem_XCeBA0V3TLa z>1aa9`1^lxD#0Wd;T$>+rT&EaZ0f_Qdr{BI^325r6dn1<=cinx&ko}4)OCD|St#!0 zbsVF-M|~M(zRg|DXyLaiVy85nTib-lOW9^S)}yVNt*h;ftshpvah&!xy1B9igI!-@=Yl^o)e$K z&nUwwWhj;C7msfrZS8det){IWJCWKU%D*%e!^ij?_T<7kzIp3}aN>EC`nIhf7SH;{ zsR}_3*(^k*Y|Cll%p;a747T~(B!8p$*v31wh0}JQIFd4qINJ8@KzxgOB7T4^Dbws| zs#7mP{&V616lXd?=CPT?zjW{=ai98Q>IE|!@d@#V_^Hh`#;x?zk(0Ir>fcarPW?|x z5$fl$7iBpm^Z1?m4s#y=BPUz*IEm5rLM!nr+xY@MwRxS)w7WhfevXf5>uKAb5qF_J zkz6s#Wa@V*)u=b5Ee~}s>Y2wlDy_*a*NeQ%X1}4s7|IYDR^Sc%OeZqHcw!x6C`G7; zlGjlNeQjNF2U{OWpAV?7#P&Fba?D<1D*XZ}{fU2c_`{3F{S+N_h_|B;@nuRMn~x-4 zh5Qego!lMNF^dvReP~8x{%A@($e!m(eKz&$w!I7S8j224%G-8SVwG)By%>2O+|>n^\n" "Language: en_US\n" @@ -84,6 +84,9 @@ msgstr "Send test email" msgid "Test_email" msgstr "Test email" +msgid "Cronjobs" +msgstr "Cronjobs" + msgid "all_members" msgstr "all members" @@ -942,6 +945,18 @@ msgstr "Default image for manufacturer, width:" msgid "Default_image_for_blog_post,_width:" msgstr "Default image for blog post, width:" +msgid "Time_interval" +msgstr "Interval" + +msgid "Day_of_month" +msgstr "Day of month" + +msgid "Weekday" +msgstr "Weekday" + +msgid "Not_before_time" +msgstr "Time" + msgid "Old_password" msgstr "Old password" diff --git a/plugins/Admin/src/Controller/CronjobsController.php b/plugins/Admin/src/Controller/CronjobsController.php new file mode 100644 index 0000000000..c6187a9d38 --- /dev/null +++ b/plugins/Admin/src/Controller/CronjobsController.php @@ -0,0 +1,34 @@ + + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ + +class CronjobsController extends AdminAppController +{ + + public function isAuthorized($user) + { + return $this->AppAuth->isSuperadmin(); + } + + public function index() + { + $this->Cronjobs = $this->getTableLocator()->get('Cronjobs'); + $cronjobs = $this->Cronjobs->find('available'); + $this->set('cronjobs', $cronjobs); + $this->set('title_for_layout', __d('admin', 'Cronjobs')); + } + +} diff --git a/plugins/Admin/templates/Cronjobs/index.php b/plugins/Admin/templates/Cronjobs/index.php new file mode 100644 index 0000000000..f77fcfd6f3 --- /dev/null +++ b/plugins/Admin/templates/Cronjobs/index.php @@ -0,0 +1,118 @@ + + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ + +use Cake\Core\Configure; + +$this->element('addScript', [ + 'script' => Configure::read('app.jsNamespace') . ".Admin.init(); + " +]); +?> + +
+

+
+ element('printIcon'); + ?> +
+ +
+ +'; + +echo ''; +echo 'ID'; +echo ''; +echo '' . __d('admin', 'Name') . ''; +echo '' . __d('admin', 'Time_interval') . ''; +echo '' . __d('admin', 'Day_of_month') . ''; +echo '' . __d('admin', 'Weekday') . ''; +echo '' . __d('admin', 'Not_before_time') . ''; +echo '' . __d('admin', 'Active') . ''; +echo ''; + +$i = 0; +foreach ($cronjobs as $cronjob) { + $i ++; + $rowClass = [ + 'data' + ]; + if (! $cronjob->active) { + $rowClass[] = 'deactivated'; + } + echo ''; + + echo ''; + echo $this->Html->link( + '', + $this->Slug->getCronjobEdit($cronjob->id), + [ + 'class' => 'btn btn-outline-light', + 'title' => __d('admin', 'Edit'), + 'escape' => false + ] + ); + echo ''; + + echo ''; + echo $cronjob->id; + echo ''; + + echo ''; + echo $cronjob->name; + echo ''; + + echo ''; + echo $this->Time->getTranslatedTimeInterval($cronjob->time_interval); + echo ''; + + echo ''; + echo $cronjob->day_of_month; + echo ''; + + echo ''; + if ($cronjob->weekday != '') { + echo $this->Time->getWeekdayName( + $this->Time->formatAsWeekday( + strtotime('next ' . $cronjob->weekday), // trick to get eg. 6 from Saturday + )); + } + echo ''; + + echo ''; + echo $cronjob->not_before_time->i18nFormat($this->Time->getI18Format('TimeShort')); + echo ''; + + echo ''; + if ($cronjob->active == 1) { + echo ''; + } else { + echo ''; + } + echo ''; + + echo ''; +} + +echo ''; +echo '' . $i . ' '.__d('admin', '{0,plural,=1{record} other{records}}', $i).''; +echo ''; + +echo ''; + +?> diff --git a/plugins/Admin/templates/element/menu.php b/plugins/Admin/templates/element/menu.php index 526d2e31fd..8885dd4ebb 100644 --- a/plugins/Admin/templates/element/menu.php +++ b/plugins/Admin/templates/element/menu.php @@ -213,6 +213,15 @@ 'fa-icon' => 'fa-fw ok fa-cogs' ] ]; + + $homepageAdministrationElement['children'][] = [ + 'slug' => $this->Slug->getCronjobsList(), + 'name' => __d('admin', 'Cronjobs'), + 'options' => [ + 'fa-icon' => 'fa-fw ok fa-clock' + ], + ]; + } $menu[] = $homepageAdministrationElement; diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index 566850c157a1ba59c19ea8348c59fd32178ad5ed..2ae4cb77c6ebe225b328e63ad6294a52f1a3e4ea 100644 GIT binary patch delta 19762 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
kPd(>7YqMkSnwRIy={ikA9z5lbxXfKzb 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 delta 19231 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\n" "Language-Team: LANGUAGE \n" @@ -1316,6 +1316,30 @@ msgstr "" msgid "You_are_not_signed_in." msgstr "" +msgid "BackupDatabaseCronjob" +msgstr "" + +msgid "CheckCreditBalanceCronjob" +msgstr "" + +msgid "EmailOrderReminderCronjob" +msgstr "" + +msgid "PickupReminderCronjob" +msgstr "" + +msgid "SendOrderListsCronjob" +msgstr "" + +msgid "SendInvoicesToCustomersCronjob" +msgstr "" + +msgid "SendInvoicesToManufacturersCronjob" +msgstr "" + +msgid "SendDeliveryNotesCronjob" +msgstr "" + msgid "Action_Log_Invoice_added" msgstr "" @@ -2039,6 +2063,12 @@ msgstr "" msgid "bulk_order" msgstr "" +msgid "midnight" +msgstr "" + +msgid "default_value" +msgstr "" + msgid "yes" msgstr "" @@ -2144,16 +2174,16 @@ msgstr "" msgid "active_state_all" msgstr "" -msgid "{0,plural,=1{1_minute} other{#_minutes}}" +msgid "daily" msgstr "" -msgid "{0,plural,=1{1_second} other{#_seconds}}" +msgid "monthly" msgstr "" -msgid "midnight" +msgid "{0,plural,=1{1_minute} other{#_minutes}}" msgstr "" -msgid "default_value" +msgid "{0,plural,=1{1_second} other{#_seconds}}" msgstr "" msgid "price_will_be_adapted." diff --git a/resources/locales/en_US/default.mo b/resources/locales/en_US/default.mo index 71eb6b19566d05faa7748fe6080f63c7a3058125..05c73caa9bc2a8ff86495d839512b7f17c292b22 100644 GIT binary patch delta 19763 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 delta 19181 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 diff --git a/resources/locales/en_US/default.po b/resources/locales/en_US/default.po index c4d8e1ac99..b615ab3a9a 100644 --- a/resources/locales/en_US/default.po +++ b/resources/locales/en_US/default.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-08-30 14:09+0200\n" -"PO-Revision-Date: 2022-08-30 14:10+0200\n" +"POT-Creation-Date: 2022-09-14 08:52+0200\n" +"PO-Revision-Date: 2022-09-14 08:57+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: en_US\n" @@ -1317,6 +1317,30 @@ msgstr "Sum price incl." msgid "You_are_not_signed_in." msgstr "Your are not signed in." +msgid "BackupDatabaseCronjob" +msgstr "Backup database" + +msgid "CheckCreditBalanceCronjob" +msgstr "Credit reminder" + +msgid "EmailOrderReminderCronjob" +msgstr "Order reminder" + +msgid "PickupReminderCronjob" +msgstr "Pickup reminder" + +msgid "SendOrderListsCronjob" +msgstr "Order lists" + +msgid "SendInvoicesToCustomersCronjob" +msgstr "Invoices" + +msgid "SendInvoicesToManufacturersCronjob" +msgstr "Invoices" + +msgid "SendDeliveryNotesCronjob" +msgstr "Delivery notes" + msgid "Action_Log_Invoice_added" msgstr "Invoice: Added" @@ -2008,7 +2032,7 @@ msgid "Order_adaptions" msgstr "Order adaptions" msgid "My_data" -msgstr "" +msgstr "My data" msgid "Change_password" msgstr "Change password" @@ -2040,6 +2064,12 @@ msgstr "every last {0} of a month" msgid "bulk_order" msgstr "bulk order" +msgid "midnight" +msgstr "midnight" + +msgid "default_value" +msgstr "default value" + msgid "yes" msgstr "yes" @@ -2145,18 +2175,18 @@ msgstr "inactive" msgid "active_state_all" msgstr "all" +msgid "daily" +msgstr "daily" + +msgid "monthly" +msgstr "monthly" + msgid "{0,plural,=1{1_minute} other{#_minutes}}" msgstr "{0,plural,=1{1 minute} other{# minutes}}" msgid "{0,plural,=1{1_second} other{#_seconds}}" msgstr "{0,plural,=1{1 second} other{# seconds}}" -msgid "midnight" -msgstr "midnight" - -msgid "default_value" -msgstr "default value" - msgid "price_will_be_adapted." msgstr "price will be adapted." diff --git a/src/Model/Entity/Cronjob.php b/src/Model/Entity/Cronjob.php new file mode 100644 index 0000000000..a3814ebfd4 --- /dev/null +++ b/src/Model/Entity/Cronjob.php @@ -0,0 +1,53 @@ + + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ +class Cronjob extends Entity +{ + + protected function _getName($name) + { + switch ($name) { + case 'BackupDatabase': + return __('BackupDatabaseCronjob'); + break; + case 'CheckCreditBalance': + return __('CheckCreditBalanceCronjob'); + break; + case 'EmailOrderReminder': + return __('EmailOrderReminderCronjob'); + break; + case 'PickupReminder': + return __('PickupReminderCronjob'); + break; + case 'SendOrderLists': + return __('SendOrderListsCronjob'); + break; + case 'SendInvoicesToCustomers': + return __('SendInvoicesToCustomersCronjob'); + break; + case 'SendInvoicesToManufacturers': + return __('SendInvoicesToManufacturersCronjob'); + break; + case 'SendDeliveryNotes': + return __('SendDeliveryNotesCronjob'); + break; + } + return $name; + } + +} diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 10069f8a0c..1c3a4382d2 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -7,6 +7,7 @@ use Cake\I18n\I18n; use App\Lib\Error\Exception\InvalidParameterException; use Cake\I18n\FrozenTime; +use Cake\ORM\Query; /** * FoodCoopShop - The open source software for your foodcoop @@ -34,6 +35,23 @@ public function initialize(array $config): void ]); } + public function findAvailable(Query $query, array $options) + { + if (Configure::read('appDb.FCS_SEND_INVOICES_TO_CUSTOMERS')) { + $query->where(['name <> "SendInvoicesToManufacturers"']); + } else { + $query->where(['name <> "SendInvoicesToCustomers"']); + $query->where(['name <> "SendDeliveryNotes"']); + } + if (!Configure::read('app.htmlHelper')->paymentIsCashless()) { + $query->where(['name <> "CheckCreditBalance"']); + } + if (!Configure::read('app.emailOrderReminderEnabled')) { + $query->where(['name <> "EmailOrderReminder"']); + } + return $query; + } + public function run() { diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index f5ff6452af..1cdbc325da 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -22,6 +22,21 @@ class MyTimeHelper extends TimeHelper { + public function getTranslatedTimeInterval($timeInterval) + { + switch($timeInterval) { + case 'day': + return __('daily'); + break; + case 'week': + return __('weekly'); + break; + case 'month': + return __('monthly'); + break; + } + } + public function convertSecondsInMinutesAndSeconds($seconds) { $secondsAsInteger = (int) $seconds; diff --git a/src/View/Helper/SlugHelper.php b/src/View/Helper/SlugHelper.php index 80f30ce309..5fb7c7cde1 100644 --- a/src/View/Helper/SlugHelper.php +++ b/src/View/Helper/SlugHelper.php @@ -485,4 +485,15 @@ public function getConfigurationEdit($configurationId) { return '/admin/configurations/edit/'.$configurationId; } + + public function getCronjobsList() + { + return '/admin/cronjobs'; + } + + public function getCronjobEdit($cronjobId) + { + return '/admin/cronjobs/edit/'.$cronjobId; + } + } diff --git a/tests/TestCase/src/Controller/PagesControllerTest.php b/tests/TestCase/src/Controller/PagesControllerTest.php index 470aebea8d..2dee3a205f 100644 --- a/tests/TestCase/src/Controller/PagesControllerTest.php +++ b/tests/TestCase/src/Controller/PagesControllerTest.php @@ -111,6 +111,8 @@ public function testAllSuperadminUrls() $this->Network->getSyncDomainEdit(1), $this->Slug->getConfigurationsList(), $this->Slug->getConfigurationEdit(544), + $this->Slug->getCronjobsList(), + //$this->Slug->getCronjobsEdit(1), ]; $this->assertPagesForErrors($testUrls); From 5de5b56927ad8fe82260963814fea49a7075c9f5 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 14 Sep 2022 10:16:01 +0200 Subject: [PATCH 045/646] add last run day --- .../Admin/resources/locales/de_DE/admin.mo | Bin 70640 -> 70685 bytes .../Admin/resources/locales/de_DE/admin.po | 7 +++++-- plugins/Admin/resources/locales/default.pot | 5 ++++- .../Admin/resources/locales/en_US/admin.mo | Bin 66051 -> 66085 bytes .../Admin/resources/locales/en_US/admin.po | 7 +++++-- .../src/Controller/CronjobsController.php | 10 ++++++++++ plugins/Admin/templates/Cronjobs/index.php | 10 +++++++++- 7 files changed, 33 insertions(+), 6 deletions(-) diff --git a/plugins/Admin/resources/locales/de_DE/admin.mo b/plugins/Admin/resources/locales/de_DE/admin.mo index 8fb4a06be3d5ee053ae73f55ecc31430d73acdf7..b27cd81310c67320d370f965b9b175ebb7b6c89f 100644 GIT binary patch delta 16758 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 boHRJ1hRsVkg01y=Z delta 16719 zcmZA72YgRg{QvQrDIyXX62u4@V$UFEY%wCX5_{FIy;|SeTT5(3DWPg_wcDb#l^V5M zrADcu)A+sK-*f!`e!u&8oIcOzoOAD)_avH=Dz?QST!g;3*4A%EJz_7$;Umn4*=ssZR!lIuoSI|; zC}@J}puM#hh7b?MaGZj<@Kel&doVwqKn>s#`r#|ob28O(oG=W

jb&tc;pKYYcE) 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 diff --git a/plugins/Admin/resources/locales/de_DE/admin.po b/plugins/Admin/resources/locales/de_DE/admin.po index 0b7046d215..a833a6b0ba 100644 --- a/plugins/Admin/resources/locales/de_DE/admin.po +++ b/plugins/Admin/resources/locales/de_DE/admin.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-14 08:52+0200\n" -"PO-Revision-Date: 2022-09-14 09:00+0200\n" +"POT-Creation-Date: 2022-09-14 10:15+0200\n" +"PO-Revision-Date: 2022-09-14 10:15+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: de_DE\n" @@ -957,6 +957,9 @@ msgstr "Wochentag" msgid "Not_before_time" msgstr "Uhrzeit" +msgid "Last_run" +msgstr "Zuletzt ausgeführt" + msgid "Old_password" msgstr "Altes Passwort" diff --git a/plugins/Admin/resources/locales/default.pot b/plugins/Admin/resources/locales/default.pot index b131e248bc..610d29b13f 100644 --- a/plugins/Admin/resources/locales/default.pot +++ b/plugins/Admin/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-09-14 08:52+0200\n" +"POT-Creation-Date: 2022-09-14 10:15+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -956,6 +956,9 @@ msgstr "" msgid "Not_before_time" msgstr "" +msgid "Last_run" +msgstr "" + msgid "Old_password" msgstr "" diff --git a/plugins/Admin/resources/locales/en_US/admin.mo b/plugins/Admin/resources/locales/en_US/admin.mo index fb2738284eba26e538d712faf39228382a4274af..d68eb549ccf273a1f99adfdbe74798613ee8eff4 100644 GIT binary patch delta 16712 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 diff --git a/plugins/Admin/resources/locales/en_US/admin.po b/plugins/Admin/resources/locales/en_US/admin.po index 6b3c0d45d7..138477da2a 100644 --- a/plugins/Admin/resources/locales/en_US/admin.po +++ b/plugins/Admin/resources/locales/en_US/admin.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-14 08:52+0200\n" -"PO-Revision-Date: 2022-09-14 09:01+0200\n" +"POT-Creation-Date: 2022-09-14 10:15+0200\n" +"PO-Revision-Date: 2022-09-14 10:15+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: en_US\n" @@ -957,6 +957,9 @@ msgstr "Weekday" msgid "Not_before_time" msgstr "Time" +msgid "Last_run" +msgstr "Last run" + msgid "Old_password" msgstr "Old password" diff --git a/plugins/Admin/src/Controller/CronjobsController.php b/plugins/Admin/src/Controller/CronjobsController.php index c6187a9d38..c70137294a 100644 --- a/plugins/Admin/src/Controller/CronjobsController.php +++ b/plugins/Admin/src/Controller/CronjobsController.php @@ -1,6 +1,8 @@ Cronjobs = $this->getTableLocator()->get('Cronjobs'); $cronjobs = $this->Cronjobs->find('available'); + + $cronjobs->contain([ + 'CronjobLogs' => function (Query $q) { + $q->orderDesc('CronjobLogs.created'); + return $q; + } + ]); + $this->set('cronjobs', $cronjobs); $this->set('title_for_layout', __d('admin', 'Cronjobs')); } diff --git a/plugins/Admin/templates/Cronjobs/index.php b/plugins/Admin/templates/Cronjobs/index.php index f77fcfd6f3..4269011c3b 100644 --- a/plugins/Admin/templates/Cronjobs/index.php +++ b/plugins/Admin/templates/Cronjobs/index.php @@ -44,6 +44,7 @@ echo '' . __d('admin', 'Weekday') . ''; echo '' . __d('admin', 'Not_before_time') . ''; echo '' . __d('admin', 'Active') . ''; +echo '' . __d('admin', 'Last_run') . ''; echo ''; $i = 0; @@ -106,11 +107,18 @@ } echo ''; + echo ''; + if (!empty($cronjob->cronjob_logs[0])) { + echo $this->Time->getWeekdayName($this->Time->formatAsWeekday($cronjob->cronjob_logs[0]->created->toUnixString())) . ', '; + echo $cronjob->cronjob_logs[0]->created->i18nFormat($this->Time->getI18Format('DateNTimeShort')); + } + echo ''; + echo ''; } echo ''; -echo '' . $i . ' '.__d('admin', '{0,plural,=1{record} other{records}}', $i).''; +echo '' . $i . ' '.__d('admin', '{0,plural,=1{record} other{records}}', $i).''; echo ''; echo ''; From f3e1cc7fb57561e3d1dbb62aae57172626b56deb Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 14 Sep 2022 14:29:58 +0200 Subject: [PATCH 046/646] moved tax rates and cronjobs as tabs under settings --- .../Admin/resources/locales/de_DE/admin.po | 14 ++++----- plugins/Admin/resources/locales/default.pot | 14 ++++----- .../Admin/resources/locales/en_US/admin.po | 14 ++++----- .../Admin/templates/Configurations/edit.php | 7 +++++ .../Admin/templates/Configurations/index.php | 6 ++++ plugins/Admin/templates/Cronjobs/index.php | 10 ++++-- .../Customers/credit_balance_sum.php | 2 +- .../templates/Deposits/overview_diagram.php | 2 +- plugins/Admin/templates/Invoices/index.php | 2 +- .../Admin/templates/OrderDetails/profit.php | 2 +- plugins/Admin/templates/Reports/payments.php | 2 +- plugins/Admin/templates/Taxes/edit.php | 11 +++++-- plugins/Admin/templates/Taxes/index.php | 9 ++++-- plugins/Admin/templates/element/menu.php | 16 +--------- .../element/navTabs/configurationNavTabs.php | 29 ++++++++++++++++++ .../element/{ => navTabs}/reportNavTabs.php | 1 - resources/locales/de_DE/default.mo | Bin 74449 -> 74567 bytes resources/locales/de_DE/default.po | 13 ++++++-- resources/locales/default.pot | 11 ++++++- resources/locales/en_US/default.mo | Bin 70136 -> 70246 bytes resources/locales/en_US/default.po | 13 ++++++-- src/View/Helper/MyHtmlHelper.php | 21 +++++++++++++ 22 files changed, 146 insertions(+), 53 deletions(-) create mode 100644 plugins/Admin/templates/element/navTabs/configurationNavTabs.php rename plugins/Admin/templates/element/{ => navTabs}/reportNavTabs.php (97%) diff --git a/plugins/Admin/resources/locales/de_DE/admin.po b/plugins/Admin/resources/locales/de_DE/admin.po index a833a6b0ba..724a6857aa 100644 --- a/plugins/Admin/resources/locales/de_DE/admin.po +++ b/plugins/Admin/resources/locales/de_DE/admin.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-14 10:15+0200\n" +"POT-Creation-Date: 2022-09-14 14:27+0200\n" "PO-Revision-Date: 2022-09-14 10:15+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -945,6 +945,12 @@ msgstr "Standard-Bild für Hersteller, Breite:" msgid "Default_image_for_blog_post,_width:" msgstr "Standard-Bild für Blog-Artikel, Breite: " +msgid "Website_administration" +msgstr "Homepage-Verwaltung" + +msgid "Configurations" +msgstr "Einstellungen" + msgid "Time_interval" msgstr "Intervall" @@ -972,9 +978,6 @@ msgstr "mindestens 8 Zeichen" msgid "New_password_again" msgstr "Neues Passwort (nochmal)" -msgid "Website_administration" -msgstr "Homepage-Verwaltung" - msgid "Financial_reports" msgstr "Finanzberichte" @@ -1956,9 +1959,6 @@ msgstr "IBAN" msgid "BIC" msgstr "BIC" -msgid "Configurations" -msgstr "Einstellungen" - msgid "My_products" msgstr "Meine Produkte" diff --git a/plugins/Admin/resources/locales/default.pot b/plugins/Admin/resources/locales/default.pot index 610d29b13f..df3cd491f3 100644 --- a/plugins/Admin/resources/locales/default.pot +++ b/plugins/Admin/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-09-14 10:15+0200\n" +"POT-Creation-Date: 2022-09-14 14:27+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -944,6 +944,12 @@ msgstr "" msgid "Default_image_for_blog_post,_width:" msgstr "" +msgid "Website_administration" +msgstr "" + +msgid "Configurations" +msgstr "" + msgid "Time_interval" msgstr "" @@ -971,9 +977,6 @@ msgstr "" msgid "New_password_again" msgstr "" -msgid "Website_administration" -msgstr "" - msgid "Financial_reports" msgstr "" @@ -1946,9 +1949,6 @@ msgstr "" msgid "BIC" msgstr "" -msgid "Configurations" -msgstr "" - msgid "My_products" msgstr "" diff --git a/plugins/Admin/resources/locales/en_US/admin.po b/plugins/Admin/resources/locales/en_US/admin.po index 138477da2a..74409dd429 100644 --- a/plugins/Admin/resources/locales/en_US/admin.po +++ b/plugins/Admin/resources/locales/en_US/admin.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-14 10:15+0200\n" +"POT-Creation-Date: 2022-09-14 14:27+0200\n" "PO-Revision-Date: 2022-09-14 10:15+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -945,6 +945,12 @@ msgstr "Default image for manufacturer, width:" msgid "Default_image_for_blog_post,_width:" msgstr "Default image for blog post, width:" +msgid "Website_administration" +msgstr "Website administration" + +msgid "Configurations" +msgstr "Settings" + msgid "Time_interval" msgstr "Interval" @@ -972,9 +978,6 @@ msgstr "min 8 characters" msgid "New_password_again" msgstr "New password (again)" -msgid "Website_administration" -msgstr "Website administration" - msgid "Financial_reports" msgstr "Financial reports" @@ -1953,9 +1956,6 @@ msgstr "IBAN" msgid "BIC" msgstr "BIC" -msgid "Configurations" -msgstr "Settings" - msgid "My_products" msgstr "My products" diff --git a/plugins/Admin/templates/Configurations/edit.php b/plugins/Admin/templates/Configurations/edit.php index e1e8e1ef0a..eabda58453 100644 --- a/plugins/Admin/templates/Configurations/edit.php +++ b/plugins/Admin/templates/Configurations/edit.php @@ -32,6 +32,13 @@ class="btn btn-outline-light cancel">

+element('navTabs/configurationNavTabs', [ + 'key' => 'configurations', + ]); +?> + +
+ element('navTabs/configurationNavTabs', [ + 'key' => 'configurations', + ]); + ?> +

diff --git a/plugins/Admin/templates/Cronjobs/index.php b/plugins/Admin/templates/Cronjobs/index.php index 4269011c3b..6d73a4378c 100644 --- a/plugins/Admin/templates/Cronjobs/index.php +++ b/plugins/Admin/templates/Cronjobs/index.php @@ -15,10 +15,12 @@ use Cake\Core\Configure; -$this->element('addScript', [ - 'script' => Configure::read('app.jsNamespace') . ".Admin.init(); +$this->element('addScript', [ 'script' => + Configure::read('app.jsNamespace') . ".Admin.init(); " . + Configure::read('app.jsNamespace') . ".Admin.selectMainMenuAdmin('".__d('admin', 'Website_administration')."', '".__d('admin', 'Configurations')."'); " ]); + ?>
@@ -33,6 +35,10 @@ element('navTabs/configurationNavTabs', [ + 'key' => 'cronjobs', +]); + echo '
'; echo ''; diff --git a/plugins/Admin/templates/Customers/credit_balance_sum.php b/plugins/Admin/templates/Customers/credit_balance_sum.php index ed7209d6a8..a511073d3f 100644 --- a/plugins/Admin/templates/Customers/credit_balance_sum.php +++ b/plugins/Admin/templates/Customers/credit_balance_sum.php @@ -28,7 +28,7 @@ element('reportNavTabs', [ +echo $this->element('navTabs/reportNavTabs', [ 'key' => 'credit_balance_sum', 'dateFrom' => $dateFrom, 'dateTo' => $dateTo diff --git a/plugins/Admin/templates/Deposits/overview_diagram.php b/plugins/Admin/templates/Deposits/overview_diagram.php index 04dfc2071f..50fc14dcc5 100644 --- a/plugins/Admin/templates/Deposits/overview_diagram.php +++ b/plugins/Admin/templates/Deposits/overview_diagram.php @@ -34,7 +34,7 @@ element('reportNavTabs', [ +echo $this->element('navTabs/reportNavTabs', [ 'key' => 'deposit_overview', 'dateFrom' => $dateFrom, 'dateTo' => $dateTo, diff --git a/plugins/Admin/templates/Invoices/index.php b/plugins/Admin/templates/Invoices/index.php index b6515f4dfa..3605396026 100644 --- a/plugins/Admin/templates/Invoices/index.php +++ b/plugins/Admin/templates/Invoices/index.php @@ -57,7 +57,7 @@ element('reportNavTabs', [ + echo $this->element('navTabs/reportNavTabs', [ 'key' => 'invoices', 'dateFrom' => $dateFrom, 'dateTo' => $dateTo, diff --git a/plugins/Admin/templates/OrderDetails/profit.php b/plugins/Admin/templates/OrderDetails/profit.php index d0a38515cb..5f1c9a193c 100644 --- a/plugins/Admin/templates/OrderDetails/profit.php +++ b/plugins/Admin/templates/OrderDetails/profit.php @@ -41,7 +41,7 @@ element('reportNavTabs', [ +echo $this->element('navTabs/reportNavTabs', [ 'key' => 'profit', 'dateFrom' => $dateFrom, 'dateTo' => $dateTo, diff --git a/plugins/Admin/templates/Reports/payments.php b/plugins/Admin/templates/Reports/payments.php index b41003909a..9253938839 100644 --- a/plugins/Admin/templates/Reports/payments.php +++ b/plugins/Admin/templates/Reports/payments.php @@ -43,7 +43,7 @@ element('reportNavTabs', [ +echo $this->element('navTabs/reportNavTabs', [ 'key' => $this->request->getParam('pass')[0], 'dateFrom' => $dateFrom, 'dateTo' => $dateTo, diff --git a/plugins/Admin/templates/Taxes/edit.php b/plugins/Admin/templates/Taxes/edit.php index 450f893d61..755b17516a 100644 --- a/plugins/Admin/templates/Taxes/edit.php +++ b/plugins/Admin/templates/Taxes/edit.php @@ -15,8 +15,10 @@ use Cake\Core\Configure; -$this->element('addScript', [ - 'script' => Configure::read('app.jsNamespace') . ".Admin.init();" . Configure::read('app.jsNamespace') . ".Admin.initForm(); +$this->element('addScript', [ 'script' => + Configure::read('app.jsNamespace') . ".Admin.init();" . + Configure::read('app.jsNamespace') . ".Admin.initForm();". + Configure::read('app.jsNamespace') . ".Admin.selectMainMenuAdmin('".__d('admin', 'Website_administration')."', '".__d('admin', 'Configurations')."'); " ]); ?> @@ -31,6 +33,11 @@ class="btn btn-outline-light cancel"> +element('navTabs/configurationNavTabs', [ + 'key' => 'tax_rates', + ]); +?>
element('addScript', [ - 'script' => Configure::read('app.jsNamespace') . ".Admin.init();" + $this->element('addScript', [ 'script' => + Configure::read('app.jsNamespace') . ".Admin.init();" . + Configure::read('app.jsNamespace') . ".Admin.selectMainMenuAdmin('".__d('admin', 'Website_administration')."', '".__d('admin', 'Configurations')."'); + " ]); $this->element('highlightRowAfterEdit', [ 'rowIdPrefix' => '#tax-' @@ -43,6 +45,9 @@ element('navTabs/configurationNavTabs', [ + 'key' => 'tax_rates', +]); echo '
'; echo ''; diff --git a/plugins/Admin/templates/element/menu.php b/plugins/Admin/templates/element/menu.php index 8885dd4ebb..ee94032a0e 100644 --- a/plugins/Admin/templates/element/menu.php +++ b/plugins/Admin/templates/element/menu.php @@ -178,13 +178,7 @@ ]; if ($appAuth->isSuperadmin()) { - $homepageAdministrationElement['children'][] = [ - 'slug' => $this->Slug->getTaxesList(), - 'name' => __d('admin', 'Tax_rates'), - 'options' => [ - 'fa-icon' => 'fa-fw ok fa-percent' - ] - ]; + $reportSlug = null; if ($this->Html->paymentIsCashless()) { @@ -214,14 +208,6 @@ ] ]; - $homepageAdministrationElement['children'][] = [ - 'slug' => $this->Slug->getCronjobsList(), - 'name' => __d('admin', 'Cronjobs'), - 'options' => [ - 'fa-icon' => 'fa-fw ok fa-clock' - ], - ]; - } $menu[] = $homepageAdministrationElement; diff --git a/plugins/Admin/templates/element/navTabs/configurationNavTabs.php b/plugins/Admin/templates/element/navTabs/configurationNavTabs.php new file mode 100644 index 0000000000..bc9bc376e1 --- /dev/null +++ b/plugins/Admin/templates/element/navTabs/configurationNavTabs.php @@ -0,0 +1,29 @@ + + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ + +?> +
    + Html->getConfigurationTabs(); + foreach ($tabs as $tab) { + $btnClass = ''; + if ($tab['key'] == $key) { + $btnClass = 'active'; + } + echo '
  • ' . $tab['name'] . '
    • '; + + } +?> +
diff --git a/plugins/Admin/templates/element/reportNavTabs.php b/plugins/Admin/templates/element/navTabs/reportNavTabs.php similarity index 97% rename from plugins/Admin/templates/element/reportNavTabs.php rename to plugins/Admin/templates/element/navTabs/reportNavTabs.php index 1bde75f1cc..849ae175e4 100644 --- a/plugins/Admin/templates/element/reportNavTabs.php +++ b/plugins/Admin/templates/element/navTabs/reportNavTabs.php @@ -12,7 +12,6 @@ * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ -use Cake\Core\Configure; ?>
    diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index 2ae4cb77c6ebe225b328e63ad6294a52f1a3e4ea..479355a09643ba7ba23cf953023479135bda8345 100644 GIT binary patch delta 19280 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 Z$$(bFdJgY7Waxnv!$$Yq{Pbk}{{b+`NcaE% delta 19177 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\n" "Language-Team: LANGUAGE \n" @@ -2126,6 +2126,15 @@ msgstr "" msgid "Superadmin" msgstr "" +msgid "Configurations" +msgstr "" + +msgid "Cronjobs" +msgstr "" + +msgid "Tax_rates" +msgstr "" + msgid "Credit_overview" msgstr "" diff --git a/resources/locales/en_US/default.mo b/resources/locales/en_US/default.mo index 05c73caa9bc2a8ff86495d839512b7f17c292b22..75f87683ae48f649841bbd0c73f27cd6b22ad9dd 100644 GIT binary patch delta 19262 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 delta 19177 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\n" "Language: en_US\n" @@ -2127,6 +2127,15 @@ msgstr "Admin" msgid "Superadmin" msgstr "Superadmin" +msgid "Configurations" +msgstr "Settings" + +msgid "Cronjobs" +msgstr "Cronjobs" + +msgid "Tax_rates" +msgstr "Tax rates" + msgid "Credit_overview" msgstr "Credit overview" diff --git a/src/View/Helper/MyHtmlHelper.php b/src/View/Helper/MyHtmlHelper.php index 6722264cad..e3cb53fd4f 100644 --- a/src/View/Helper/MyHtmlHelper.php +++ b/src/View/Helper/MyHtmlHelper.php @@ -503,6 +503,27 @@ public function getCartIdFromCartFinishedUrl($url) return (int) $cartId[5]; } + public function getConfigurationTabs() + { + $tabs = []; + $tabs[] = [ + 'name' => ' ' . __('Configurations'), + 'url' => Configure::read('app.slugHelper')->getConfigurationsList(), + 'key' => 'configurations', + ]; + $tabs[] = [ + 'name' => ' ' . __('Cronjobs'), + 'url' => Configure::read('app.slugHelper')->getCronjobsList(), + 'key' => 'cronjobs', + ]; + $tabs[] = [ + 'name' => ' ' . __('Tax_rates'), + 'url' => Configure::read('app.slugHelper')->getTaxesList(), + 'key' => 'tax_rates', + ]; + return $tabs; + } + public function getReportTabs() { $tabs = []; From 0e6f03460454d30f3fe7859e6db143c4ca951465 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 14 Sep 2022 15:00:15 +0200 Subject: [PATCH 047/646] saving cronjobs works (without validations) --- .../Admin/resources/locales/de_DE/admin.mo | Bin 70685 -> 70816 bytes .../Admin/resources/locales/de_DE/admin.po | 26 ++++-- plugins/Admin/resources/locales/default.pot | 20 +++-- .../Admin/resources/locales/en_US/admin.po | 26 ++++-- .../src/Controller/CronjobsController.php | 49 +++++++++++ plugins/Admin/templates/Cronjobs/edit.php | 83 ++++++++++++++++++ resources/locales/de_DE/default.po | 20 ++--- resources/locales/default.pot | 20 ++--- resources/locales/en_US/default.po | 20 ++--- src/Model/Table/CronjobsTable.php | 35 ++++++++ .../src/Controller/PagesControllerTest.php | 2 +- 11 files changed, 248 insertions(+), 53 deletions(-) create mode 100644 plugins/Admin/templates/Cronjobs/edit.php diff --git a/plugins/Admin/resources/locales/de_DE/admin.mo b/plugins/Admin/resources/locales/de_DE/admin.mo index b27cd81310c67320d370f965b9b175ebb7b6c89f..5e9dc6094468c263e46b55bfff2685d83686c907 100644 GIT binary patch delta 17075 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 buwTbckzG3NThgmzr+x!sQ>xs&T=@S0<0w9c delta 16981 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 aV&#jMO8$IB&n(H_yO$P8K79N4sQ&>W_Y^_^ diff --git a/plugins/Admin/resources/locales/de_DE/admin.po b/plugins/Admin/resources/locales/de_DE/admin.po index 724a6857aa..5de57e0052 100644 --- a/plugins/Admin/resources/locales/de_DE/admin.po +++ b/plugins/Admin/resources/locales/de_DE/admin.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-14 14:27+0200\n" -"PO-Revision-Date: 2022-09-14 10:15+0200\n" +"POT-Creation-Date: 2022-09-14 14:52+0200\n" +"PO-Revision-Date: 2022-09-14 14:52+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: de_DE\n" @@ -87,6 +87,12 @@ msgstr "Test E-Mail" msgid "Cronjobs" msgstr "Cronjobs" +msgid "Edit_cronjob" +msgstr "Cronjob bearbeiten" + +msgid "The_cronjob_{0}_has_been_changed." +msgstr "Der Cronjob {0} wurde geändert." + msgid "all_members" msgstr "alle Mitglieder" @@ -948,18 +954,21 @@ msgstr "Standard-Bild für Blog-Artikel, Breite: " msgid "Website_administration" msgstr "Homepage-Verwaltung" -msgid "Configurations" -msgstr "Einstellungen" - msgid "Time_interval" msgstr "Intervall" msgid "Day_of_month" msgstr "Tag (Monat)" +msgid "Please_select..." +msgstr "Bitte auswählen..." + msgid "Weekday" msgstr "Wochentag" +msgid "Configurations" +msgstr "Einstellungen" + msgid "Not_before_time" msgstr "Uhrzeit" @@ -1488,9 +1497,6 @@ msgstr "Lieferpause" msgid "How_do_I_use_the_function_delivery_break?" msgstr "Wie verwende ich die Funktion \"Lieferpause\"?" -msgid "Please_select..." -msgstr "Bitte auswählen..." - msgid "Manufacturer_profile_and_products_are_only_visible_for_signed_in_members." msgstr "Hersteller-Profil und Produkte werden nur für eingeloggte Mitglieder angezeigt." @@ -2397,6 +2403,10 @@ msgstr "Das tatsächlich gelieferte Gewicht wird evtl. noch angepasst, d. h. der msgid "Product_ID" msgstr "Produkt-Nr." +#, fuzzy +#~ msgid "Please_chose" +#~ msgstr "Bitte auswählen..." + #~ msgid "Please_enter_why_pickup_day_is_changed." #~ msgstr "Bitte gib an, warum der Abholtag geändert wird." diff --git a/plugins/Admin/resources/locales/default.pot b/plugins/Admin/resources/locales/default.pot index df3cd491f3..9adf73366c 100644 --- a/plugins/Admin/resources/locales/default.pot +++ b/plugins/Admin/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-09-14 14:27+0200\n" +"POT-Creation-Date: 2022-09-14 14:52+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -86,6 +86,12 @@ msgstr "" msgid "Cronjobs" msgstr "" +msgid "Edit_cronjob" +msgstr "" + +msgid "The_cronjob_{0}_has_been_changed." +msgstr "" + msgid "all_members" msgstr "" @@ -947,18 +953,21 @@ msgstr "" msgid "Website_administration" msgstr "" -msgid "Configurations" -msgstr "" - msgid "Time_interval" msgstr "" msgid "Day_of_month" msgstr "" +msgid "Please_select..." +msgstr "" + msgid "Weekday" msgstr "" +msgid "Configurations" +msgstr "" + msgid "Not_before_time" msgstr "" @@ -1478,9 +1487,6 @@ msgstr "" msgid "How_do_I_use_the_function_delivery_break?" msgstr "" -msgid "Please_select..." -msgstr "" - msgid "Manufacturer_profile_and_products_are_only_visible_for_signed_in_members." msgstr "" diff --git a/plugins/Admin/resources/locales/en_US/admin.po b/plugins/Admin/resources/locales/en_US/admin.po index 74409dd429..e9d73b0751 100644 --- a/plugins/Admin/resources/locales/en_US/admin.po +++ b/plugins/Admin/resources/locales/en_US/admin.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-14 14:27+0200\n" +"POT-Creation-Date: 2022-09-14 14:52+0200\n" "PO-Revision-Date: 2022-09-14 10:15+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -87,6 +87,14 @@ msgstr "Test email" msgid "Cronjobs" msgstr "Cronjobs" +#, fuzzy +msgid "Edit_cronjob" +msgstr "Cronjobs" + +#, fuzzy +msgid "The_cronjob_{0}_has_been_changed." +msgstr "The setting {0} has been changed to {1}." + msgid "all_members" msgstr "all members" @@ -948,18 +956,21 @@ msgstr "Default image for blog post, width:" msgid "Website_administration" msgstr "Website administration" -msgid "Configurations" -msgstr "Settings" - msgid "Time_interval" msgstr "Interval" msgid "Day_of_month" msgstr "Day of month" +msgid "Please_select..." +msgstr "Please select..." + msgid "Weekday" msgstr "Weekday" +msgid "Configurations" +msgstr "Settings" + msgid "Not_before_time" msgstr "Time" @@ -1485,9 +1496,6 @@ msgstr "Delivery break" msgid "How_do_I_use_the_function_delivery_break?" msgstr "How do I use the function \"delivery break\"?" -msgid "Please_select..." -msgstr "Please select..." - msgid "Manufacturer_profile_and_products_are_only_visible_for_signed_in_members." msgstr "Manufacturer provile and products are only visible for signed in members." @@ -2394,6 +2402,10 @@ msgstr "The delivered weight will eventually be adapted, so the price can change msgid "Product_ID" msgstr "ProductID" +#, fuzzy +#~ msgid "Please_chose" +#~ msgstr "Please select..." + #~ msgid "Please_enter_why_pickup_day_is_changed." #~ msgstr "Please enter why the pickup day is changed." diff --git a/plugins/Admin/src/Controller/CronjobsController.php b/plugins/Admin/src/Controller/CronjobsController.php index c70137294a..c631666e12 100644 --- a/plugins/Admin/src/Controller/CronjobsController.php +++ b/plugins/Admin/src/Controller/CronjobsController.php @@ -1,6 +1,8 @@ set('title_for_layout', __d('admin', 'Cronjobs')); } + public function edit($cronjobId) + { + $this->Cronjob = $this->getTableLocator()->get('Cronjobs'); + $cronjob = $this->Cronjob->find('available', [ + 'conditions' => [ + 'Cronjobs.id' => $cronjobId, + ] + ])->first(); + + if (empty($cronjob)) { + throw new NotFoundException; + } + $this->set('title_for_layout', __d('admin', 'Edit_cronjob')); + + $this->setFormReferer(); + $this->set('timeIntervals', $this->Cronjob->getTimeIntervals()); + $this->set('daysOfMonth', $this->Cronjob->getDaysOfMonth()); + $this->set('weekdays', $this->Cronjob->getWeekdays()); + + if (empty($this->getRequest()->getData())) { + $this->set('cronjob', $cronjob); + return; + } + + $this->loadComponent('Sanitize'); + $this->setRequest($this->getRequest()->withParsedBody($this->Sanitize->trimRecursive($this->getRequest()->getData()))); + $this->setRequest($this->getRequest()->withParsedBody($this->Sanitize->stripTagsAndPurifyRecursive($this->getRequest()->getData()))); + + $cronjob = $this->Cronjob->patchEntity($cronjob, $this->getRequest()->getData()); + if ($cronjob->hasErrors()) { + $this->Flash->error(__d('admin', 'Errors_while_saving!')); + $this->set('cronjob', $cronjob); + //$this->render('edit'); + } else { + $cronjob = $this->Cronjob->save($cronjob); + $this->ActionLog = $this->getTableLocator()->get('ActionLogs'); + $message = __d('admin', 'The_cronjob_{0}_has_been_changed.', ['' . $cronjob->id_cronjob . '']); + $this->ActionLog->customSave('cronjob_changed', $this->AppAuth->getUserId(), $cronjob->id, 'cronjobs', $message); + $this->Flash->success($message); + + $this->redirect($this->getPreparedReferer()); + } + + $this->set('cronjob', $cronjob); + + } + } diff --git a/plugins/Admin/templates/Cronjobs/edit.php b/plugins/Admin/templates/Cronjobs/edit.php new file mode 100644 index 0000000000..754402b709 --- /dev/null +++ b/plugins/Admin/templates/Cronjobs/edit.php @@ -0,0 +1,83 @@ + + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ + +use Cake\Core\Configure; + +$this->element('addScript', [ 'script' => + Configure::read('app.jsNamespace') . ".Admin.init();" . + Configure::read('app.jsNamespace') . ".Admin.initForm();". + Configure::read('app.jsNamespace') . ".Admin.selectMainMenuAdmin('".__d('admin', 'Website_administration')."', '".__d('admin', 'Cronjobs')."'); + " +]); +?> + +
    +

    +
    + + element('printIcon'); ?> +
    +
    + +element('navTabs/configurationNavTabs', [ + 'key' => 'cronjobs', + ]); +?> +
    + +Form->create($cronjob, [ + 'class' => 'fcs-form', + 'novalidate' => 'novalidate', + 'url' => $this->Slug->getCronjobEdit($cronjob->id), + 'id' => 'cronjobEditForm', +]); + +echo $this->Form->hidden('referer', ['value' => $referer]); + +echo '

    ' . $cronjob->name . '

    '; + +echo $this->Form->control('Cronjobs.time_interval', [ + 'label' => __d('admin', 'Time_interval'), + 'type' => 'select', + 'options' => $timeIntervals, +]); + +echo $this->Form->control('Cronjobs.day_of_month', [ + 'label' => __d('admin', 'Day_of_month'), + 'type' => 'select', + 'empty' => __d('admin', 'Please_select...'), + 'options' => $daysOfMonth, +]); + +echo $this->Form->control('Cronjobs.weekday', [ + 'label' => __d('admin', 'Weekday'), + 'type' => 'select', + 'empty' => __d('admin', 'Please_select...'), + 'options' => $weekdays, +]); + +echo $this->Form->control('Cronjobs.not_before_time', [ + 'label' => __d('admin', 'Not_before_time'), + 'type' => 'time', +]); + +echo $this->Form->end(); + +?> diff --git a/resources/locales/de_DE/default.po b/resources/locales/de_DE/default.po index be1cf78138..1e520f1b10 100644 --- a/resources/locales/de_DE/default.po +++ b/resources/locales/de_DE/default.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-14 14:27+0200\n" +"POT-Creation-Date: 2022-09-14 14:51+0200\n" "PO-Revision-Date: 2022-09-14 14:27+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -1755,6 +1755,15 @@ msgstr "Bitte gib den Namen der Foodcoop an." msgid "The_amount_of_characters_needs_to_be_between_{0}_and_{1}." msgstr "Die Anzahl der Zeichen muss zwischen {0} und {1} liegen." +msgid "daily" +msgstr "täglich" + +msgid "weekly" +msgstr "wöchentlich" + +msgid "monthly" +msgstr "monatlich" + msgid "Please_enter_your_first_name." msgstr "Bitte gib deinen Vornamen an." @@ -2049,9 +2058,6 @@ msgstr "Einkaufen zum Einkaufspreis" msgid "Shopping_with_zero_price" msgstr "Einkaufen zum Nullpreis" -msgid "weekly" -msgstr "wöchentlich" - msgid "every_{0}_week" msgstr "jede {0} Woche" @@ -2184,12 +2190,6 @@ msgstr "deaktiviert" msgid "active_state_all" msgstr "alle" -msgid "daily" -msgstr "täglich" - -msgid "monthly" -msgstr "monatlich" - msgid "{0,plural,=1{1_minute} other{#_minutes}}" msgstr "{0,plural,=1{1 Minute} other{# Minuten}}" diff --git a/resources/locales/default.pot b/resources/locales/default.pot index 1e53b187b3..c22f0684b1 100644 --- a/resources/locales/default.pot +++ b/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-09-14 14:27+0200\n" +"POT-Creation-Date: 2022-09-14 14:51+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -1754,6 +1754,15 @@ msgstr "" msgid "The_amount_of_characters_needs_to_be_between_{0}_and_{1}." msgstr "" +msgid "daily" +msgstr "" + +msgid "weekly" +msgstr "" + +msgid "monthly" +msgstr "" + msgid "Please_enter_your_first_name." msgstr "" @@ -2048,9 +2057,6 @@ msgstr "" msgid "Shopping_with_zero_price" msgstr "" -msgid "weekly" -msgstr "" - msgid "every_{0}_week" msgstr "" @@ -2183,12 +2189,6 @@ msgstr "" msgid "active_state_all" msgstr "" -msgid "daily" -msgstr "" - -msgid "monthly" -msgstr "" - msgid "{0,plural,=1{1_minute} other{#_minutes}}" msgstr "" diff --git a/resources/locales/en_US/default.po b/resources/locales/en_US/default.po index e969e7a41f..383b325858 100644 --- a/resources/locales/en_US/default.po +++ b/resources/locales/en_US/default.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-14 14:27+0200\n" +"POT-Creation-Date: 2022-09-14 14:51+0200\n" "PO-Revision-Date: 2022-09-14 14:29+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -1755,6 +1755,15 @@ msgstr "Please enter the name of the food-coop." msgid "The_amount_of_characters_needs_to_be_between_{0}_and_{1}." msgstr "The amount of characters needs to be between {0} and {1}." +msgid "daily" +msgstr "daily" + +msgid "weekly" +msgstr "weekly" + +msgid "monthly" +msgstr "monthly" + msgid "Please_enter_your_first_name." msgstr "Please enter your first name." @@ -2049,9 +2058,6 @@ msgstr "Use purchase price for shopping" msgid "Shopping_with_zero_price" msgstr "Use zero price for shopping" -msgid "weekly" -msgstr "weekly" - msgid "every_{0}_week" msgstr "every {0} week" @@ -2184,12 +2190,6 @@ msgstr "inactive" msgid "active_state_all" msgstr "all" -msgid "daily" -msgstr "daily" - -msgid "monthly" -msgstr "monthly" - msgid "{0,plural,=1{1_minute} other{#_minutes}}" msgstr "{0,plural,=1{1 minute} other{# minutes}}" diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 1c3a4382d2..b0a6360c9e 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -35,6 +35,41 @@ public function initialize(array $config): void ]); } + public function getTimeIntervals() + { + return [ + 'day' => __('daily'), + 'week' => __('weekly'), + 'month' => __('monthly'), + ]; + } + + public function getDaysOfMonth() + { + $days = []; + $i = 0; + while($i<=31) { + $days[$i] = $i; + $i++; + } + return $days; + } + + public function getWeekdays() + { + $weekdays = [ + 'Sunday' => __('Sunday'), + 'Monday' => __('Monday'), + 'Tuesday' => __('Tuesday'), + 'Wednesday' => __('Wednesday'), + 'Thursday' => __('Thursday'), + 'Friday' => __('Friday'), + 'Saturday' => __('Saturday') + ]; + return $weekdays; + + } + public function findAvailable(Query $query, array $options) { if (Configure::read('appDb.FCS_SEND_INVOICES_TO_CUSTOMERS')) { diff --git a/tests/TestCase/src/Controller/PagesControllerTest.php b/tests/TestCase/src/Controller/PagesControllerTest.php index 2dee3a205f..609dcbc7f8 100644 --- a/tests/TestCase/src/Controller/PagesControllerTest.php +++ b/tests/TestCase/src/Controller/PagesControllerTest.php @@ -112,7 +112,7 @@ public function testAllSuperadminUrls() $this->Slug->getConfigurationsList(), $this->Slug->getConfigurationEdit(544), $this->Slug->getCronjobsList(), - //$this->Slug->getCronjobsEdit(1), + $this->Slug->getCronjobsEdit(1), ]; $this->assertPagesForErrors($testUrls); From 1170fefd5293eb06675f6b4c2c1a1a9a9dbc4b38 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 14 Sep 2022 15:21:27 +0200 Subject: [PATCH 048/646] add cronjob basic validations and edit info message --- .../Admin/resources/locales/de_DE/admin.mo | Bin 70816 -> 70959 bytes .../Admin/resources/locales/de_DE/admin.po | 13 +++++--- plugins/Admin/resources/locales/default.pot | 9 ++++-- .../Admin/resources/locales/en_US/admin.mo | Bin 66085 -> 66333 bytes .../Admin/resources/locales/en_US/admin.po | 19 +++++------ .../src/Controller/CronjobsController.php | 1 - plugins/Admin/templates/Cronjobs/edit.php | 3 +- plugins/Admin/webroot/css/admin.css | 3 +- resources/locales/de_DE/default.mo | Bin 74567 -> 74923 bytes resources/locales/de_DE/default.po | 30 +++++++++++------- resources/locales/default.pot | 11 ++++++- resources/locales/en_US/default.mo | Bin 70246 -> 70520 bytes resources/locales/en_US/default.po | 16 +++++++--- src/Model/Table/CronjobsTable.php | 11 +++++++ 14 files changed, 78 insertions(+), 38 deletions(-) diff --git a/plugins/Admin/resources/locales/de_DE/admin.mo b/plugins/Admin/resources/locales/de_DE/admin.mo index 5e9dc6094468c263e46b55bfff2685d83686c907..848a05fa5089aa9cfd44bb020e6d92562c44c4d3 100644 GIT binary patch delta 17191 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 diff --git a/plugins/Admin/resources/locales/de_DE/admin.po b/plugins/Admin/resources/locales/de_DE/admin.po index 5de57e0052..e405199a97 100644 --- a/plugins/Admin/resources/locales/de_DE/admin.po +++ b/plugins/Admin/resources/locales/de_DE/admin.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-14 14:52+0200\n" -"PO-Revision-Date: 2022-09-14 14:52+0200\n" +"POT-Creation-Date: 2022-09-14 15:18+0200\n" +"PO-Revision-Date: 2022-09-14 15:19+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: de_DE\n" @@ -966,12 +966,15 @@ msgstr "Bitte auswählen..." msgid "Weekday" msgstr "Wochentag" -msgid "Configurations" -msgstr "Einstellungen" - msgid "Not_before_time" msgstr "Uhrzeit" +msgid "Cronjob_is_called_up_to_10_min_after_the_given_time." +msgstr "Der tatsächliche Aufruf kann bis zu 10 min nach dieser Uhrzeit erfolgen." + +msgid "Configurations" +msgstr "Einstellungen" + msgid "Last_run" msgstr "Zuletzt ausgeführt" diff --git a/plugins/Admin/resources/locales/default.pot b/plugins/Admin/resources/locales/default.pot index 9adf73366c..3df05f1cc9 100644 --- a/plugins/Admin/resources/locales/default.pot +++ b/plugins/Admin/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-09-14 14:52+0200\n" +"POT-Creation-Date: 2022-09-14 15:18+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -965,10 +965,13 @@ msgstr "" msgid "Weekday" msgstr "" -msgid "Configurations" +msgid "Not_before_time" msgstr "" -msgid "Not_before_time" +msgid "Cronjob_is_called_up_to_10_min_after_the_given_time." +msgstr "" + +msgid "Configurations" msgstr "" msgid "Last_run" diff --git a/plugins/Admin/resources/locales/en_US/admin.mo b/plugins/Admin/resources/locales/en_US/admin.mo index d68eb549ccf273a1f99adfdbe74798613ee8eff4..c50b97a825e52f85db7363e54e0b45d861ef1208 100644 GIT binary patch delta 17234 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%0A-vaWr0_ zeK@5I@c_zjN+OHP0>Lg8OK?E zMiJz(o$QmgKFzuq|D>EVmt_3ZU+X$va_vdm&SZFMUVH8@qF9yH{@Q~dI?-hIYv%LC{OwNm`yG-aXjj8)n52BrHekAepG&< z1lS8sQrA(2@)h+`l>C&k#BunPn-o(6dt~9d-^d*y_QuaB{a&BMo?Nrb#y@iI^>K{K zclyn;-ev}1Q{r!J{5BUJAok)0PpIn%vZ~&PdI0CoP)-oPMG3bL@eTE6l#86pOuM|) zi{om0eO=s7X>*Go2PpdgDeKrk`J1wbGKY&R;4Dfi^=+WCvS%pmI2B`C55|qe+w2uzQy))m%InKdz@J zC>=TfAN&J%Qd&`ToVSiQq4{4xT(QZsc!?9IahA>fOUGZ?#v{lbw)xfgko;qN?o-+w zr0gKhiQnTi%3;bMlmg_Q*=s+i9z?D;>dW^3j)FG&jFUQC{MFWr5NEOV$<~ZU%F}r+ z%#OXVGUsbh_oaMH+>jDNZW(b2d_r6<6Zij?;1R3fRem9oO&Ylz>J3c z>1gvGkUvhTLjF7@jeJS0M=4HT$6U(a#Ahj2?R9;~mC{Ljd?_{m9cgrrM#0nvVh!R& zI2v^{$9pZ#HsG}9R7|KM-U`kJNwXrsB5~wesuEUpdlicfLJ{514 zHPe;YIF}?NqtGlyKrEv|CE)N%@pAhH{5!|5B>({{fK2 Bdfos4 diff --git a/plugins/Admin/resources/locales/en_US/admin.po b/plugins/Admin/resources/locales/en_US/admin.po index e9d73b0751..09aae6c49d 100644 --- a/plugins/Admin/resources/locales/en_US/admin.po +++ b/plugins/Admin/resources/locales/en_US/admin.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-14 14:52+0200\n" -"PO-Revision-Date: 2022-09-14 10:15+0200\n" +"POT-Creation-Date: 2022-09-14 15:18+0200\n" +"PO-Revision-Date: 2022-09-14 15:20+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: en_US\n" @@ -87,13 +87,11 @@ msgstr "Test email" msgid "Cronjobs" msgstr "Cronjobs" -#, fuzzy msgid "Edit_cronjob" -msgstr "Cronjobs" +msgstr "Edit cronjob" -#, fuzzy msgid "The_cronjob_{0}_has_been_changed." -msgstr "The setting {0} has been changed to {1}." +msgstr "The cronjob {0} has been changed." msgid "all_members" msgstr "all members" @@ -968,12 +966,15 @@ msgstr "Please select..." msgid "Weekday" msgstr "Weekday" -msgid "Configurations" -msgstr "Settings" - msgid "Not_before_time" msgstr "Time" +msgid "Cronjob_is_called_up_to_10_min_after_the_given_time." +msgstr "Cronjob is called up to 10 min after the given time." + +msgid "Configurations" +msgstr "Settings" + msgid "Last_run" msgstr "Last run" diff --git a/plugins/Admin/src/Controller/CronjobsController.php b/plugins/Admin/src/Controller/CronjobsController.php index c631666e12..5e92fbca39 100644 --- a/plugins/Admin/src/Controller/CronjobsController.php +++ b/plugins/Admin/src/Controller/CronjobsController.php @@ -75,7 +75,6 @@ public function edit($cronjobId) if ($cronjob->hasErrors()) { $this->Flash->error(__d('admin', 'Errors_while_saving!')); $this->set('cronjob', $cronjob); - //$this->render('edit'); } else { $cronjob = $this->Cronjob->save($cronjob); $this->ActionLog = $this->getTableLocator()->get('ActionLogs'); diff --git a/plugins/Admin/templates/Cronjobs/edit.php b/plugins/Admin/templates/Cronjobs/edit.php index 754402b709..deac8e46a1 100644 --- a/plugins/Admin/templates/Cronjobs/edit.php +++ b/plugins/Admin/templates/Cronjobs/edit.php @@ -74,8 +74,9 @@ class="btn btn-outline-light cancel"> Form->control('Cronjobs.not_before_time', [ - 'label' => __d('admin', 'Not_before_time'), + 'label' => __d('admin', 'Not_before_time').' '.__d('admin', 'Cronjob_is_called_up_to_10_min_after_the_given_time.').'', 'type' => 'time', + 'escape' => false, ]); echo $this->Form->end(); diff --git a/plugins/Admin/webroot/css/admin.css b/plugins/Admin/webroot/css/admin.css index 1a5e8bb448..96206a4249 100644 --- a/plugins/Admin/webroot/css/admin.css +++ b/plugins/Admin/webroot/css/admin.css @@ -730,7 +730,8 @@ form.fcs-form .input.text .after.small, form.fcs-form .input.number .after.small, form.fcs-form .input.tel .after.small, form.fcs-form .input.select .after.small, -form.fcs-form .input.fcs-upload .after.small { +form.fcs-form .input.fcs-upload .after.small, +form.fcs-form .input.time .after.small { float: right; line-height: 28px; margin-left: 5px; diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index 479355a09643ba7ba23cf953023479135bda8345..98116771ce0ad861771eed90938feed9b634239d 100644 GIT binary patch delta 19723 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 Fe*m{|sE7an delta 19445 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\n" "Language-Team: LANGUAGE \n" @@ -1754,6 +1754,15 @@ msgstr "" msgid "The_amount_of_characters_needs_to_be_between_{0}_and_{1}." msgstr "" +msgid "The_time_interval_is_not_valid." +msgstr "" + +msgid "The_day_of_month_is_not_valid." +msgstr "" + +msgid "The_weekday_is_not_valid." +msgstr "" + msgid "daily" msgstr "" diff --git a/resources/locales/en_US/default.mo b/resources/locales/en_US/default.mo index 75f87683ae48f649841bbd0c73f27cd6b22ad9dd..47cca24baaa29002ab50dd3c1a8cd6987f7831c3 100644 GIT binary patch delta 19630 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 k>!;8BHkVJSco`r5KXId1SpWb4 diff --git a/resources/locales/en_US/default.po b/resources/locales/en_US/default.po index 383b325858..ce8cf13304 100644 --- a/resources/locales/en_US/default.po +++ b/resources/locales/en_US/default.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-14 14:51+0200\n" -"PO-Revision-Date: 2022-09-14 14:29+0200\n" +"POT-Creation-Date: 2022-09-14 15:11+0200\n" +"PO-Revision-Date: 2022-09-14 15:12+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: en_US\n" @@ -1755,6 +1755,15 @@ msgstr "Please enter the name of the food-coop." msgid "The_amount_of_characters_needs_to_be_between_{0}_and_{1}." msgstr "The amount of characters needs to be between {0} and {1}." +msgid "The_time_interval_is_not_valid." +msgstr "The time interval is not valid." + +msgid "The_day_of_month_is_not_valid." +msgstr "The day of month is not valid." + +msgid "The_weekday_is_not_valid." +msgstr "The weekday is not valid." + msgid "daily" msgstr "daily" @@ -2833,9 +2842,6 @@ msgstr "The prices include the VAT." #~ msgid "Surcharge" #~ msgstr "Surcharge" -#~ msgid "The_discount_is_not_valid." -#~ msgstr "The discount is not valid." - #~ msgid "No_discount_normal_selling_prices_are_used" #~ msgstr "No discount - normal selling prices are used for shopping" diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index b0a6360c9e..5d6afe9f44 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -8,6 +8,7 @@ use App\Lib\Error\Exception\InvalidParameterException; use Cake\I18n\FrozenTime; use Cake\ORM\Query; +use Cake\Validation\Validator; /** * FoodCoopShop - The open source software for your foodcoop @@ -35,6 +36,16 @@ public function initialize(array $config): void ]); } + public function validationDefault(Validator $validator): Validator + { + $validator->inList('time_interval', array_keys($this->getTimeIntervals()), __('The_time_interval_is_not_valid.')); + $validator->allowEmptyString('day_of_month'); + $validator->inList('day_of_month', array_keys($this->getDaysOfMonth()), __('The_day_of_month_is_not_valid.')); + $validator->allowEmptyString('weekday'); + $validator->inList('weekday', array_keys($this->getWeekdays()), __('The_weekday_is_not_valid.')); + return $validator; + } + public function getTimeIntervals() { return [ From 2e3620a9071fb6abb56e536fcfb5ff3c88447a0e Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 14 Sep 2022 15:24:24 +0200 Subject: [PATCH 049/646] add active field --- plugins/Admin/templates/Cronjobs/edit.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/Admin/templates/Cronjobs/edit.php b/plugins/Admin/templates/Cronjobs/edit.php index deac8e46a1..5792fb7a3c 100644 --- a/plugins/Admin/templates/Cronjobs/edit.php +++ b/plugins/Admin/templates/Cronjobs/edit.php @@ -79,6 +79,12 @@ class="btn btn-outline-light cancel"> false, ]); +echo $this->Form->control('Cronjobs.active', [ + 'label' => __d('admin', 'Active'), + 'type' => 'checkbox', +]); + + echo $this->Form->end(); ?> From df92945b617273aa9dfa581dad505930fb08011d Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 14 Sep 2022 15:27:19 +0200 Subject: [PATCH 050/646] add cronjob changed action log --- resources/locales/de_DE/default.mo | Bin 74923 -> 74985 bytes resources/locales/de_DE/default.po | 7 +++++-- resources/locales/default.pot | 5 ++++- resources/locales/en_US/default.mo | Bin 70520 -> 70580 bytes resources/locales/en_US/default.po | 7 +++++-- src/Model/Table/ActionLogsTable.php | 3 +++ 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index 98116771ce0ad861771eed90938feed9b634239d..16dabc6ed35a3db5def3638b66d0771cb9b0af0e 100644 GIT binary patch delta 19472 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 Z<<_UHUYyClN4K4e`*mG^YTb!}{{yrkNU8t; delta 19445 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\n" "Language-Team: LANGUAGE \n" @@ -1598,6 +1598,9 @@ msgstr "" msgid "Action_Log_Feedback_deleted" msgstr "" +msgid "Action_Log_Cronjob_changed" +msgstr "" + msgid "Action_Log_Cronjob_database_backup_done" msgstr "" diff --git a/resources/locales/en_US/default.mo b/resources/locales/en_US/default.mo index 47cca24baaa29002ab50dd3c1a8cd6987f7831c3..60d9283b14629d3d621f2fa46e00785f608e985f 100644 GIT binary patch delta 19470 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\n" "Language: en_US\n" @@ -1599,6 +1599,9 @@ msgstr "Feedback approved" msgid "Action_Log_Feedback_deleted" msgstr "Feedback deleted" +msgid "Action_Log_Cronjob_changed" +msgstr "Cronjob: Changed" + msgid "Action_Log_Cronjob_database_backup_done" msgstr "Cronjob: Database backup done" diff --git a/src/Model/Table/ActionLogsTable.php b/src/Model/Table/ActionLogsTable.php index 6e8435e9f8..58a4d549a5 100644 --- a/src/Model/Table/ActionLogsTable.php +++ b/src/Model/Table/ActionLogsTable.php @@ -456,6 +456,9 @@ private function initTypes() ], ], + 'cronjob_changed' => [ + 'name' => __('Action_Log_Cronjob_changed'), + ], 'cronjob_backup_database' => [ 'name' => __('Action_Log_Cronjob_database_backup_done') ], From a214dcb66f20261b3615fd4db8b3944513fcbf61 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 14 Sep 2022 15:39:29 +0200 Subject: [PATCH 051/646] add cronjob name to action log --- plugins/Admin/src/Controller/CronjobsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Admin/src/Controller/CronjobsController.php b/plugins/Admin/src/Controller/CronjobsController.php index 5e92fbca39..c2dba74ff6 100644 --- a/plugins/Admin/src/Controller/CronjobsController.php +++ b/plugins/Admin/src/Controller/CronjobsController.php @@ -78,7 +78,7 @@ public function edit($cronjobId) } else { $cronjob = $this->Cronjob->save($cronjob); $this->ActionLog = $this->getTableLocator()->get('ActionLogs'); - $message = __d('admin', 'The_cronjob_{0}_has_been_changed.', ['' . $cronjob->id_cronjob . '']); + $message = __d('admin', 'The_cronjob_{0}_has_been_changed.', ['' . $cronjob->name . '']); $this->ActionLog->customSave('cronjob_changed', $this->AppAuth->getUserId(), $cronjob->id, 'cronjobs', $message); $this->Flash->success($message); From 4d327de84356a728aeb3e8894685943ee170ba9f Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 14 Sep 2022 16:00:34 +0200 Subject: [PATCH 052/646] corrected version --- .../Admin/templates/element/navTabs/configurationNavTabs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Admin/templates/element/navTabs/configurationNavTabs.php b/plugins/Admin/templates/element/navTabs/configurationNavTabs.php index bc9bc376e1..4d4d590f1b 100644 --- a/plugins/Admin/templates/element/navTabs/configurationNavTabs.php +++ b/plugins/Admin/templates/element/navTabs/configurationNavTabs.php @@ -6,7 +6,7 @@ * For full copyright and license information, please see LICENSE * Redistributions of files must retain the above copyright notice. * - * @since FoodCoopShop 1.0.0 + * @since FoodCoopShop 3.6.0 * @license https://opensource.org/licenses/AGPL-3.0 * @author Mario Rothauer * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com From e6a6778ba7f6d5defc407dce5d30708a1c60e773 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 15 Sep 2022 07:31:03 +0200 Subject: [PATCH 053/646] use original cronjob name --- src/Model/Table/CronjobsTable.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 5d6afe9f44..322a5e1b64 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -174,9 +174,9 @@ public function run() private function executeCronjobAndSaveLog($cronjob, $cronjobRunDayObject) { - $shellName = $cronjob->name . 'Shell'; + $shellName = $cronjob->getOriginalValues()['name'] . 'Shell'; if (!file_exists(ROOT . DS . 'src' . DS . 'Shell' . DS . $shellName . '.php')) { - throw new InvalidParameterException('shell not found: ' . $cronjob->name); + throw new InvalidParameterException('shell not found: ' . $shellName); } $shellClass = '\\App\\Shell\\' . $shellName; $shell = new $shellClass(); @@ -204,7 +204,7 @@ private function executeCronjobAndSaveLog($cronjob, $cronjobRunDayObject) $this->CronjobLogs->save($entity); return [ - 'name' => $cronjob->name, + 'name' => $cronjob->getOriginalValues()['name'], 'time_interval' => $cronjob->time_interval, 'created' => $entity->created->i18nFormat(Configure::read('DateFormat.DatabaseWithTime')), 'success' => $success, From f6e6b8cdbf13a843ec95fd05ae984468bc75839d Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 15 Sep 2022 07:38:46 +0200 Subject: [PATCH 054/646] typo --- tests/TestCase/src/Controller/PagesControllerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestCase/src/Controller/PagesControllerTest.php b/tests/TestCase/src/Controller/PagesControllerTest.php index 609dcbc7f8..06e9752981 100644 --- a/tests/TestCase/src/Controller/PagesControllerTest.php +++ b/tests/TestCase/src/Controller/PagesControllerTest.php @@ -112,7 +112,7 @@ public function testAllSuperadminUrls() $this->Slug->getConfigurationsList(), $this->Slug->getConfigurationEdit(544), $this->Slug->getCronjobsList(), - $this->Slug->getCronjobsEdit(1), + $this->Slug->getCronjobEdit(1), ]; $this->assertPagesForErrors($testUrls); From 107b578754b036ca296b6e28ae7acc4695de99cf Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 15 Sep 2022 08:25:48 +0200 Subject: [PATCH 055/646] preselect navigation fix --- plugins/Admin/templates/Cronjobs/edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Admin/templates/Cronjobs/edit.php b/plugins/Admin/templates/Cronjobs/edit.php index 5792fb7a3c..38e7cc932b 100644 --- a/plugins/Admin/templates/Cronjobs/edit.php +++ b/plugins/Admin/templates/Cronjobs/edit.php @@ -18,7 +18,7 @@ $this->element('addScript', [ 'script' => Configure::read('app.jsNamespace') . ".Admin.init();" . Configure::read('app.jsNamespace') . ".Admin.initForm();". - Configure::read('app.jsNamespace') . ".Admin.selectMainMenuAdmin('".__d('admin', 'Website_administration')."', '".__d('admin', 'Cronjobs')."'); + Configure::read('app.jsNamespace') . ".Admin.selectMainMenuAdmin('".__d('admin', 'Website_administration')."', '".__d('admin', 'Configurations')."'); " ]); ?> From da4a616acdeade3db3d5851784b35c6f6dfbe247 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 15 Sep 2022 08:27:49 +0200 Subject: [PATCH 056/646] validation daily no weekday and no day-of-month allowed --- resources/locales/de_DE/default.mo | Bin 74985 -> 75226 bytes resources/locales/de_DE/default.po | 10 ++++++-- resources/locales/default.pot | 8 ++++++- resources/locales/en_US/default.mo | Bin 70580 -> 70806 bytes resources/locales/en_US/default.po | 10 ++++++-- src/Model/Table/CronjobsTable.php | 37 +++++++++++++++++++++++++++++ 6 files changed, 60 insertions(+), 5 deletions(-) diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index 16dabc6ed35a3db5def3638b66d0771cb9b0af0e..31a245d8cd4e7a073c7689678172bff271ebd2be 100644 GIT binary patch delta 19157 zcma*scX$@X{`c`sNPrLskN^n@At9j?N~ocCkluR<0Rn^)2))Ttq$9=9MS2sZ7o|xP zk)re}C>;S&dK2aM{$z%8`QP*Gb;j3xXJ%(+XJ+?~p8H3=t{nGrfA#m8<8Vz$N!qj+>E*L2^Pj|^&Q6#YhVC2!$Q~{LopfE-)0QPpKW~Knz}(s zx$8udQNv2sc9@-bD2Cu?)(x1S_!w#;&oD0rHFTUjSQ#}?Jm$mE*0rd1r!Wd%VL0Y) zo_&Z=!OK0z*(pXZ9`4qwDpnIr?KONQJx2buqLW~N7O(gP%E$;)owqk|Ldp+ zNZZ61jky@#X{!v5#Bf}UdZK-(mAHfI=sl`kSW^>M#hk=(sELoZv%-qlC#@i5eVvr$X_jjjI`!-;)c znH7jaO}HVdJP|eF85oH>Te1Fn@@o`m$^Nz#p{>mgRZ-=gQ8#>IU5lFV3Dkt1U?8S% zW40`}wGwLYTibXv>P#)P?r_OuqTr167N#S9jvDwqrpH`u&4h|z2I5BOiyf>97)(3} z^*}RG{cgZ4xDN~BIn9iOwfDPG?T^{`462_S=#S4(6H49Lv=2vZLD9~vzh+*Vg0xr*HBcke z3_D;>9Eh4oGU`b-pgP`a{Q-68E~EPK>|*-yMGc%CHBJdEh}BUmp4i1T4L_kkPx6^{ z8R~{jsJ+^cy5Y2~zh`}kdQ$JMX2OA}_C-+rRYt8?L)3${L-mt@>fd$AXz6C4Zk&fY z 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\n" "Language-Team: LANGUAGE \n" @@ -1766,6 +1766,12 @@ msgstr "" msgid "The_weekday_is_not_valid." msgstr "" +msgid "No_day_of_month_allowed_if_time_interval_is_day." +msgstr "" + +msgid "No_weekday_allowed_if_time_interval_is_day." +msgstr "" + msgid "daily" msgstr "" diff --git a/resources/locales/en_US/default.mo b/resources/locales/en_US/default.mo index 60d9283b14629d3d621f2fa46e00785f608e985f..e4f334b9ae2c4815783e0991ccde32ebd45bcdc1 100644 GIT binary patch delta 19139 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 XVQ-(ay%Ifky#LP)+rB+}z54$Ezpsg@ delta 18923 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 w+P}KCZeG(MORVS8z^\n" "Language: en_US\n" @@ -1767,6 +1767,12 @@ msgstr "The day of month is not valid." msgid "The_weekday_is_not_valid." msgstr "The weekday is not valid." +msgid "No_day_of_month_allowed_if_time_interval_is_day." +msgstr "No day of month allowed if time interval is \"daily\"." + +msgid "No_weekday_allowed_if_time_interval_is_day." +msgstr "No weekday allowed if time interval is \"daily\"." + msgid "daily" msgstr "daily" diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 322a5e1b64..f0e156c314 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -43,6 +43,43 @@ public function validationDefault(Validator $validator): Validator $validator->inList('day_of_month', array_keys($this->getDaysOfMonth()), __('The_day_of_month_is_not_valid.')); $validator->allowEmptyString('weekday'); $validator->inList('weekday', array_keys($this->getWeekdays()), __('The_weekday_is_not_valid.')); + $validator->add('day_of_month', 'time-interal-day_no-day-of-month', [ + 'rule' => function ($value, $context) { + if ($context['data']['time_interval'] == 'day') { + if ($value == '') { + return true; + } else { + return false; + } + } + return true; + }, + 'message' => __('No_day_of_month_allowed_if_time_interval_is_day.'), + ]); + $validator->add('weekday', 'time-interal-day-no-weekday', [ + 'rule' => function ($value, $context) { + if ($context['data']['time_interval'] == 'day') { + if ($value == '') { + return true; + } else { + return false; + } + } + return true; + }, + 'message' => __('No_weekday_allowed_if_time_interval_is_day.'), + ]); + $validator->add('day_of_month', 'time-interal-day-of-month_day-of-month-mandatory', [ + 'rule' => function ($value, $context) { + if ($context['data']['time_interval'] == 'month') { + if ($value == '') { + return false; + } + } + return true; + }, + 'message' => __('Please_select_a_day_of_month.'), + ]); return $validator; } From bf9941a334b73d4c0e001eb56b127b46c502a126 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 15 Sep 2022 08:39:32 +0200 Subject: [PATCH 057/646] testEditDaily --- src/Model/Table/CronjobsTable.php | 8 +++++--- .../TestCase/src/Model/Table/CronjobsTableTest.php | 13 +++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index f0e156c314..82be890c59 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -43,7 +43,7 @@ public function validationDefault(Validator $validator): Validator $validator->inList('day_of_month', array_keys($this->getDaysOfMonth()), __('The_day_of_month_is_not_valid.')); $validator->allowEmptyString('weekday'); $validator->inList('weekday', array_keys($this->getWeekdays()), __('The_weekday_is_not_valid.')); - $validator->add('day_of_month', 'time-interal-day_no-day-of-month', [ + $validator->add('day_of_month', 'time-interval-day-no-day-of-month', [ 'rule' => function ($value, $context) { if ($context['data']['time_interval'] == 'day') { if ($value == '') { @@ -56,7 +56,7 @@ public function validationDefault(Validator $validator): Validator }, 'message' => __('No_day_of_month_allowed_if_time_interval_is_day.'), ]); - $validator->add('weekday', 'time-interal-day-no-weekday', [ + $validator->add('weekday', 'time-interval-day-no-weekday', [ 'rule' => function ($value, $context) { if ($context['data']['time_interval'] == 'day') { if ($value == '') { @@ -69,7 +69,8 @@ public function validationDefault(Validator $validator): Validator }, 'message' => __('No_weekday_allowed_if_time_interval_is_day.'), ]); - $validator->add('day_of_month', 'time-interal-day-of-month_day-of-month-mandatory', [ + /* + $validator->add('day_of_month', 'time-interval-day-of-month-day-of-month-mandatory', [ 'rule' => function ($value, $context) { if ($context['data']['time_interval'] == 'month') { if ($value == '') { @@ -80,6 +81,7 @@ public function validationDefault(Validator $validator): Validator }, 'message' => __('Please_select_a_day_of_month.'), ]); + */ return $validator; } diff --git a/tests/TestCase/src/Model/Table/CronjobsTableTest.php b/tests/TestCase/src/Model/Table/CronjobsTableTest.php index 71529c94a8..4560e561c6 100644 --- a/tests/TestCase/src/Model/Table/CronjobsTableTest.php +++ b/tests/TestCase/src/Model/Table/CronjobsTableTest.php @@ -27,6 +27,19 @@ public function setUp(): void $this->Cronjob = $this->getTableLocator()->get('Cronjobs'); } + public function testEditDaily() + { + $entity = $this->Cronjob->get(1); + $result = $this->Cronjob->patchEntity($entity, [ + 'time_interval' => 'day', + 'day_of_month' => 4, + 'weekday' => 'Sunday', + ]); + $errors = $result->getErrors(); + $this->assertEquals('Beim Interval "täglich" bitte keinen Tag (Monat) angeben.', $errors['day_of_month']['time-interval-day-no-day-of-month']); + $this->assertEquals('Beim Interval "täglich" bitte keinen Wochentag angeben.', $errors['weekday']['time-interval-day-no-weekday']); + } + public function testRunSunday() { $time = '2018-10-21 23:00:00'; From 466b7d6c71574d82d937d3bd45811045360713f4 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 15 Sep 2022 08:59:52 +0200 Subject: [PATCH 058/646] fix tests --- src/Model/Table/CronjobsTable.php | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 82be890c59..47329054c6 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -45,11 +45,13 @@ public function validationDefault(Validator $validator): Validator $validator->inList('weekday', array_keys($this->getWeekdays()), __('The_weekday_is_not_valid.')); $validator->add('day_of_month', 'time-interval-day-no-day-of-month', [ 'rule' => function ($value, $context) { - if ($context['data']['time_interval'] == 'day') { - if ($value == '') { - return true; - } else { - return false; + if (isset($context['data']['time_interval'])) { + if ($context['data']['time_interval'] == 'day') { + if ($value == '') { + return true; + } else { + return false; + } } } return true; @@ -58,11 +60,13 @@ public function validationDefault(Validator $validator): Validator ]); $validator->add('weekday', 'time-interval-day-no-weekday', [ 'rule' => function ($value, $context) { - if ($context['data']['time_interval'] == 'day') { - if ($value == '') { - return true; - } else { - return false; + if (isset($context['data']['time_interval'])) { + if ($context['data']['time_interval'] == 'day') { + if ($value == '') { + return true; + } else { + return false; + } } } return true; From b1cd02ed7c25f79ca8b9d6ed12988db532e52c6b Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 19 Sep 2022 16:44:16 +0200 Subject: [PATCH 059/646] weekday and day-of-month mandatory if corresponding interval selected --- src/Model/Table/CronjobsTable.php | 33 ++++++++++--------- .../src/Model/Table/CronjobsTableTest.php | 24 ++++++++++++++ 2 files changed, 42 insertions(+), 15 deletions(-) diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 47329054c6..6f48d0b8fb 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -39,9 +39,25 @@ public function initialize(array $config): void public function validationDefault(Validator $validator): Validator { $validator->inList('time_interval', array_keys($this->getTimeIntervals()), __('The_time_interval_is_not_valid.')); - $validator->allowEmptyString('day_of_month'); + $validator->allowEmptyString('day_of_month', __('Please_select_a_day_of_month.'), function($context) { + if (!isset($context['data']['time_interval'])) { + return true; + } + if ($context['data']['time_interval'] == 'day_of_month') { + return true; + } + return false; + }); $validator->inList('day_of_month', array_keys($this->getDaysOfMonth()), __('The_day_of_month_is_not_valid.')); - $validator->allowEmptyString('weekday'); + $validator->allowEmptyString('weekday', __('Please_select_a_weekday.'), function($context) { + if (!isset($context['data']['time_interval'])) { + return true; + } + if ($context['data']['time_interval'] == 'weekday') { + return true; + } + return false; + }); $validator->inList('weekday', array_keys($this->getWeekdays()), __('The_weekday_is_not_valid.')); $validator->add('day_of_month', 'time-interval-day-no-day-of-month', [ 'rule' => function ($value, $context) { @@ -73,19 +89,6 @@ public function validationDefault(Validator $validator): Validator }, 'message' => __('No_weekday_allowed_if_time_interval_is_day.'), ]); - /* - $validator->add('day_of_month', 'time-interval-day-of-month-day-of-month-mandatory', [ - 'rule' => function ($value, $context) { - if ($context['data']['time_interval'] == 'month') { - if ($value == '') { - return false; - } - } - return true; - }, - 'message' => __('Please_select_a_day_of_month.'), - ]); - */ return $validator; } diff --git a/tests/TestCase/src/Model/Table/CronjobsTableTest.php b/tests/TestCase/src/Model/Table/CronjobsTableTest.php index 4560e561c6..f63d65aaea 100644 --- a/tests/TestCase/src/Model/Table/CronjobsTableTest.php +++ b/tests/TestCase/src/Model/Table/CronjobsTableTest.php @@ -40,6 +40,30 @@ public function testEditDaily() $this->assertEquals('Beim Interval "täglich" bitte keinen Wochentag angeben.', $errors['weekday']['time-interval-day-no-weekday']); } + public function testEditWeekly() + { + $entity = $this->Cronjob->get(1); + $result = $this->Cronjob->patchEntity($entity, [ + 'time_interval' => 'week', + 'day_of_month' => '', + 'weekday' => '', + ]); + $errors = $result->getErrors(); + $this->assertEquals('Bitte wähle einen Wochentag aus.', $errors['weekday']['_empty']); + } + + public function testEditMonthly() + { + $entity = $this->Cronjob->get(1); + $result = $this->Cronjob->patchEntity($entity, [ + 'time_interval' => 'month', + 'day_of_month' => '', + 'weekday' => '', + ]); + $errors = $result->getErrors(); + $this->assertEquals('Bitte wähle einen Tag (Monat) aus.', $errors['day_of_month']['_empty']); + } + public function testRunSunday() { $time = '2018-10-21 23:00:00'; From 434dd1b51bb97a54b2888e9b4e935bd2876162d9 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 19 Sep 2022 16:44:24 +0200 Subject: [PATCH 060/646] add translations --- .../Admin/resources/locales/de_DE/admin.po | 8 ++++---- plugins/Admin/resources/locales/default.pot | 8 ++++---- .../Admin/resources/locales/en_US/admin.po | 8 ++++---- resources/locales/de_DE/default.mo | Bin 75226 -> 75383 bytes resources/locales/de_DE/default.po | 13 +++++++++++-- resources/locales/default.pot | 8 +++++++- resources/locales/en_US/default.mo | Bin 70806 -> 70948 bytes resources/locales/en_US/default.po | 14 ++++++++++++-- 8 files changed, 42 insertions(+), 17 deletions(-) diff --git a/plugins/Admin/resources/locales/de_DE/admin.po b/plugins/Admin/resources/locales/de_DE/admin.po index e405199a97..82b1bcaa01 100644 --- a/plugins/Admin/resources/locales/de_DE/admin.po +++ b/plugins/Admin/resources/locales/de_DE/admin.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-14 15:18+0200\n" +"POT-Creation-Date: 2022-09-19 16:36+0200\n" "PO-Revision-Date: 2022-09-14 15:19+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -954,6 +954,9 @@ msgstr "Standard-Bild für Blog-Artikel, Breite: " msgid "Website_administration" msgstr "Homepage-Verwaltung" +msgid "Configurations" +msgstr "Einstellungen" + msgid "Time_interval" msgstr "Intervall" @@ -972,9 +975,6 @@ msgstr "Uhrzeit" msgid "Cronjob_is_called_up_to_10_min_after_the_given_time." msgstr "Der tatsächliche Aufruf kann bis zu 10 min nach dieser Uhrzeit erfolgen." -msgid "Configurations" -msgstr "Einstellungen" - msgid "Last_run" msgstr "Zuletzt ausgeführt" diff --git a/plugins/Admin/resources/locales/default.pot b/plugins/Admin/resources/locales/default.pot index 3df05f1cc9..bf1c4bf1b2 100644 --- a/plugins/Admin/resources/locales/default.pot +++ b/plugins/Admin/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-09-14 15:18+0200\n" +"POT-Creation-Date: 2022-09-19 16:36+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -953,6 +953,9 @@ msgstr "" msgid "Website_administration" msgstr "" +msgid "Configurations" +msgstr "" + msgid "Time_interval" msgstr "" @@ -971,9 +974,6 @@ msgstr "" msgid "Cronjob_is_called_up_to_10_min_after_the_given_time." msgstr "" -msgid "Configurations" -msgstr "" - msgid "Last_run" msgstr "" diff --git a/plugins/Admin/resources/locales/en_US/admin.po b/plugins/Admin/resources/locales/en_US/admin.po index 09aae6c49d..1656dbfc19 100644 --- a/plugins/Admin/resources/locales/en_US/admin.po +++ b/plugins/Admin/resources/locales/en_US/admin.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-14 15:18+0200\n" +"POT-Creation-Date: 2022-09-19 16:36+0200\n" "PO-Revision-Date: 2022-09-14 15:20+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -954,6 +954,9 @@ msgstr "Default image for blog post, width:" msgid "Website_administration" msgstr "Website administration" +msgid "Configurations" +msgstr "Settings" + msgid "Time_interval" msgstr "Interval" @@ -972,9 +975,6 @@ msgstr "Time" msgid "Cronjob_is_called_up_to_10_min_after_the_given_time." msgstr "Cronjob is called up to 10 min after the given time." -msgid "Configurations" -msgstr "Settings" - msgid "Last_run" msgstr "Last run" diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index 31a245d8cd4e7a073c7689678172bff271ebd2be..62335e81be9337acd6596336b9db026fa520923d 100644 GIT binary patch delta 18527 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 BPc#4k delta 18430 zcmYk>2YePqzxMG>NCF`cNCG4zgoGs2gc2YST0#p*@4Xl4AV@E=6zNFuMw)a%5TzHT zNl`?45orRCND~mGH&Nf;l^M?Ke$M!v|IF;n?9A-m;W;mk`CK~c<6aH+`NZLxn!$1M zU?2Xo$H#GYC#%$PHr8>RRNRDd_y~()uDXsBh}AI!n_xV4$4K;``rCxzc*4eatbX;< z%Uvgyj2fm`+hA_uVHklQTi0VD;v=YuJi!7OR^M^*V=8K(cd;Ojv93Y2JB11O0;4gm zf#bwFuH&SU(G5K@24|xtv=udh)7JY||AvkeMR|SWTKER^leAqkmEDq8gjH3g#v5gqrvmTmBiU-FMcTs0n6l zV%o=HG2&|IMw5A;O!}UoX1K{VxP(QC{hK;Y2`r16NDtH&Ovb{v4%O~FYDIjTIZjT@ zi=kNBS{F5uuBdino3Z|y`9ccR;U4R6s1?ZA+|0NrYVYcz_INnzzB#BR|Jv4H#c1My z7G?z!P!q0?D({Dy@Jx)w9W7XYJ^2+1v}AwTipZAchAOD?&Zrwcw5~x-_!w$Jk1!Oo zv@%;3XH7xveM=jUL7l0E*6l8t>=c}_UdPPDPf-K^i&-#VYcru@n3cEz24FjDPYfp> zjC!D1sD9UD4%~}H@GR=g{ENBJ&D)0kB9nv~xB{kO4Gh8Qs0l1XJ>fbG!-MFDS1}N8 zq9*nfb%wm#nlllP`YyD>Ae><1dC0h~^Boxtd>A=z&ROLDoI>r)Qcge(v=sHkpQD~= zGwKNsVNSe&>gNGQ<15s}!`qvQ7ewuSDyqMp7^wHZKN-#3MRoiUCgKXz7Mw*Nd~W>< zHIUPR0}27C`$JGqm=Co=rBF*;7j<^Jpe8g4HSsx^)g`lvjGkZ%M&M!0hBr|iKEvFY zv7#v!Yp&%31Kn>IY zHN$q87YCsx;z2#hdQ`_-tUsU*-9=PC-d#*T0jPmh8BWkbqp>8;B>u+11qn^~atC?^ps(mq3f2pVytB-oHHmH7jqWX7TGFrNss2k^@ zPWc)eZ$%Ao5KH5E)EUY0t~t$xuq1I~)PNIE_s>BeTxQExp)c`P)QarH^a-3Lqtko? zHN!tqugTvwF4)cNbrNdkwNVr8h$V0UYUx*??mLQl-=Cq*NWSjoZ7PG>njWZe2AJ4& zT-#tW7Nue*>Ir{GEuBvf^IH&v#fZzI>bqegjzc~1R#eCPP-o)=Cg3$JfPp>vA;Top zlc!<>z5fl!)TCf3>d9`SAHGC&{4Z+B0(zMV<;Pg!lBo90Q3H0j@d(t!r&;HtFYzkW zmV9aBjhMvv&UP|dvOlmshV?cLyQ2o^gE|8rU=5s!`a+&VZ!Fcv+*bxQ&;-;6Xc}h3 zm8g~Z3iaeWF%plU8$jlFGWqc-s$qCvv$ut?192-{YM_oKGp7Dl0WKNH8G;uMU= z_Lzh&>i%t*1^3waNI%wJOLB$+e>{(hui5w(YH1&0Cd}}jS&1yDC&`Niu^6Ur1!}9h zqXrs_TDcjR6_=q7@p{yc+4t|U{`$~dra&`)f?C3m{^qU7jTwmJP!lMGIva_oCrZX_ zSQ#}?LsWmAF*^=NwV#Sw>De}3Y~z(K8O?YjYQ{%Uug!VX0Dquve2Q8bXMm~qMSc6j zQ4=hNnX#m;uY`fbjZyt}vgQ3y{ftMQ9d|OBJY=R}30#9gco8+Rd#Ek&eczn=FpMXz zhy}0*=EIq&721Sa>Ybah*71Rp9K~~Onya$>F!5Bq< zA?C&ksI94o!*DeA!55f{U59c2aV19MO)Q0eG*-XmQCrmu%i?U*mK{b{4epWA-b4&H zXQ4bQZh?BTA+~%P<|1B$MQ|^M;a$v$8Ag~hlN+@{rBDOcNA))t^_`i63Al3v>mN<# zHU)a(Oe4(%3Za%Z4b?#>48_T)j+S9G?!|KWD@I`WDD!12gF4hrF&qbAG)_m2vktYT z$49y5i5^p+C-VQmRFp=Y@>Zx7nt=6i8%#`h}`+tm#-p^~Oi9A6~!2d(@B+;nvK@w_7tD;tN=!wq(0o+C%TOz|1J%y~)Q9Pqjh#uXe-Z_mCz&OyjGA#x^u^|=j@zQ% zie6X+KS8xSkDBN$)E2(LNc5j_XOvKfw57tF2fg$cxvn16~0}jKI zxC-?o7cd__#}*hi&3yCwV=VDT)LA);)$s|o#^mYdTkk>Le-z{JKK8@lkNBpbJC=-Y z`~~&8Mb9uZt&H)+@1x#^C8!RzVR^iSym3y>ndZLv*pc`f)C1(6iP#g%;HMbL_|6$J`SBr^!d&xATpJblM-8+RwL;fW6AheimNF5w$M2w? zxEE%^nW(pCKDNWpQCsJ;z^r5{x@i=&A*0uAIr`&j)N8W|)xmz$YjYB_;Cb}H8yJRn zQ0=`J8iO%AaSV3GQkVhfVrE>3YQJhB>mNvF8wJt$J!&a$Vl4W8YGzy*HG!_E3HCwV zHw4w;1l0RH%hu0BwO@|f!Y@!~(gTi|)r#EXAs`WcOS(qkBbuTd+KYo+;lPQwZvIgnVH9+CYXRaY?V>xAnbkxr;%Re`3p5V@AFI zyU1wIze6p_pQuCi%EmsQo6{bMDi1+*l-F7UeTl20Ch`vI%(SxhwB^GwfbyxR6_|^D zjPI-@qtp7Obqi{5cVS-q8AI`@Ezh#roc;nBMtKryLiJHk-VycwcSTLCFKPt`qE>dI zE&mK%HT;51UEGX%f`8Euv#&87gRT6S4Fj}W#dM+z9s4b+Mu?0 zAZo>Du3`Q41iL8E(w;>fmj9u);x+12`+Q+Kj=)UBv6#O1sQSvN6=;E4xt^$j#-k>> z6xIJ`RJ%Q>`%iws`fIPQQ=kvZ6V%>#uQfBwj+%KzRL4zi+z-|9L{x_hQ2l&~>UbCG ztvQM6?*^*Hl02@*FAH*0ugWBU~ zSO$Z?G83$2ZG-7&0=1IvKr-69QK-Egk9v(Jp$1rtde1jw9n8GW{8~20BE+tZ*J2#; zPuKuoqMr1f^=1XTVRhosSQEcPUVGOG*kJxeQWUk9EwB*wLoN9{4D{m12x}1U+h_*L zxXFBo5>QLt5u?6san zJ^3Bf>zQMV`Ryo$8n876<9Jm4T-26qLw)GZpbqC#)$9GwzSUF|M?G;P8}~*{=p$5z zt1t+^vGEZsNPNY{zT3=`g`p;rfH|-kY688m08TX1#tXk3qaT~DGqyo(yh|7+8(07etnLbdCK>SqGx#06io|9XNA6lm|xqrL|( zuncDZ#_V-X)I|GWew>9GXgg}cKiTp}s3#2FVU{=rvk|vOeb{Xes7b=Ej>g{uk9gbeCC~5-u4v zXoMQLH>U3qYT)%4j>k~#Zrj*vw<*tqT9LAt3)`Uv7=&v7k##j{i}s_=#IL9=aG%*s zz#dbP5A|eaFbmeg;@BLuloPQi&PA=<_o$A}+4?_FEAa-kQhB~L6RLumKx@2&!;$`7 zr|Dj^6rE6Crg4}RC*yUTiyC0WK2tsmwX{o6E3+N_@U-;;>i++sCU751WAJ|S?}VBd zNjwD0F}^d0j0Qe|8SpH2!V9_)Af7vTJ%Fb={VF<&&ND!h_QGO{qYWFz$d7IUZ5uCebD@7_@lNk z40Q(LQD-9!HIcR$h&|9vf3L~NX{Z60qLyek>b1FKy=Tkc-~`IUe=tkE40Zo{)W8RD zI{u96r}H7R^kYyH-+%>h%OTcZPkM<09kRQqCkp@39HRWFCr(36qycJgJEGe4LoNMq zTRsgl5-&hK;d0b{8&U1{Mdz`nDx&@X24WL>|3{FE$WW9~|xn$JAb<~Vsqn6PBsA-tTS`1ZQ8MUWP zPy_b0jzg{FJX^mSwI%y80Dne*yoP$M@1f3``;v?X4m@U_C=#_~v6vZ4qXtg3HpUd< zcTrEY5)<(dR>xPU{!)&ct*VFWrwwXC-Ovw5AS>xQW65adOHc!^#{k@mW$>u2_da1> zpJ3G96~PFsh83^_mcvi66#k4Q(f_3Rm8^(-eVwkTGZJ-5Tf_brB%{5G$3j>db!yw$ zcqGOVuf%9PY~#DAz07u+eaC#Lt!$54+QFC|r=ecoMVJrwp(gMf2I~F4OQsdR!n)Yx zj9IE>sD@k78+W5#o4pu>w@@qf5`)p_Co^y;YT%-%Gm?T?u?hNOCu?_fwHJNKRK-E4 zQ~ou6hWF72XP-4sHW&2;TZbL+Aoj-mKbr~8#=gXJQ1^MCGhe`rsKeI)b$=_=0}MFF z`fCrzQ=l0xMJ@F@+u#gVA-;iwvA}t=Rf{ku@ha2`?ZW){9cqd1ptdmJf_YmCV+rDF zs0SW|dM!s@VExsBOMzxQ$yQ9a@hlsEf`Qa8K%JE}s0nXE4YU`R;T0Q?zG%K1i%_S3 zH)@Lx+4vG_1#Y@zLdd+pFbv?gQKvZ$wO1Wc6YGYWac}E;sEG_j4KNDT;UrXl3s4hV zhwAqzs=phU1@EF(!hJzThwC3y2VTFJ!xMs9;yBbHD{sqdpeED;OJZA$z?rBCeu-+o z0Yh;YYUO@Ht=Mn2{2_8CTqo0I(_t`HqCqH@$7YxtXJJ8Hi+YkXsDbZcGUmNvUfUL^ zy&r>GnH88mA=DOcu<_TZw`dn;*8Be(8STw|j6mnAS;9Q1r7eN=umY~aDX5hx{y(!~ zX{Zla3)BR=qn>ySs^6KY6_H819QDMPFdTnF-Tyag3;eE`2grfx|NDOtGVfDS4YlOku`!;)!WjFT z`PHk31BiR!JiLtKaL{%BWsEPd2iCn|wrm?}<*uN%D*mSVJD@A35qoa3{`tvVq(D#h zFDh<$%X~72U_Ro7s3+NtF?b%e)UPoCLvEYbtum@zM^w9!7>i4=C>}ud_YgHs@b9dD zJelO*%?({Kig*&Lqt&Q0aRB4+Dr(>icg$}=9@IdUFcmvu9$bczxCis%FE)OS>ObtR zxi8rzQ-FdtsMlp2R>Xy<4$fn7e1@$s|2?x(E>gQs z73zTwqPE(-M#h)SUl@R1_l;RmdzKqBV`J2lw?iGeAy^)#U?P5x8Sy!0#eYz5NtOqu zJOQO1opsfs3*?*r&*%EGyHOzwb zQD>tKR>kqCiTr>X@GNSgS1=48ptd06D>JdI)+khei7pxKVG3#wYoG?Kg?h54sP98J zTmBL1#`&lZ&nnc4{Aj(5(Zmli1%qCj4_8CfnHp^4PcWI--ASf6nJ2a&_Am1qwZ-z3 z&p>^M4x>)-Z5)99ZkQ4@NEWiiL!{BeSHu>hzX?w;3d4L&c{1w$ zj#vVxqaI)nYNBtj18(>8avCzelPjZF`Uj*t>VvWv_02wpsrV2pV2Mm#PFL)M(Rdmw z<73oTl=3&_AE2ImiH*-=IPpu=7KCIrD_0I(4bYd2o@^Z!!r!nq1_YQVXpU+(2^-=e zEQeuPywd+ZXpE7>qfjfd(3bB-9p*dejZbj~zQF1@F{_vBG$L~}tC#Z*M)E)O>hEJBs>nowxphpA&m!^Gg5Ybq%V&b=h36^w;Sd z3iM$(h*j|<>a7UQZnmTXrWe=z#C*{Xb1cKMK{uyqxCP1a%hHVkkbrFbv3Tj6;2LD`6tm!FKoo zw!&YqB_@TNm70M%8+%a?cnfu(e}uN)01N3Elr!g4~&=NI~wx~lk1vS9OsDT%u4%ceb zkIV+t%Irf8a1nLiBUJm>sD6DT&3*ppOB{rnU?{r!F^MIk8%v-DEQe}X4TG>2>hQEd zJ;7kq2W2{HC05(=?dV5*9DVRC>Pau6`oD~NfSag^-H+t`*A0&-(2QT=yO<%bY1k8W z;{eo*N1!G+5jDYCHlB+ba2aZVRn~Q={33*Jg*=*yZsFk~iI<&sg<^e)bDX)LH`UsZ8o2dJuV$9wbM7Gd%;>l=_5>ZQ% zj5;)Fs2RS4+M2G|0*9l1gid22jEOY^*0B!30+cUD{kHswl`%ZdtYjOkNjwG{>V5l> zOi>DQ=l4qg`@JUWl#fOY@Cj-n-{$vRN)GS&w&>qE*X6YKkMpY)u(uFol7Nqu= zD0`p0UN$fCKDNy^HRNhYT$HiKlP{CO@f<22>7JndBg+1;b7+Xkv}2>4leF`tehFqE z-cS0BSnotN+7ux_g0iaQ-(K}73nS@tRkr2f|EX8Id(;=BEYaI(?`)-m=@g_;kV54w z;+>>{F6xT+?5_~(_1JT>LTsyj z)a$BfaQK_RSw&ei{dXei3c=Ns>7AQHeLwOANcAXxjcxEUbq~qkrT!@%^mMAokCx|y zilJU5J)cyJ&o`OUT%;AW_!!UQKJNOJd}UIc=UT<6poQdg-6iQGGSm}PDYR#6Mp#S@ zKk!a}QXS%I)CQAub*F5By>kfpX4FTJ_EL9@_zdX*>AzQg+83bg8I~dqCtdK&t`y>l ztD4;{OQegx8Xf*N{=cgRz3Pggeh~TFJ0}h4hy3SI2R2EkRL@^Fb0uyy&>fwe-{6TtMHCz za7wJdk8Kg;S)NiVYf+-#NGqtH>A98?nixutNt7I?_inh5n(8E7^@(*wS(R_{(^!6HI+r&}O<3GJrA>W(2@uZK)Kd?6x=H8*i`Z+s7{x92? zzRmS%JCS&Z{#E=LnXxn+j#qIC4L&E0BVUAu{DJv@S6j+-=|ipS6!9M(|H|<>7m?Fv zysB-X+F71jmCNRfqL1rD)v4J*Utg$->!HCJ?O9$q#2rVg^3gBmm#;o`*^%=0J$G2*f+lT1CR{(J-3VdyO zMQlz_Z?AmB6S?~b3a;bZ>mhB*+k5Jh-#|qN>Q|DQlK+CTHl%j8jlIv$89{>^o-de6 zX>y-Z-kr3Vrk#m9ky>%f6yj!-mn7CzkW_-Q2;wuO?8N%5&qmv3llgin4DgP;7LcWrjl_w-EsN7QGI=0;{-N-eB zvOCzD@(1Mgw__&svhCF7g{NIwRN4f3%1F)L|J1Y~9!sph-&#?-4@3zl)b&W*z!o)Btu)Se`-D-*G@n@Mjd z&y0mB+eiKo=@hAo9dR)E#?-gxhQ_3xq;A9)DgTqSj-;y)<)yjj26iN#O#UkW#C0lB z@ZW0;6)!0B#>(8B7vElAlF3fpRLa)ka?)t>n`yW9Z6mBnc`X}fA>W_;VA28d{JT5- z`iXq{Uwuu;lt>TQ6)KC7AAo=2G~2i_gPb<^rT@1sbvMbir@R|&eka~ZdVA$0lbd)8 zX%C5JPH*I&MNT;BBKc#a-JUA7LTi0bF4>Nx9;OoOipC^vtwi0Y|EbqMh+2|v*|Ng6 z{Vvb)TA^MUJv(Z}x}CYtm-@%H%_w|Hs;Z8;YH?2jZPt^&MtNKErAVcTvk?Di`&3(x z%^xCPfHviAT$a49B+|E(T}_YD|C8dl|LH(Qzu34DP9sjhpGgBrs~J$&NIEP|+|;w6 zc9idCa_@Nd)DCsekvnFZI2UM}O1ubnQkF*AOPq)F_R3G@E7E<+hS*8g#xA5`q$iZO zdOIfh_w9{!$oo@%niN7=Uo6N!uA0;d@;^;o1=4L#-#Ve?I+B|~i%Im>hI|_7Q&L;X z-m|@J!S?j9p7OU>qb+;toGaiW=x7MQMP\n" "Language-Team: LANGUAGE \n" @@ -1760,9 +1760,15 @@ msgstr "" msgid "The_time_interval_is_not_valid." msgstr "" +msgid "Please_select_a_day_of_month." +msgstr "" + msgid "The_day_of_month_is_not_valid." msgstr "" +msgid "Please_select_a_weekday." +msgstr "" + msgid "The_weekday_is_not_valid." msgstr "" diff --git a/resources/locales/en_US/default.mo b/resources/locales/en_US/default.mo index e4f334b9ae2c4815783e0991ccde32ebd45bcdc1..7ea96f7e8e5e9f2a7c687955779c18737f8d4b15 100644 GIT binary patch delta 18515 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 dEj{|{a!SSSDh delta 18430 zcmYk>3w)2||Hturv$5I14ra5leP?r?!)$YA$S}toaxCX_$T4SkLQduMB~eZ}r{q|X zg^-ev*2hR}jb*V97DX?rz0DYlM{In>nzvbQ zzUw5BP{rETPFR?D6vp8^>qaa^d!wxI^_t@XM!@L9)6Aip@qU>2%=XH-XHQ7iB+s@@({`#+;5 z5YWa7Jweq=Xl3HM7*E^{HSkw#{z_E6eb!5;0p@FM z>L+7);%CtHkQhoLch68G+-xhH#d5@fZ5*c}RzVG>VQKsTRqqsPMf{(0oG6UP zXiT>@MGd4Us@}xsSbvRtF&Szw$NCFu1@g5uBQA&9yQZi;9*uf#K5EH7w&g#fhd8L6 zS%DPPfSaT82cZT$83 zu)C-;DP7kkx<89A?M9Gf&9-Y^@3T-DX5N?p=P`WHKQ%4 z86LzaJdJAS272&s)WBmqn}L@^?R_Syy?z*~_kS=6jod{w{064tyQnQVfqr=3`UusL z(}e>HL8#{=Q8P?Ltxy_jiJPL%P7l<8rlJNuA46Oct4U}ETQLs5!UA{+)!;oWjQP5n zLzjqZr~zt=TBGXs!E!hfRe!aOccUh79TV_2YG4uFm~;serAg=vJd5hEEox?cF%}1- zW;heo@gmeptwHVmr>OdeY8=yLBfg0fp z7>~nI1M#9}vJutrR_hn2Lw5$%j&BdsP7tc&!l-`IunazfTJb?WTvKr}8JfvF>k8BZ zn^1eT2lc?Ww*0d7K5C}^Jhicz-NoeV2qaIv{I_2wZ zybaaC0ZhkJs527W%bey?Sc$k5s>3O$=jWpzF1Pus(Vuu5YDIQp?f_1Z&}qJi8sVR) z*W@1?m+Wo!Is-NG#;AdI#fmrtwe;_zp8Fd0zTZQgk;FdcZK{mgn!c!hhM3rOTw7rp zmZM-NYKFg~md>xQ`7H>?^2Ak8<-IW#Uq#J$8>-sCTeIZYxFQyGJ&s9csGzIkmnu+;v6>4SP zN6maE7R5v829fxkL~*=}su(-a>}@IRLfiq>&<;$-y{Ikt4HM9Jkco?-;@arJ&X|EN z>iO*$j5#(wG>G-rk{l-^5Kp1v3pV}@wX`=e0Q0p9fQU9si=qE;kixY>dj)D|aTDrRE1-v1#aw1<;WBlDsfUWA&_8cfCyZT<<= zkI@CxTkseQV$2Bhd^yx1OG6DH8?~ZsFcN#C`Wu5K>ED?_LNnZgRq+?pNaJ2M57t0! zO*0&Y6L0`Nz)b8pk^_jV(1VvS4f9f2?N&!^Re!94b5UFN6}qZ$jfD0lZnQZI)lqRf z)XZMC`7^N)@j5JnyDXdgttM5BkE80{K%KR` zE(6f}9c+z34I~-$7PLT}_6`_^eX%@_Ms>Un)zIgt*X~PH{gbHI?-FVYucJEleZ~At z$6`FOTc3pXum|c_Z5(Q8mZO&b0O~FH1M}iN8$ZS(#Qqb_k{82L#C1>|_CvKh!Im#X zb-3N;pFrxl&UF$xJif1*3NffdRs|EVIeKsqYH4Sq2DSn9y*O^mFJVdIypzmxlQpx*z(B=mk>Kn>&$Y5;+g%}hL~??DD?N$a6jq%msATcaO#Lv`32 zwNfKdhi?LED;J^KS&8ar6Nb~j^92b%JdIki^Qfh|kHs)*ig}=?adHO!KoO4+fXye zLCx$SYUV$qR^lFNX?>@g=Mu0yaZ@adV=)!iqCQw>up&mfGt83IM|C&~E8%L?Oip7W z-p6(rGt+$Y2V)ZPCe&Fuf%WkYcEqZ$n{T}r_59bEjMs4xM!dl{1>K1x^xzMu*UdA_ zjI<7xB_4`;8_ zzqw{98ej?qBe5~ALY@9UF&!i3nN!;kHRB$rC4Uvm<1#FTM{N86HQ*9n>S7bDhaaK_ zbQ??R{VzJ-JeY;*a1d6+xu_NR9M!-L^kAz6CVv>#BwmJ^**VmfJx0APv2U8Ql#Uv3 zV@$<f=vQLoKW48~LFhZivhub}GtE;dGB z7;!P|j%k<&-^Bd57*&7uV%9&D#C9?~xF5BYmoN$a-!>yIjT%5t)Bp#do_iV9;1tyR zJja$VMAct`+QRjyv+_Nb!`rAc;CYAjSA{0;m>-pqsCX$B#zUx)UbN+Ru?TV860_G; zQ8R0cQP>eNp2=7OtVTEWf+d%sd5~lhF)S@D6ss&#*eiEHkfDYpg)L z9yP!-$hJCnP#wL#+~lvsO2j#+GjkK$W6>2%7GFlKr29FEW+V<{Rg8Vt{H(UdNaEgD z5XabfHtJBW#CCWJHSh{6O*<1%Gd+xP_z<-sg;trL=Tr?8_ z{zM(BzisTd#+>$0RDL9?p?GUW^e3)|8b~A5ndxBdXY)s65cxAuEAS@frGIA?37ysr z)~%?${S@QzdyK}rHa~c+IsGLthWrfFfSRLb-WB!!_e2eBAZi7Np;q=ao4*oWRa{S^ zDQ-c{;0fl%uyv-PXv|0KL3L0H)nE$xVkWA7JygAH8@IIO?NJlxgxca^s1={Rj`i0J zJ|#m-djfS>enM@ccnPY5O{nJ&U@<(7+T(jz86(~|1I)H| z!rU`~T1j^p3GLlD)ZR`)y+%_}9V|h;=UcD|=KsL_TDHY9#IB9s!(`&`um%2wnrWkr zW(9j=ec}n&5ceUkz3T*hX#Pf04z-u5PPX|AF_L&Is@;RuOQ@B}vz_%yE z9-&_6n2$`oR8+eStzA$P8i^X%^p9Bo;v|-kQ3&^8K|G7v!#^Vib-+ zeJ|!|Dd)s_4V!3&YM_gCFy<$oi0Sw`2IF3=h(}Nz zJwYvT$Sz}Hj3q9P>aY%~-Oi|qzJ$CW&U9pAu2VC|%&;};%hVs$;9z_U$DvMj)MsV@ zrBEx8fm-@zs1I0g>p;}NhGRK=)w&6FrhY`tJpXRR?0*pw>bMc=3)mccVk;bkAERbe zVvp&lE~;K5)Rr|x&9FOa$%mma+xQl0D}45w2~@xY;`IHjzed=G zj1o8ywH5PG9WF-A?0t;IZKxR@MRj~0^;%xV0DOX~A8^2|Xc(%U1k@Qy#qL<&majeF znmzr942?Vo)zCMnj!vSM?jk1PBh)|=zA!VXj%qm5+6ohid!gEyig|DjYUSpm`q_wO z@H3Z$mi!8;!zZ>v$U!rMqNoQ_P+L_KHK1m;yr*>-YNoH+^7*Lx8*KS5)QWwL>gP17 zU-vf>>fkZv!{9H?g9TBqVR0L$qB^LD)vyg}MzgRquER_`jylW{Uzv^)(T}(SDnA|b z;xi_8oyH_I(hjHw`=drU87tsC8-I@4>tm>aTtYqf04rj^A#;eUVL9UNsP}yi>bYIG z48O$y9P+ichW#HyLKzb<6{n&a*n!&1%c!LbJZ!%4g)o^o4Yl{}u@t_DK{y{Zf#tS* zqb=WyCCR^v`7z=fR-XQyq9j^lIjn~hQ8U|*TB`3+hv*z?g?`3he26-f`HqYD->0R~b`CWZ+CJi+iyJUPo1|b<}iF54H5Iu@UyduDB6>vA{9& zTm-7!?pPK3qR!R|)PUBbw&bH@tbaU-ugTETUB%LPA4Aadt=Zf1*oC+Ys-fMe1`eX0 zJBJDQyEWjriA$kYtP!STchvI>Q7gLaIP0&Bm1Jn98*ITQ8*j7m4ve5Y2LtgKhT~Z* zfPdgPe2if@`a9F{4AhKQVFYeQO>95v^*ip8(2v6JHp4k#zJ!HPBdleuYt6D|qs~S% z)CAg~2J$>=U;|JqJHh5JLDl~NwPM?B?Cv3Qt;9T=zYJ-|b+(bv0Cr#s?!t7uf|^PENi(pDs3mNS zN%#U*z=`O=&6teGQLpm@)PS5*W&(bwI2g4uVd$^-zXAy@T?T5VS*VVhq4v5fHo*Qk z3^$|d7e8%gmVugCeQQh9%sboiVW<^(6}1I#paw7>bN~DQRuY=&6;#8IP_IwW8Pjk$ zYDV!`9ZRAH+8uS6`lFV3l+B-tdVV&ly#=TNtVZ>-3AJUPqpJ!hN%Y0vumZL?YyQE} zMZH$LP!FEN4tN7cVWS_+e~8?RnZ)JK@m#tAj zGBQ+QFKTISVG#`b(ZuCYOWG8b-wg}l1T2FKFb4Nv6rRDt_$S6<;7{hvBx5{rBP@=6 zesayBdxH!eo}HM0KcPB$g8GwCk)O@CyDCN#cSSWc3O%?GtKlc8`nRzthF&o3q@eP% z(SyA(0bg@TB$8Nzn$ee-fj^ z{{-r={)&1_uAw^q3lsJJhg~vDSqXKxT4G7ufFAq~OW z=b9N%0o06=QO{MyAgqNNKsE+qN7Mj&qB`!2I{hQAvHnUdAVVYEj%w&z)PPQ+8u;CM z+vY#Eap)hW!5Gv;ilYu+4b%!{qrM9*Q4{HpYHt{3;P^jSe`Rd789AsWyMtPRhv<)i z*G!|jPIa6Tb07P?QkV#;v-DL8n?`A+y(0sPrz2V51V75+vfRRm`pqsU();kK8cQG z6uDy_9Emy;yRb2y!`fK#u6Y}JqZ$~G)$v`Ngy&Jub-U*{U2!5-!e6i-M%_0PbW!!T zVj;c%-;tDG$uj^~5H`Uex#CCrn4*zszB+g8B_;jau@ds3o6`rSLNwUq%hM z(BJ&#V-2i_$FL0jJCP5~2dFmc!QQA2XJbX&f@=6z?1mAKOozj<7V%uHiAPa03w~_& zIt2?8H$$DJKBxhY$5ea=-3$^(NNA7!{xOH67^V?tV{sgBl`F(wI2N;2Bu!z-z`hFza^0KJ<8CVu;VG-AXI z=V3Dn-oa{k6(cY?&?omtrV17$ZeruEsIxO1+u=HFj!u5lP7BmbmtY)zjarGzs4evk z^5HzWoOlwdn2uVB?x+VQqxNb!YH4#&hjK6KQ~R}zPowty7gW6~s8fI4#`iIj_#vuZ zXs}Q2UwER>kN%w)5;`PBQHP{Bs-u>u--1py?u|O_gKho@3@3iYIuG^stg^m`s=vv) z-RAGaAoBO18$#kR361P5Y9JS^S5R-oEz}I05Yu5n)Sj0>mDj--Y=Ig;U(`wrLJeT3 z%^!*CXFO_UCx`gBxeu%$Lrb<6JK`qPgF&I@fiP5gG-`kzR0pL{E0u!2SQ*tpHB`Mi zHg06gTcEbM73#Y%Je2o8fy5Ltw5O|4OTGnlSaMJuoJO7MUr-JIjT(?o0kbmsQRVTd zEy=L?4N;%oPN?>Wpe8l}HPA^e2{kms7I)={A3!&0mJ9zZUiUMq9oQ z_2D^&+T$Cj4_HvRIUDs*Th++KuG55sI%tV%up?@3yP@9yUZ}%23iY19j`~@?h^4S% zg!vG4K*f_W2|qx6557eW$P;O1TpQ~Xx5XyyPSRa0g8E6AsMf^VY)4(au&%MyrQ{7G6+bQorUNO=wsCNK2bL*PHeV2QO zedbTnq23p&CHcJMomef-XPkFQwP^P`Eu?Ta<>_A3JV~wRa5Ql;zDBHTF?AYhBwUlp zpGK^`zRrE0w5~PeFC(2qy}xaqOZo@Wo47AhXFhdCkv^;2*YT!Rk8-b(*0sVqoH}`U zZV7pFa!dHfEgV8#AIeg(KkCXPt*ZrbBKK+1;sIdQtZX^>2~)haJPSSe1H7c$9knlrKeo5}m!=D~a{Jdxkn?NRJ_}9_go7GxB1% zb-L=<{Mi4LtKK!r%afPt%dg=!8hD+I+GNzGa1QZK?qQ@Gli!DYy+izY%=vlBZSSQTNgei3uB)cO;lw+u$@9>DH*Q^#xR$&! zq~}vUh;#|=X5>G_PI!*8o20K&eisjTyVZ>IalGSeM*CFqE~r^HaT>XWxZkD5JUoSa zccT;wl_&E0s?*CrJsb7M;dzi*On)|eOZmmdfa=kFO3Xv{;B^>@3@xQA9t?DX9 z`Eb&gNl)hfU71|J+q#*gpCKJdy+*dJ+zR~PLE=f2T_D|)HrjH}B=0-o^W2Yo`NR7F zD(DYIy4F+pD{&zz4k0~`ya){E*7caXAn6nM6RyT9-VwEv0{v`_aPNxRX(8o^e&K$X z^4Z=CwWCv`X)%MGZ)m+YE~cbDx31>Ix)Q8PxAB(FOmN%tR0y}O+1vxEQ46DRKP^4I z#@IT^Wc2+{D|Jb~NZBOrH%Q;G50vKFk;MApKScVGZA%~j=G1+S_+|agW+jPz z;&dvk;eM5L87lIb{onOGdAeE}oMXg)cmwN{je3Vv33BV%8mchIn_Z_$VghaaN>rbc z9kjJxMO-%x&IIp@I+5Tm{-Q%ur>rA(0?XfTA z4{e>E#BI5UQtwUj-rz1s`Wy1%xm)M{cO@DsN#16Z}AWbLu9P9!!(Z zQe`%emBp_pt%|!a1bb1Q2g`Z=>m|4Yi2i#85vP&iZ}V$nTUvU0B@(~J(_fJBD?Yt$ zQm49ora9>kDdvsY&v*^F3sCnt@^#%Oe=dHEsrVA=I!Zae^v+1qU)wyAjh%^h zY_AjjML|m{-Qk{UD|MxOA7%Z?^Zow^$>ATixZkpQVcxmVB!yhH(LdB4=H2^DT(%~G{!-Gl%&5GPS>e@|5jU~*e$#_oFOzo#UnKtqY5i3&0DWvd)p_83 zAuAzk3N7WMWcPnc+7VAA)}O`OQGQL;xmJ;PfinF;a5+{-{^;ifdG}^T`X`YS<2{oV zS9B7ob=yXGSGb>E&yarCo7FHWW1xMy6Gg9(t3Mi7 z;XccK$+ouCN|y5*bryJ+G%V?kAXS8?J5qX-w5|YRCAV-tCSQN)Dox%V(g(SZao4py zjv(EN^3FWain||oZ{joL|H=IUx2{s;r}NB3>`FY1^pE@%mw$Cp@&8}1Q1E~}U#!E! z@%Z%GKq8E?8RWf(E4U|+-a@_io>sz!T6A+Vs5~$ zP*|Sy5d0Ho+RClyZ|eL`yp#Ls6-A;j@mB5}ZmKyiVlnE*a-Si6 zn0uGEZgzC`eo|F!PikQXu`Um0@MtZ{-u_Q{Im+5||7P<_+xnk+S7b-~UwSZAn6j+scz#cq;+L* ze@5Pqxl!)_)pp$fG@z^>Y}^uO5~twz+{3un(xI-gG+2SSjdxMw1ph6h8hLXXN4qCU z9X3^*)6~r*eg}7wm&LuCxCr;tt2l}Gxv!J=vK?e&?7=;X`wsaXp7u$4sC}>r=|J+o z<&Gq8AeQ7WSFM|b2YyRg4era{flZ>TbtN^68dGVl6X`7Ox4EAu?\n" "Language: en_US\n" @@ -1761,9 +1761,15 @@ msgstr "The amount of characters needs to be between {0} and {1}." msgid "The_time_interval_is_not_valid." msgstr "The time interval is not valid." +msgid "Please_select_a_day_of_month." +msgstr "Please select a day of month." + msgid "The_day_of_month_is_not_valid." msgstr "The day of month is not valid." +msgid "Please_select_a_weekday." +msgstr "Please select a weekday." + msgid "The_weekday_is_not_valid." msgstr "The weekday is not valid." @@ -2733,6 +2739,10 @@ msgstr "placed on" msgid "Prices_are_including_vat." msgstr "The prices include the VAT." +#, fuzzy +#~ msgid "The_day_of_month_is_required." +#~ msgstr "The day of month is not valid." + #~ msgid "No_stock_products_selected." #~ msgstr "No stock products were selected." From 0214ec16e14f2628509141625f707ed62d824661 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 19 Sep 2022 16:52:35 +0200 Subject: [PATCH 061/646] last day of month --- resources/locales/de_DE/default.mo | Bin 75383 -> 75431 bytes resources/locales/de_DE/default.po | 7 +++++-- resources/locales/default.pot | 5 ++++- resources/locales/en_US/default.mo | Bin 70948 -> 71000 bytes resources/locales/en_US/default.po | 7 +++++-- src/Model/Table/CronjobsTable.php | 3 ++- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index 62335e81be9337acd6596336b9db026fa520923d..ac21b168106297f927b7da7a1ae91c75f3c3ecd3 100644 GIT binary patch delta 19122 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 delta 19093 zcmZA72YgT0|Htv0NMc2hAtFc!iAcmIv1!!aHDZsVF>91kdac^EQZ;K+wP&rGwMwZ` zTGS{tO0C+X`hUH@=lDJP_}|C>^m#t#oO{l>=bU>J`Tf5>=JV`FANNwA&vb`tVmimk zjYIg)P9MklEm5V8bE1ypRK}B70JGP1oFZ5T1Mqze!hRTsV=xbHMD=$PbKyN3XRK$+ zqmgpgdB+yCwSIzO+%OZvaf9_Z79zflnn+N6$BD*7EQsw;1AT@uxWIZC)$RetV`u}% ziNs`#Vtl7F8Qm}r^W%Ed%zs8r;Gs23Llehh1m)E+Cw4}){}eUQ9MlTzL$$kt>fdQ( z9-xr55$0ojXRtCj7b9^O>WMC+R>HTj=_mr#uCk3gU|!;)U9mbH?Vh1lq+nCW3BgJj zitkx_pjK)Ws@=k-tiNWyodR`u(dymItUwHE#`REp*8{c3vrzYKLM{0(w*C!962~<+ zD^M3T;a;fnNvH|0#V9=2ob}g}|3iV6EWCxOsECoo9Z=;XZ21!FVbp~GLQN=pih0s_ z)RrY%+oJaVV;e6(ovH2Cvo4uz6#Q*X*V1t^5eK6NjzE8`iji0!vtVz`j6<#CFc!Z6R)EmzQF+W zZEYqNj5qK>bo!qv*S`5Z$ZX&ooi$?@Sn(ea~>oA=hSRtmU1a-pxvk^K8Sjv zQ>Z7ri6QtL)lWcMvr=KGiI+o7yasCT+oAd!hXH#3r;yQ-&PR2;8jIsT)D}EOAI#Ct z7>*h!64PTG>i&|bC#;HEp(dy$?twaNBT*Cj8a44vn8hV?fQ+8tG=}4!m=%57n+`)T zj5r2$=&GVR>Vn#$eyH|iP)j}o)&78uFQXnHO9%5d1fnKZ0^MjbwaDlUe29920jMV% zi@9(L>Iqk(2Hu8Rse`D!zkq6g+s1#R`tj=MIDr_1nou;VeHGLeH0a3sYv#=;$bel? z1NBDDa46=*FHjTNh=Cv{@|HQ*8o zG_wuXy{H>bp!Vtt>V}85KK=WqeGb%<7DP?BEUJBdTi*_~V!cq~e1hs{9IF5ME*UM| zTGWkOP^bK`jekZBa2-qGGt?Q0?`%$UO)Np&7xe&3QTJ~`AKYWh51=pc&!`nSkD7q{ zn2b)dPZu-8tfMVb}Ox0 z(UjQ zgnFVDm=)Wj2Ko@y-w4cxvrz3G9mE3olP!OY`eEetkva9bF_<_Jb$>k!!6v8)q@q@|KL+7w)OfQohVh*hWb}lm zFcG~6n3I@u1ZRy=1tiPTpaHx5rSX9M(s8c=&wL(j=9-hHc81<=nzgwW5I2H5YNYq3ZVmNL? ztgss1ajORN3BTPjcdS-?p+>nBrP;b;0O~MFVijjB#wS+fN z6Z0Nvz8|ru`U)6>ZBX}phFYL?Yp z61`9z4MTM_6?NF=*myIl!`-L}{fJtL-%%@cAJy+O)JkO=WBLgj!}{w>6=e&WV`<_J z=!Y{OS0Khd0(I7}w4jV*C9mc`qc z5A%O+UTZg*OfL#jF$I4`-B@Chd2I%wW;z4o@CVe}@B|B>|73m%!Q#l9==8t{ypQcM z>lE_@ce z&tU>S#X?vx&BXOl6CR44a1mD1`|tOKnNcl_p`t(P#<{2g51=M=3$+4a(@h7}F_QQj zRQVCCfKO2?Q1VN&Wld0TOCJou38)D##Nv$a>>*PI|3>X`>(J z=oM;(5@(u;cE%jUV^MoNAN9n0QHS;hX2JW|2LC}-HQo;v3A0 z8D^Ufa-!avX!OSf^uh9&6RV)wr&v=l8}T6Qh~rVOr{e_QgCn8TDkVQG2}}bKxQDRn!*!gBmy3oo5b1HPoJU zz(^d4^>K+Ue}pN-A@j`&^v0&dE3ha!3(N$IA=~QIMh$cgHSw2N0)rQtGgAXw5WD@! z)FE>WwUl9t%x^kTm`L0Q191fg;Z6+3lQzDAI;1bLIVLPN6CaKBh|i#&G-`=CV~tQN z(i3^xTxTqqEEKFm&2Sgy!-p7-K}*dN7ey^?UDSjcqL#Q5YT|=X6C8;;Y%^^Aa@2jh zZ2dl4eil8y|Nmtx-k=Ui;4*Uta-lkY7j>u_+PD?^5O=oa-7q`xN7gauOFRoTk@={% zVV!l4EkA*oT`GPjqZPP|e)tMC5$~^!nNWKehiyq=n%I8S3LZhv&;N_I;w7q~vs}L#@${%CXoi|tSImIDFg*@L4d9|W9EsleC93@_ zRJ#Q>UT*8xq8?zwa`s<)e1rnMb~jK@5crK*@;KCCDTCUIMyONW3e|C6%z%T@v-h@s z25JS?pjK`VYMk?^i9SVbX~q?-zZwRwFdamr_Np9eNo%9FCIvOYuBe%(p*mh^;{&LU zFQWQ;fa=G4rRg^i_0~kA`YVrWU&|$vhfHhKlMY6GQm5Mni%>UgMos8@TYk#M*KPb5 zH9-1R=KkE6pEwrvfvSsTFcmey1y*+h8PB0WE#(o^-knD6?RnH|b_q4WW7K<|akcqw zbihKytFbViwXxS4^TVewHlVx#>OtqDR&XaK>-|4NrUnJM)|&UeBgPVsLhbb$)Bp!i zOMVXnyqN4d^VhJ@^=6>9s1MOd)LGbq5qK2U{~c66B{$fgB^b!~&M-2%AZM+XPp+8U^zQ*jBb+d`{VGMC88@I+F;@+rk1; z0;mbpMD1BO)D2@%9W6z5d>nPiu3{wmZZU^A8r5G_)P3zy?S^6`EP~xny)hFO0-7w!v}?C*Fs8f=j4@eZMmki^4GCN;Ym`?T32uNtgpSq540HYX67z z4Qh+roIA~vltpbpU28{M{xRywK1Y9CfJJdNYAG*b5xk39x$s@4pCYLGcTg+Q1hrEA zP!pPodG-FUCv%>H6Q}`J?lvp274=~{hgtA4Uci#mQ2_$1FOvMDf|MSS?q2L%M;T_b#1^1aRU>tTJE{bz;Dry1=-*8xPYcC`^G)uhfz;((#F?O z@B2N}MA98Gf2fE;txyX3;sDgr4neg~!+2bd>h}!lfiGcxyy}wCjD3%qf>2Zk=QIehV$k=RWn<4>jW^Bo!I%jrpeFRC^&6~2{2l6vUSV;}d(8YDp&_cj>8Pz*g6d}jG9lO5Nyd+Ylc=Tq z6*coGsDXWtn;GZ8GQ{~&^(mInLrW-P*D|Aup!pP6{x*?hMH*R)8^OgAdDu?f!VPlX2u2>h^vla@H2n6!DRHoTc{_yi`oL8GvsGG4-)nmAE{9ghNqV^$0`o zHEM+de>Fb^b74N>DyS{&h}SIy~J_ zOZ*AykWIDaU!f+n220>Z496R&33~r#+WTQBaUg2t3L`7#I!U&o2I^3>Lv@&n6|onV z!&MlDH!%jiE}AEaMGagH6Y(R|Yr6)u_rIW4<^_5tbjfV7AEwj$A3#R0Q6OsRl2Ch- zjCzvhs3q)Y>&IX{;%T@Pub@_D^kuVRb1^IN8q^lsD5vtR`3OS{{HWK#e6yg zF`kOjr~x~owqO8iYsR8(oQ!&+IoJ@Fpvs@12JrgbOduGwwFOXzx;W;-B-H)yp{rBd zhK!z|J8H(mu`kX>EqRu!{Lir%gRwXmbK?^1gL`oXmb_;E27DCXBd-64<9vXNQCsGJ z-K<7(Vn2fq%2dbk>sE*#C&P3Rs=EGDPHE>Ie#D1vz zzQD@31+`MoFb@XbHotb4K*fz*G8&*a>c+_!jT=y}%Q>uo4^cNH+%dly)x{LzA*eHO z7As=RU*_y|#=OLXP)|J5#@}Hi@deaMy02}6ym!q+s-d2+BWmwIMPHnWnQ@+V1!@n! z#Y}h~wGuB;hcM`#d2OSyIB^F|k7<|%=OAa!b-u9`yHNui!W?)S-VTFy@v@H@W}LE5z7$wL!FHkScvhR+hnvCL66Onm&R7a z4Nxnx5_J}~ptj~G)Bty^nV*=YkHa9!lQ9FfKrML(^u|=oh&@m%JODjE|34?AQ<{bW zxDK=8Zd6A

    FsUwY2w96MBll81U2>g(^=(_16&f*7QUTJQf3S8tQBWe@kq<2lZg5p0WO# z=>=Qx95o@Y=lshRGowy-1MH41Q7do|HSjT8e+B)C?_dl*$7&e)!c3$SYQR3Ii4Mk` zIKd^O*J}xCrYo%9p*lQ{+QSQ|J-mjR&<#}khp6vGx|gQBFzUY2sJEjUYDGF*2Vo@f z=U55dHDn5qxr;hffv-$l0uzawqh7ZuHr|89iC(UD|vf4)36mL>ixe*W&#B<>AXDe@kZ24FJU-(`FJ^1Fc0d9 z+oIn4Sy&MdpjIfIub1Z!3nfu!-~-gkPQeJ=Y|GD}?*9jiF}@S)XP%%XYNoTW9X3ht z<@vU6#L~n*8N56nlyazVdMZ}N&#^on!}l>`Mla7E_rfZ~lTll7!j|XCq$lV1N^~R1 z^e2-Gr=ym39ct;$q6Wy6**sZoEJW;LZCsAU@DZwA0e>^$_c4ihGsfb5%!6TB%!-sn zmAB5~W&ZcS(G+-7Fcl}^7nqDu{GqoIetgIm(|PjWz1yFfqE;|Hh@SO2W8$&90583psu2dif@9o9y@PE9c*cEoDf1GVRCQQ!E>*ct<} zn+bHc_D4-*sC5`>LL*TVp5WTdm#8IQh+3*MSOOoR4oh^Pm*=f$jD?AZp(d~rb;vHD zPQMdmwj>yJMyjK>EEP48X_ytKV_tNZlF=#Ok70NPHSkN+Ygi=M4A2Vm6A!~KxER$g zQ;0dN6|p+;SJ)Ja+P$SIC^D|)z<|JNj-HZD6pGSSDZebhDmCMWX8`HEc26%#+$P3gdkIrKTD2f_533a%VQ9oqrqE@C2s{a9~`zE2< z&p=llFCwEGm!Sq+gPP$c)C%lD-FOW3L}yX$u3&b&fjT?SQ4bK9*L+W6Q7e&*DsO^% zeY>GnqEBAle?92{3N*kV)I>(0CN>^*!z9#I)MN4REy#Py%bJ$s4T^HHb|#y6-H*@b$2j@tM(h7dnP4Ui?$Oe_So z6?riNi=wuqfsH?K$!O`uqE781)Dx^j4Yb{sA409r8C!n|HP9{81RtR856NdH9%W5H zl_#P4t$|vpMmBcakkQP$qBU+xuqIrWR$oMpHhPSYMF4r03*yEvI}w`GT~2Wy^+>zd(K+=?~g`Nt=(! zpC|q1?WDa^F2ub{Ue`kF0NVI+-&d4P@zk*Q*pISQ>Plh{)K!(du13UBq+iMF3)Y{! zUdMFg{cM}fYRJ`?xCmp7B%hd$w|XBLw$S-L?e}s)?g?&vM0C$iry-W(7EX)v6D`wI zKM&Ip?d`MQ*+Qm%9VigcKm-%y;5sGl6VnviCZwo=xax{l=QqOKy`Tb6tq(o9m6 zDgNJor}F)E9&_W{D}{`HN!B&gcB1?~+opm7E`BRtThtm2~2=DA|dr&WbllIw>OWE?PHdg%=n_sMetBH-r(_2o` zBH}Ob7u-YrRr1wH(PAFqQS8fm^yhqEKbqqs)A|Me@I9F zy^?67i(iTz{weUktEO#NfcgRCZ&EXgbj!B5ZQE8ReusRBH@jWic4pf+KM;?k@^=cl z&`Ar@=aii$zDW9qd=Ki|+8b69|3RFScKyf?p*$FaNV;B=a*+QSf5)YGhxYAB?-wA@ zb%ZpXg5@M#`jP8rI|xc!UnwfjMq4w;Q_l}hYX2ZDBA%M|uu`ZS#stbza*UQA;B0D= zZR>`_y7F0-Z)WqI$iHuUU#<#!wWPnSBwdq9y=h+&Lvg=tueu?o4gZg;1l|5Kz&qr7 zQu!HaGWmOI%@xbdgNVb(A0hvb?My$k8q#(&@c{CRaU|^q;T0T5*)q~7^6|6_viDKs zwDs1{RIWy(%2b}B(Y>^=Dsdt6$VF3{jMwZf)6!C^gu5$=*4mO0w9rpmUGI|e(Z@CA zxoaD3zEK6&1A{Y+^3N!rMk-HP0%;WYlp{V)e!gwD01H#D>o|48aW(gHxz17wbUh)x zYa2~4l}=0ifcn?AO&8)8r2e$~lCsZ9ImrJ+StO~cy+0P8QrE-A>c2es?X=M~f&4D= z8T7#{K*PQyUEx&xNJV)Y`{19tiSogCk+?YNCi%6b!Bn+VJy)#ZfB!APJymJ@8|g5m zV{ko5zbN^U`cmK6<>tv07Qr7VEQjA=R_saxUo48cCef}oNmpxJLuyXyW$R51p9JEP z1nF&gC2VHzQ=2H_vGjY8e531R-d=yxsDizzKKZp&bfA72={@q_P}Yjn&bE1b-w^7r zQ?6@#+TLnG?nI(8l+K}~E9ooZ_lY}^T5~qMmegYlpDsuPtsOtcZpzc%BK+1LX zH#q*pm#FWYHZD2bonr48OKAWtHW2qB^(F1(Ze26U>o?a=F*iw9J6p%UusnYz`<8P4 z#qE^0^=h+)lw{jg`A_)*@;6L*T2%Gy?n2@^w%rZg$n`O0e`0saACONXp9#HeJGFU1 z{$ISRfa?e14y4b?SHdwoQ%3IDP5$kbLOh&UznP~{f5-fJl3%_lyhddnDi&cmj3;Fw zzZGYYQf)^CDa*ypZra`Iq3&lyD@eK?S!>a<8mR`Y>QdgHd@<~3dkCfc6>Tq*PElTu zl-b^Um^NwTBWP2H)PeN&%1(JY(i>81QcK=rr#Clbpiu*yWd|rge3S;6u_nH~d~7BW zJCL5~Uh2c~0&xT>8}XL3bMHpDEhrsJ$z?o8>1cZMB4s1iRTKk=-(H<;c?4}^C|`rc zaXsE4y}hcFUqbrpZGrWSy?+#btA9rIww<@4!3b_Bgk?$RNjGidc~**?TeO*xwz@`) zJCIyn?rur#N%Fcf5i7fa^oH_G7)RM2@`p$#NblGYKO*0l`u5!L9;rL23-LM1ACgv+ zbQPw&4ENl?_Qd1KU*ZoYPGt)IdySyt1!X>1g_|Ss?X{9jAaxTdTZM~B!^m%--HNx3 zuomUDY#c!TL-HSy_LJwYJ)Y|fdC#x?P05t-1Z)}>BlV%tL!4k6zsDda&3&H#)~D_| zx%QNIq0MdL??`X25HjJ!n@PJ#G;?}le%j_DT_As)^j%t`TA}Via*1{%^)QiGSAHzZ ztre-8^Pl=6)U_bpvSo3${Z5RdYyl|`X$L8db{RFiz4}r1|1Q@#K;io|^2Nut!4P~& zs%Bf)q4NaVtReoL^0wqllS&c$6CbgYQ1j_Fe~5e`+ElP{5_w&vNqZ=}tbipVA2!HQ{IkCzOTKp9{G%vpCswm$etL>zs@_= z$)0+ex{9PfDO*OGLCQy}YVYkx-6Znk=)Vp58l\n" "Language-Team: LANGUAGE \n" @@ -1787,6 +1787,9 @@ msgstr "" msgid "monthly" msgstr "" +msgid "Last_day_of_month" +msgstr "" + msgid "Please_enter_your_first_name." msgstr "" diff --git a/resources/locales/en_US/default.mo b/resources/locales/en_US/default.mo index 7ea96f7e8e5e9f2a7c687955779c18737f8d4b15..d305a6e931ac8888b88cb6c3aca5d3447380136e 100644 GIT binary patch delta 19121 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 Tdp1fHo|I&dsR%kASo8k?S8r^2 delta 19093 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\n" "Language: en_US\n" @@ -1788,6 +1788,9 @@ msgstr "weekly" msgid "monthly" msgstr "monthly" +msgid "Last_day_of_month" +msgstr "Last day of month" + msgid "Please_enter_your_first_name." msgstr "Please enter your first name." diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 6f48d0b8fb..05ce0bff80 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -104,11 +104,12 @@ public function getTimeIntervals() public function getDaysOfMonth() { $days = []; - $i = 0; + $i = 1; while($i<=31) { $days[$i] = $i; $i++; } + $days[0] = __('Last_day_of_month'); return $days; } From 5d8e3d5c6a7e861695b4e5fe2d9cc109bd2fbbfc Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 19 Sep 2022 16:59:10 +0200 Subject: [PATCH 062/646] fix --- src/Model/Table/CronjobsTable.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 05ce0bff80..9a9c14ae12 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -43,20 +43,20 @@ public function validationDefault(Validator $validator): Validator if (!isset($context['data']['time_interval'])) { return true; } - if ($context['data']['time_interval'] == 'day_of_month') { - return true; + if ($context['data']['time_interval'] == 'month') { + return false; } - return false; + return true; }); $validator->inList('day_of_month', array_keys($this->getDaysOfMonth()), __('The_day_of_month_is_not_valid.')); $validator->allowEmptyString('weekday', __('Please_select_a_weekday.'), function($context) { if (!isset($context['data']['time_interval'])) { return true; } - if ($context['data']['time_interval'] == 'weekday') { - return true; + if ($context['data']['time_interval'] == 'week') { + return false; } - return false; + return true; }); $validator->inList('weekday', array_keys($this->getWeekdays()), __('The_weekday_is_not_valid.')); $validator->add('day_of_month', 'time-interval-day-no-day-of-month', [ From 4682de733eea684b4f2da1c6a2d727fda9fb6bb5 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 19 Sep 2022 20:58:53 +0200 Subject: [PATCH 063/646] do not allow weekday and day-of-month --- resources/locales/de_DE/default.mo | Bin 75431 -> 75417 bytes resources/locales/de_DE/default.po | 16 ++++---- resources/locales/default.pot | 12 +++--- resources/locales/en_US/default.mo | Bin 71000 -> 70988 bytes resources/locales/en_US/default.po | 16 ++++---- src/Model/Table/CronjobsTable.php | 37 +++++++++++++----- .../src/Model/Table/CronjobsTableTest.php | 10 +++-- 7 files changed, 55 insertions(+), 36 deletions(-) diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index ac21b168106297f927b7da7a1ae91c75f3c3ecd3..28e00b0e7c7a08c277fa661ad684128d9eb58f5c 100644 GIT binary patch delta 11747 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≥Tx!h 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 N|5ZvpJ^5#={{hqhK#~9e diff --git a/resources/locales/de_DE/default.po b/resources/locales/de_DE/default.po index a2edec08c7..1e11565455 100644 --- a/resources/locales/de_DE/default.po +++ b/resources/locales/de_DE/default.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-19 16:46+0200\n" -"PO-Revision-Date: 2022-09-19 16:46+0200\n" +"POT-Creation-Date: 2022-09-19 20:53+0200\n" +"PO-Revision-Date: 2022-09-19 20:55+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -1773,21 +1773,21 @@ msgstr "Bitte wähle einen Wochentag aus." msgid "The_weekday_is_not_valid." msgstr "Der Wochentag ist nicht gültig." -msgid "No_day_of_month_allowed_if_time_interval_is_day." -msgstr "Beim Interval \"täglich\" bitte keinen Tag (Monat) angeben." - -msgid "No_weekday_allowed_if_time_interval_is_day." -msgstr "Beim Interval \"täglich\" bitte keinen Wochentag angeben." - msgid "daily" msgstr "täglich" msgid "weekly" msgstr "wöchentlich" +msgid "No_day_of_month_allowed_for_time_interval_{0}." +msgstr "Beim Interval \"{0}\" bitte keinen Tag (Monat) angeben." + msgid "monthly" msgstr "monatlich" +msgid "No_weekday_allowed_for_time_interval_{0}." +msgstr "Beim Interval \"{0}\" bitte keinen Wochentag angeben." + msgid "Last_day_of_month" msgstr "Monatsletzter" diff --git a/resources/locales/default.pot b/resources/locales/default.pot index 782c8fb2e6..551354bca7 100644 --- a/resources/locales/default.pot +++ b/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-09-19 16:46+0200\n" +"POT-Creation-Date: 2022-09-19 20:53+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -1772,19 +1772,19 @@ msgstr "" msgid "The_weekday_is_not_valid." msgstr "" -msgid "No_day_of_month_allowed_if_time_interval_is_day." +msgid "daily" msgstr "" -msgid "No_weekday_allowed_if_time_interval_is_day." +msgid "weekly" msgstr "" -msgid "daily" +msgid "No_day_of_month_allowed_for_time_interval_{0}." msgstr "" -msgid "weekly" +msgid "monthly" msgstr "" -msgid "monthly" +msgid "No_weekday_allowed_for_time_interval_{0}." msgstr "" msgid "Last_day_of_month" diff --git a/resources/locales/en_US/default.mo b/resources/locales/en_US/default.mo index d305a6e931ac8888b88cb6c3aca5d3447380136e..1aa0a19cf94e5a04e03c794c4c5064683f9c5179 100644 GIT binary patch delta 11762 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 KujZ-v|NIX}hFh-y delta 11775 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 diff --git a/resources/locales/en_US/default.po b/resources/locales/en_US/default.po index 6623ab9f43..8cc9e9a91f 100644 --- a/resources/locales/en_US/default.po +++ b/resources/locales/en_US/default.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-19 16:46+0200\n" -"PO-Revision-Date: 2022-09-19 16:46+0200\n" +"POT-Creation-Date: 2022-09-19 20:53+0200\n" +"PO-Revision-Date: 2022-09-19 20:54+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: en_US\n" @@ -1773,21 +1773,21 @@ msgstr "Please select a weekday." msgid "The_weekday_is_not_valid." msgstr "The weekday is not valid." -msgid "No_day_of_month_allowed_if_time_interval_is_day." -msgstr "No day of month allowed if time interval is \"daily\"." - -msgid "No_weekday_allowed_if_time_interval_is_day." -msgstr "No weekday allowed if time interval is \"daily\"." - msgid "daily" msgstr "daily" msgid "weekly" msgstr "weekly" +msgid "No_day_of_month_allowed_for_time_interval_{0}." +msgstr "No day of month allowed for time interval \"{0}\"." + msgid "monthly" msgstr "monthly" +msgid "No_weekday_allowed_for_time_interval_{0}." +msgstr "No weekday allowed for time interval \"{0}\"." + msgid "Last_day_of_month" msgstr "Last day of month" diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 9a9c14ae12..6be0379729 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -59,35 +59,52 @@ public function validationDefault(Validator $validator): Validator return true; }); $validator->inList('weekday', array_keys($this->getWeekdays()), __('The_weekday_is_not_valid.')); - $validator->add('day_of_month', 'time-interval-day-no-day-of-month', [ + $validator->add('day_of_month', 'time-interval-day-or-week-no-day-of-month', [ 'rule' => function ($value, $context) { if (isset($context['data']['time_interval'])) { - if ($context['data']['time_interval'] == 'day') { + if (in_array($context['data']['time_interval'], ['day', 'week'])) { if ($value == '') { return true; } else { - return false; + switch($context['data']['time_interval']) { + case 'day'; + $timeInterval = __('daily'); + break; + case 'week'; + $timeInterval = __('weekly'); + break; + } + return __('No_day_of_month_allowed_for_time_interval_{0}.', [ + $timeInterval, + ]); } } } - return true; - }, - 'message' => __('No_day_of_month_allowed_if_time_interval_is_day.'), + } ]); - $validator->add('weekday', 'time-interval-day-no-weekday', [ + $validator->add('weekday', 'time-interval-day-or-month-no-weekday', [ 'rule' => function ($value, $context) { if (isset($context['data']['time_interval'])) { - if ($context['data']['time_interval'] == 'day') { + if (in_array($context['data']['time_interval'], ['day', 'month'])) { if ($value == '') { return true; } else { - return false; + switch($context['data']['time_interval']) { + case 'day'; + $timeInterval = __('daily'); + break; + case 'month'; + $timeInterval = __('monthly'); + break; + } + return __('No_weekday_allowed_for_time_interval_{0}.', [ + $timeInterval, + ]); } } } return true; }, - 'message' => __('No_weekday_allowed_if_time_interval_is_day.'), ]); return $validator; } diff --git a/tests/TestCase/src/Model/Table/CronjobsTableTest.php b/tests/TestCase/src/Model/Table/CronjobsTableTest.php index f63d65aaea..b16432834f 100644 --- a/tests/TestCase/src/Model/Table/CronjobsTableTest.php +++ b/tests/TestCase/src/Model/Table/CronjobsTableTest.php @@ -36,8 +36,8 @@ public function testEditDaily() 'weekday' => 'Sunday', ]); $errors = $result->getErrors(); - $this->assertEquals('Beim Interval "täglich" bitte keinen Tag (Monat) angeben.', $errors['day_of_month']['time-interval-day-no-day-of-month']); - $this->assertEquals('Beim Interval "täglich" bitte keinen Wochentag angeben.', $errors['weekday']['time-interval-day-no-weekday']); + $this->assertEquals('Beim Interval "täglich" bitte keinen Tag (Monat) angeben.', $errors['day_of_month']['time-interval-day-or-week-no-day-of-month']); + $this->assertEquals('Beim Interval "täglich" bitte keinen Wochentag angeben.', $errors['weekday']['time-interval-day-or-month-no-weekday']); } public function testEditWeekly() @@ -45,11 +45,12 @@ public function testEditWeekly() $entity = $this->Cronjob->get(1); $result = $this->Cronjob->patchEntity($entity, [ 'time_interval' => 'week', - 'day_of_month' => '', + 'day_of_month' => '2', 'weekday' => '', ]); $errors = $result->getErrors(); $this->assertEquals('Bitte wähle einen Wochentag aus.', $errors['weekday']['_empty']); + $this->assertEquals('Beim Interval "wöchentlich" bitte keinen Tag (Monat) angeben.', $errors['day_of_month']['time-interval-day-or-week-no-day-of-month']); } public function testEditMonthly() @@ -58,10 +59,11 @@ public function testEditMonthly() $result = $this->Cronjob->patchEntity($entity, [ 'time_interval' => 'month', 'day_of_month' => '', - 'weekday' => '', + 'weekday' => 'Sunday', ]); $errors = $result->getErrors(); $this->assertEquals('Bitte wähle einen Tag (Monat) aus.', $errors['day_of_month']['_empty']); + $this->assertEquals('Beim Interval "monatlich" bitte keinen Wochentag angeben.', $errors['weekday']['time-interval-day-or-month-no-weekday']); } public function testRunSunday() From 7751a0ba1801b5d121ea77f4580edbc36af67644 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 19 Sep 2022 21:02:49 +0200 Subject: [PATCH 064/646] fix --- src/Model/Table/CronjobsTable.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 6be0379729..23266b46bf 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -80,7 +80,8 @@ public function validationDefault(Validator $validator): Validator } } } - } + return true; + }, ]); $validator->add('weekday', 'time-interval-day-or-month-no-weekday', [ 'rule' => function ($value, $context) { From 27c874dcf34ce22e5c816599da7f85317e87a940 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 19 Sep 2022 21:11:57 +0200 Subject: [PATCH 065/646] add tests for saving ok --- .../src/Model/Table/CronjobsTableTest.php | 38 +++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/tests/TestCase/src/Model/Table/CronjobsTableTest.php b/tests/TestCase/src/Model/Table/CronjobsTableTest.php index b16432834f..a4dc544d24 100644 --- a/tests/TestCase/src/Model/Table/CronjobsTableTest.php +++ b/tests/TestCase/src/Model/Table/CronjobsTableTest.php @@ -27,7 +27,7 @@ public function setUp(): void $this->Cronjob = $this->getTableLocator()->get('Cronjobs'); } - public function testEditDaily() + public function testEditDailyValidations() { $entity = $this->Cronjob->get(1); $result = $this->Cronjob->patchEntity($entity, [ @@ -40,7 +40,18 @@ public function testEditDaily() $this->assertEquals('Beim Interval "täglich" bitte keinen Wochentag angeben.', $errors['weekday']['time-interval-day-or-month-no-weekday']); } - public function testEditWeekly() + public function testEditDailyOk() + { + $entity = $this->Cronjob->get(1); + $result = $this->Cronjob->patchEntity($entity, [ + 'time_interval' => 'day', + 'day_of_month' => '', + 'weekday' => '', + ]); + $this->assertEquals(false, $result->hasErrors()); + } + + public function testEditWeeklyValidations() { $entity = $this->Cronjob->get(1); $result = $this->Cronjob->patchEntity($entity, [ @@ -53,7 +64,17 @@ public function testEditWeekly() $this->assertEquals('Beim Interval "wöchentlich" bitte keinen Tag (Monat) angeben.', $errors['day_of_month']['time-interval-day-or-week-no-day-of-month']); } - public function testEditMonthly() + public function testEditWeeklyOk() { + $entity = $this->Cronjob->get(1); + $result = $this->Cronjob->patchEntity($entity, [ + 'time_interval' => 'week', + 'day_of_month' => '', + 'weekday' => 'Sunday', + ]); + $this->assertEquals(false, $result->hasErrors()); + } + + public function testEditMonthlyValidations() { $entity = $this->Cronjob->get(1); $result = $this->Cronjob->patchEntity($entity, [ @@ -66,6 +87,17 @@ public function testEditMonthly() $this->assertEquals('Beim Interval "monatlich" bitte keinen Wochentag angeben.', $errors['weekday']['time-interval-day-or-month-no-weekday']); } + public function testEditMonthlyOk() + { + $entity = $this->Cronjob->get(1); + $result = $this->Cronjob->patchEntity($entity, [ + 'time_interval' => 'month', + 'day_of_month' => '2', + 'weekday' => '', + ]); + $this->assertEquals(false, $result->hasErrors()); + } + public function testRunSunday() { $time = '2018-10-21 23:00:00'; From 61e74b5dc0627cb9782789c9fbaffb3bb134eb54 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 19 Sep 2022 21:19:39 +0200 Subject: [PATCH 066/646] validate time --- resources/locales/de_DE/default.mo | Bin 75417 -> 75497 bytes resources/locales/de_DE/default.po | 7 +++++-- resources/locales/default.pot | 5 ++++- resources/locales/en_US/default.mo | Bin 70988 -> 71058 bytes resources/locales/en_US/default.po | 7 +++++-- src/Model/Table/CronjobsTable.php | 1 + .../src/Model/Table/CronjobsTableTest.php | 3 +++ 7 files changed, 18 insertions(+), 5 deletions(-) diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index 28e00b0e7c7a08c277fa661ad684128d9eb58f5c..55a5523a3421294331a900eb3e478855b9d30797 100644 GIT binary patch delta 18695 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 W^cp;}d+(v%95*Ajj<}gn_5T3Vp-DIZ delta 18630 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 diff --git a/resources/locales/de_DE/default.po b/resources/locales/de_DE/default.po index 1e11565455..93c096cadf 100644 --- a/resources/locales/de_DE/default.po +++ b/resources/locales/de_DE/default.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-19 20:53+0200\n" -"PO-Revision-Date: 2022-09-19 20:55+0200\n" +"POT-Creation-Date: 2022-09-19 21:16+0200\n" +"PO-Revision-Date: 2022-09-19 21:19+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -1788,6 +1788,9 @@ msgstr "monatlich" msgid "No_weekday_allowed_for_time_interval_{0}." msgstr "Beim Interval \"{0}\" bitte keinen Wochentag angeben." +msgid "Please_enter_a_valid_time." +msgstr "Bitte gib eine gültige Uhrzeit ein." + msgid "Last_day_of_month" msgstr "Monatsletzter" diff --git a/resources/locales/default.pot b/resources/locales/default.pot index 551354bca7..b2c618d1fa 100644 --- a/resources/locales/default.pot +++ b/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-09-19 20:53+0200\n" +"POT-Creation-Date: 2022-09-19 21:16+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -1787,6 +1787,9 @@ msgstr "" msgid "No_weekday_allowed_for_time_interval_{0}." msgstr "" +msgid "Please_enter_a_valid_time." +msgstr "" + msgid "Last_day_of_month" msgstr "" diff --git a/resources/locales/en_US/default.mo b/resources/locales/en_US/default.mo index 1aa0a19cf94e5a04e03c794c4c5064683f9c5179..528f977bd414763198ea43c7599814e508fb2940 100644 GIT binary patch delta 18686 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 E0WnipOaK4? diff --git a/resources/locales/en_US/default.po b/resources/locales/en_US/default.po index 8cc9e9a91f..71315ae76e 100644 --- a/resources/locales/en_US/default.po +++ b/resources/locales/en_US/default.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-19 20:53+0200\n" -"PO-Revision-Date: 2022-09-19 20:54+0200\n" +"POT-Creation-Date: 2022-09-19 21:16+0200\n" +"PO-Revision-Date: 2022-09-19 21:16+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: en_US\n" @@ -1788,6 +1788,9 @@ msgstr "monthly" msgid "No_weekday_allowed_for_time_interval_{0}." msgstr "No weekday allowed for time interval \"{0}\"." +msgid "Please_enter_a_valid_time." +msgstr "Please enter a valid time." + msgid "Last_day_of_month" msgstr "Last day of month" diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 23266b46bf..0bfdff7d77 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -107,6 +107,7 @@ public function validationDefault(Validator $validator): Validator return true; }, ]); + $validator->time('not_before_time', __('Please_enter_a_valid_time.')); return $validator; } diff --git a/tests/TestCase/src/Model/Table/CronjobsTableTest.php b/tests/TestCase/src/Model/Table/CronjobsTableTest.php index a4dc544d24..f2e1f52b9f 100644 --- a/tests/TestCase/src/Model/Table/CronjobsTableTest.php +++ b/tests/TestCase/src/Model/Table/CronjobsTableTest.php @@ -34,10 +34,12 @@ public function testEditDailyValidations() 'time_interval' => 'day', 'day_of_month' => 4, 'weekday' => 'Sunday', + 'not_before_time' => 'wrong-time', ]); $errors = $result->getErrors(); $this->assertEquals('Beim Interval "täglich" bitte keinen Tag (Monat) angeben.', $errors['day_of_month']['time-interval-day-or-week-no-day-of-month']); $this->assertEquals('Beim Interval "täglich" bitte keinen Wochentag angeben.', $errors['weekday']['time-interval-day-or-month-no-weekday']); + $this->assertEquals('Bitte gib eine gültige Uhrzeit ein.', $errors['not_before_time']['time']); } public function testEditDailyOk() @@ -47,6 +49,7 @@ public function testEditDailyOk() 'time_interval' => 'day', 'day_of_month' => '', 'weekday' => '', + 'not_before_time' => '18:00:00', ]); $this->assertEquals(false, $result->hasErrors()); } From cef5999be8469ff86de5998af5bdd46854bf53bd Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 19 Sep 2022 21:26:23 +0200 Subject: [PATCH 067/646] vendor updates --- composer.lock | 84 ++++++++++++++++++++++----------------- webroot/package-lock.json | 28 ++++++------- webroot/package.json | 4 +- 3 files changed, 63 insertions(+), 53 deletions(-) diff --git a/composer.lock b/composer.lock index 51b900ce2e..2521cc9bc5 100644 --- a/composer.lock +++ b/composer.lock @@ -476,20 +476,30 @@ }, { "name": "ezyang/htmlpurifier", - "version": "v4.14.0", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75" + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/12ab42bd6e742c70c0a52f7b82477fcd44e64b75", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8", + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8", "shasum": "" }, "require": { - "php": ">=5.2" + "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0" + }, + "require-dev": { + "cerdic/css-tidy": "^1.7 || ^2.0", + "simpletest/simpletest": "dev-master" + }, + "suggest": { + "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.", + "ext-bcmath": "Used for unit conversion and imagecrash protection", + "ext-iconv": "Converts text to and from non-UTF-8 encodings", + "ext-tidy": "Used for pretty-printing HTML" }, "type": "library", "autoload": { @@ -521,9 +531,9 @@ ], "support": { "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/v4.14.0" + "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0" }, - "time": "2021-12-25T01:21:49+00:00" + "time": "2022-09-18T07:06:19+00:00" }, { "name": "guzzlehttp/psr7", @@ -954,30 +964,30 @@ }, { "name": "laminas/laminas-httphandlerrunner", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-httphandlerrunner.git", - "reference": "4d337cde83e6b901a4443b0ab5c3b97cbaa46413" + "reference": "eb670c5c7167cd218c61a8b4f6ab9ce339200c16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/4d337cde83e6b901a4443b0ab5c3b97cbaa46413", - "reference": "4d337cde83e6b901a4443b0ab5c3b97cbaa46413", + "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/eb670c5c7167cd218c61a8b4f6ab9ce339200c16", + "reference": "eb670c5c7167cd218c61a8b4f6ab9ce339200c16", "shasum": "" }, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0", + "php": "^7.4 || ~8.0.0 || ~8.1.0", "psr/http-message": "^1.0", "psr/http-message-implementation": "^1.0", "psr/http-server-handler": "^1.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.3.0", - "laminas/laminas-diactoros": "^2.8.0", - "phpunit/phpunit": "^9.5.9", - "psalm/plugin-phpunit": "^0.16.1", - "vimeo/psalm": "^4.10.0" + "laminas/laminas-coding-standard": "~2.4.0", + "laminas/laminas-diactoros": "^2.13.0", + "phpunit/phpunit": "^9.5.21", + "psalm/plugin-phpunit": "^0.17.0", + "vimeo/psalm": "^4.24.0" }, "type": "library", "extra": { @@ -1017,7 +1027,7 @@ "type": "community_bridge" } ], - "time": "2021-09-22T09:27:36+00:00" + "time": "2022-09-17T16:24:51+00:00" }, { "name": "league/climate", @@ -3777,16 +3787,16 @@ }, { "name": "composer/composer", - "version": "2.4.1", + "version": "2.4.2", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "777d542e3af65f8e7a66a4d98ce7a697da339414" + "reference": "7d887621e69a0311eb50aed4a16f7044b2b385b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/777d542e3af65f8e7a66a4d98ce7a697da339414", - "reference": "777d542e3af65f8e7a66a4d98ce7a697da339414", + "url": "https://api.github.com/repos/composer/composer/zipball/7d887621e69a0311eb50aed4a16f7044b2b385b9", + "reference": "7d887621e69a0311eb50aed4a16f7044b2b385b9", "shasum": "" }, "require": { @@ -3816,7 +3826,7 @@ "phpstan/phpstan-deprecation-rules": "^1", "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1", - "phpstan/phpstan-symfony": "^1.1", + "phpstan/phpstan-symfony": "^1.2.10", "symfony/phpunit-bridge": "^6.0" }, "suggest": { @@ -3869,7 +3879,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.4.1" + "source": "https://github.com/composer/composer/tree/2.4.2" }, "funding": [ { @@ -3885,7 +3895,7 @@ "type": "tidelift" } ], - "time": "2022-08-20T09:44:50+00:00" + "time": "2022-09-14T14:11:15+00:00" }, { "name": "composer/metadata-minifier", @@ -5590,16 +5600,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.6", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382" + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", "shasum": "" }, "require": { @@ -5652,7 +5662,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" }, "funding": [ { @@ -5660,7 +5670,7 @@ "type": "github" } ], - "time": "2020-10-26T15:49:45+00:00" + "time": "2022-09-14T12:41:17+00:00" }, { "name": "sebastian/complexity", @@ -5850,16 +5860,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9" + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", "shasum": "" }, "require": { @@ -5915,7 +5925,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" }, "funding": [ { @@ -5923,7 +5933,7 @@ "type": "github" } ], - "time": "2021-11-11T14:18:36+00:00" + "time": "2022-09-14T06:03:37+00:00" }, { "name": "sebastian/global-state", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index e7cfdc89c3..a9b2b51ea5 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -9,7 +9,7 @@ "license": "AGPL-3.0", "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", - "@ericblade/quagga2": "^1.7.2", + "@ericblade/quagga2": "^1.7.3", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.1", @@ -30,7 +30,7 @@ "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", "svelte": "^3.50.1", - "swiper": "8.3.2", + "swiper": "8.4.2", "tooltipster": "^4.2.8", "uglify-js": "^3.17.0", "webrtc-adapter": "^8.1.2" @@ -53,9 +53,9 @@ } }, "node_modules/@ericblade/quagga2": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.2.tgz", - "integrity": "sha512-Uae90msCxpNRGlRVNQ4VpmuIUUyPntI4nlYR5qY3Gl3fFjIk+0UhK88C2icLEOk6rZ1yuJRl7iJ2RLXMXKwkuQ==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.3.tgz", + "integrity": "sha512-c6OEkGXj903K72SKbUviQuvC/i4IHo6TySXVq0w8ywDARrp+K+uaTgOv2QXTgnLS5lTvmpFCCiKTvEF9sBvhKA==", "dependencies": { "@babel/polyfill": "^7.12.1", "get-pixels": "^3.3.3", @@ -1006,9 +1006,9 @@ } }, "node_modules/swiper": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.3.2.tgz", - "integrity": "sha512-8wsC7ORYvVSnLUoxs2+xmfLrDPNjBVQXMCFbOlqtHeON6wtu/blOyySDr8TCBCdse1bdcIbn7m8xJNxVFL8o4Q==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.2.tgz", + "integrity": "sha512-nMD/RHVYxJxrLqjWQX2n0B94ANwpnuUv/3PUDT8Aaf+mSteFvZGFng4ypAYq70zW4svryyV+8TRlbRZ+6cgv9A==", "funding": [ { "type": "patreon", @@ -1156,9 +1156,9 @@ } }, "@ericblade/quagga2": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.2.tgz", - "integrity": "sha512-Uae90msCxpNRGlRVNQ4VpmuIUUyPntI4nlYR5qY3Gl3fFjIk+0UhK88C2icLEOk6rZ1yuJRl7iJ2RLXMXKwkuQ==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.3.tgz", + "integrity": "sha512-c6OEkGXj903K72SKbUviQuvC/i4IHo6TySXVq0w8ywDARrp+K+uaTgOv2QXTgnLS5lTvmpFCCiKTvEF9sBvhKA==", "requires": { "@babel/polyfill": "^7.12.1", "fsevents": "2.3.2", @@ -1890,9 +1890,9 @@ "integrity": "sha512-bS4odcsdj5D5jEg6riZuMg5NKelzPtmsCbD9RG+8umU03TeNkdWnP6pqbCm0s8UQNBkqk29w/Bdubn3C+HWSwA==" }, "swiper": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.3.2.tgz", - "integrity": "sha512-8wsC7ORYvVSnLUoxs2+xmfLrDPNjBVQXMCFbOlqtHeON6wtu/blOyySDr8TCBCdse1bdcIbn7m8xJNxVFL8o4Q==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.2.tgz", + "integrity": "sha512-nMD/RHVYxJxrLqjWQX2n0B94ANwpnuUv/3PUDT8Aaf+mSteFvZGFng4ypAYq70zW4svryyV+8TRlbRZ+6cgv9A==", "requires": { "dom7": "^4.0.4", "ssr-window": "^4.0.2" diff --git a/webroot/package.json b/webroot/package.json index 5e1fec8869..cc53db9669 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", - "@ericblade/quagga2": "^1.7.2", + "@ericblade/quagga2": "^1.7.3", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.1", @@ -36,7 +36,7 @@ "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", "svelte": "^3.50.1", - "swiper": "8.3.2", + "swiper": "8.4.2", "tooltipster": "^4.2.8", "uglify-js": "^3.17.0", "webrtc-adapter": "^8.1.2" From b40afc1456096532b84227cc71b2833f68b9a381 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 19 Sep 2022 21:28:50 +0200 Subject: [PATCH 068/646] week starts with monday --- src/Model/Table/CronjobsTable.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 0bfdff7d77..f99ffd0fc2 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -135,13 +135,13 @@ public function getDaysOfMonth() public function getWeekdays() { $weekdays = [ - 'Sunday' => __('Sunday'), 'Monday' => __('Monday'), 'Tuesday' => __('Tuesday'), 'Wednesday' => __('Wednesday'), 'Thursday' => __('Thursday'), 'Friday' => __('Friday'), - 'Saturday' => __('Saturday') + 'Saturday' => __('Saturday'), + 'Sunday' => __('Sunday'), ]; return $weekdays; From 9f46ff9110712a176a3e07af507ff3014afc80e8 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 19 Sep 2022 21:47:48 +0200 Subject: [PATCH 069/646] Revert "vendor updates" This reverts commit cef5999be8469ff86de5998af5bdd46854bf53bd. --- composer.lock | 84 +++++++++++++++++---------------------- webroot/package-lock.json | 28 ++++++------- webroot/package.json | 4 +- 3 files changed, 53 insertions(+), 63 deletions(-) diff --git a/composer.lock b/composer.lock index 2521cc9bc5..51b900ce2e 100644 --- a/composer.lock +++ b/composer.lock @@ -476,30 +476,20 @@ }, { "name": "ezyang/htmlpurifier", - "version": "v4.16.0", + "version": "v4.14.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8" + "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8", - "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/12ab42bd6e742c70c0a52f7b82477fcd44e64b75", + "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75", "shasum": "" }, "require": { - "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0" - }, - "require-dev": { - "cerdic/css-tidy": "^1.7 || ^2.0", - "simpletest/simpletest": "dev-master" - }, - "suggest": { - "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.", - "ext-bcmath": "Used for unit conversion and imagecrash protection", - "ext-iconv": "Converts text to and from non-UTF-8 encodings", - "ext-tidy": "Used for pretty-printing HTML" + "php": ">=5.2" }, "type": "library", "autoload": { @@ -531,9 +521,9 @@ ], "support": { "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0" + "source": "https://github.com/ezyang/htmlpurifier/tree/v4.14.0" }, - "time": "2022-09-18T07:06:19+00:00" + "time": "2021-12-25T01:21:49+00:00" }, { "name": "guzzlehttp/psr7", @@ -964,30 +954,30 @@ }, { "name": "laminas/laminas-httphandlerrunner", - "version": "2.2.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-httphandlerrunner.git", - "reference": "eb670c5c7167cd218c61a8b4f6ab9ce339200c16" + "reference": "4d337cde83e6b901a4443b0ab5c3b97cbaa46413" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/eb670c5c7167cd218c61a8b4f6ab9ce339200c16", - "reference": "eb670c5c7167cd218c61a8b4f6ab9ce339200c16", + "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/4d337cde83e6b901a4443b0ab5c3b97cbaa46413", + "reference": "4d337cde83e6b901a4443b0ab5c3b97cbaa46413", "shasum": "" }, "require": { - "php": "^7.4 || ~8.0.0 || ~8.1.0", + "php": "^7.3 || ~8.0.0 || ~8.1.0", "psr/http-message": "^1.0", "psr/http-message-implementation": "^1.0", "psr/http-server-handler": "^1.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-diactoros": "^2.13.0", - "phpunit/phpunit": "^9.5.21", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.24.0" + "laminas/laminas-coding-standard": "~2.3.0", + "laminas/laminas-diactoros": "^2.8.0", + "phpunit/phpunit": "^9.5.9", + "psalm/plugin-phpunit": "^0.16.1", + "vimeo/psalm": "^4.10.0" }, "type": "library", "extra": { @@ -1027,7 +1017,7 @@ "type": "community_bridge" } ], - "time": "2022-09-17T16:24:51+00:00" + "time": "2021-09-22T09:27:36+00:00" }, { "name": "league/climate", @@ -3787,16 +3777,16 @@ }, { "name": "composer/composer", - "version": "2.4.2", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "7d887621e69a0311eb50aed4a16f7044b2b385b9" + "reference": "777d542e3af65f8e7a66a4d98ce7a697da339414" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/7d887621e69a0311eb50aed4a16f7044b2b385b9", - "reference": "7d887621e69a0311eb50aed4a16f7044b2b385b9", + "url": "https://api.github.com/repos/composer/composer/zipball/777d542e3af65f8e7a66a4d98ce7a697da339414", + "reference": "777d542e3af65f8e7a66a4d98ce7a697da339414", "shasum": "" }, "require": { @@ -3826,7 +3816,7 @@ "phpstan/phpstan-deprecation-rules": "^1", "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1", - "phpstan/phpstan-symfony": "^1.2.10", + "phpstan/phpstan-symfony": "^1.1", "symfony/phpunit-bridge": "^6.0" }, "suggest": { @@ -3879,7 +3869,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.4.2" + "source": "https://github.com/composer/composer/tree/2.4.1" }, "funding": [ { @@ -3895,7 +3885,7 @@ "type": "tidelift" } ], - "time": "2022-09-14T14:11:15+00:00" + "time": "2022-08-20T09:44:50+00:00" }, { "name": "composer/metadata-minifier", @@ -5600,16 +5590,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.8", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "fa0f136dd2334583309d32b62544682ee972b51a" + "reference": "55f4261989e546dc112258c7a75935a81a7ce382" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", - "reference": "fa0f136dd2334583309d32b62544682ee972b51a", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", + "reference": "55f4261989e546dc112258c7a75935a81a7ce382", "shasum": "" }, "require": { @@ -5662,7 +5652,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" }, "funding": [ { @@ -5670,7 +5660,7 @@ "type": "github" } ], - "time": "2022-09-14T12:41:17+00:00" + "time": "2020-10-26T15:49:45+00:00" }, { "name": "sebastian/complexity", @@ -5860,16 +5850,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.5", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9", + "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9", "shasum": "" }, "require": { @@ -5925,7 +5915,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4" }, "funding": [ { @@ -5933,7 +5923,7 @@ "type": "github" } ], - "time": "2022-09-14T06:03:37+00:00" + "time": "2021-11-11T14:18:36+00:00" }, { "name": "sebastian/global-state", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index a9b2b51ea5..e7cfdc89c3 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -9,7 +9,7 @@ "license": "AGPL-3.0", "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", - "@ericblade/quagga2": "^1.7.3", + "@ericblade/quagga2": "^1.7.2", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.1", @@ -30,7 +30,7 @@ "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", "svelte": "^3.50.1", - "swiper": "8.4.2", + "swiper": "8.3.2", "tooltipster": "^4.2.8", "uglify-js": "^3.17.0", "webrtc-adapter": "^8.1.2" @@ -53,9 +53,9 @@ } }, "node_modules/@ericblade/quagga2": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.3.tgz", - "integrity": "sha512-c6OEkGXj903K72SKbUviQuvC/i4IHo6TySXVq0w8ywDARrp+K+uaTgOv2QXTgnLS5lTvmpFCCiKTvEF9sBvhKA==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.2.tgz", + "integrity": "sha512-Uae90msCxpNRGlRVNQ4VpmuIUUyPntI4nlYR5qY3Gl3fFjIk+0UhK88C2icLEOk6rZ1yuJRl7iJ2RLXMXKwkuQ==", "dependencies": { "@babel/polyfill": "^7.12.1", "get-pixels": "^3.3.3", @@ -1006,9 +1006,9 @@ } }, "node_modules/swiper": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.2.tgz", - "integrity": "sha512-nMD/RHVYxJxrLqjWQX2n0B94ANwpnuUv/3PUDT8Aaf+mSteFvZGFng4ypAYq70zW4svryyV+8TRlbRZ+6cgv9A==", + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.3.2.tgz", + "integrity": "sha512-8wsC7ORYvVSnLUoxs2+xmfLrDPNjBVQXMCFbOlqtHeON6wtu/blOyySDr8TCBCdse1bdcIbn7m8xJNxVFL8o4Q==", "funding": [ { "type": "patreon", @@ -1156,9 +1156,9 @@ } }, "@ericblade/quagga2": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.3.tgz", - "integrity": "sha512-c6OEkGXj903K72SKbUviQuvC/i4IHo6TySXVq0w8ywDARrp+K+uaTgOv2QXTgnLS5lTvmpFCCiKTvEF9sBvhKA==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.2.tgz", + "integrity": "sha512-Uae90msCxpNRGlRVNQ4VpmuIUUyPntI4nlYR5qY3Gl3fFjIk+0UhK88C2icLEOk6rZ1yuJRl7iJ2RLXMXKwkuQ==", "requires": { "@babel/polyfill": "^7.12.1", "fsevents": "2.3.2", @@ -1890,9 +1890,9 @@ "integrity": "sha512-bS4odcsdj5D5jEg6riZuMg5NKelzPtmsCbD9RG+8umU03TeNkdWnP6pqbCm0s8UQNBkqk29w/Bdubn3C+HWSwA==" }, "swiper": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.2.tgz", - "integrity": "sha512-nMD/RHVYxJxrLqjWQX2n0B94ANwpnuUv/3PUDT8Aaf+mSteFvZGFng4ypAYq70zW4svryyV+8TRlbRZ+6cgv9A==", + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.3.2.tgz", + "integrity": "sha512-8wsC7ORYvVSnLUoxs2+xmfLrDPNjBVQXMCFbOlqtHeON6wtu/blOyySDr8TCBCdse1bdcIbn7m8xJNxVFL8o4Q==", "requires": { "dom7": "^4.0.4", "ssr-window": "^4.0.2" diff --git a/webroot/package.json b/webroot/package.json index cc53db9669..5e1fec8869 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", - "@ericblade/quagga2": "^1.7.3", + "@ericblade/quagga2": "^1.7.2", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.1", @@ -36,7 +36,7 @@ "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", "svelte": "^3.50.1", - "swiper": "8.4.2", + "swiper": "8.3.2", "tooltipster": "^4.2.8", "uglify-js": "^3.17.0", "webrtc-adapter": "^8.1.2" From 26f243ce091b4651991cdeb78d82219aded57f76 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 19 Sep 2022 21:58:14 +0200 Subject: [PATCH 070/646] vendor updates (now without failures) --- composer.json | 2 +- composer.lock | 26 ++++++++++++++++++-------- webroot/package-lock.json | 28 ++++++++++++++-------------- webroot/package.json | 4 ++-- 4 files changed, 35 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index b02d357402..496a145706 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "intervention/image": "2.*", "cviebrock/discourse-php": "^0.9.3", "studio-42/elfinder": "^2.1", - "ezyang/htmlpurifier": "^4.11", + "ezyang/htmlpurifier": "^4.16", "league/csv": "^9.5", "dereuromark/cakephp-queue": "^6.0", "tecnickcom/tcpdf": "^6.4", diff --git a/composer.lock b/composer.lock index 51b900ce2e..fafa13dd5e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "17cb42bd846c8e8ca416c3cd2f8e5915", + "content-hash": "8f8bdf2c86575b07d24e7895efcaf672", "packages": [ { "name": "cakephp/cakephp", @@ -476,20 +476,30 @@ }, { "name": "ezyang/htmlpurifier", - "version": "v4.14.0", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75" + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/12ab42bd6e742c70c0a52f7b82477fcd44e64b75", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8", + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8", "shasum": "" }, "require": { - "php": ">=5.2" + "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0" + }, + "require-dev": { + "cerdic/css-tidy": "^1.7 || ^2.0", + "simpletest/simpletest": "dev-master" + }, + "suggest": { + "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.", + "ext-bcmath": "Used for unit conversion and imagecrash protection", + "ext-iconv": "Converts text to and from non-UTF-8 encodings", + "ext-tidy": "Used for pretty-printing HTML" }, "type": "library", "autoload": { @@ -521,9 +531,9 @@ ], "support": { "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/v4.14.0" + "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0" }, - "time": "2021-12-25T01:21:49+00:00" + "time": "2022-09-18T07:06:19+00:00" }, { "name": "guzzlehttp/psr7", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index e7cfdc89c3..a9b2b51ea5 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -9,7 +9,7 @@ "license": "AGPL-3.0", "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", - "@ericblade/quagga2": "^1.7.2", + "@ericblade/quagga2": "^1.7.3", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.1", @@ -30,7 +30,7 @@ "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", "svelte": "^3.50.1", - "swiper": "8.3.2", + "swiper": "8.4.2", "tooltipster": "^4.2.8", "uglify-js": "^3.17.0", "webrtc-adapter": "^8.1.2" @@ -53,9 +53,9 @@ } }, "node_modules/@ericblade/quagga2": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.2.tgz", - "integrity": "sha512-Uae90msCxpNRGlRVNQ4VpmuIUUyPntI4nlYR5qY3Gl3fFjIk+0UhK88C2icLEOk6rZ1yuJRl7iJ2RLXMXKwkuQ==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.3.tgz", + "integrity": "sha512-c6OEkGXj903K72SKbUviQuvC/i4IHo6TySXVq0w8ywDARrp+K+uaTgOv2QXTgnLS5lTvmpFCCiKTvEF9sBvhKA==", "dependencies": { "@babel/polyfill": "^7.12.1", "get-pixels": "^3.3.3", @@ -1006,9 +1006,9 @@ } }, "node_modules/swiper": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.3.2.tgz", - "integrity": "sha512-8wsC7ORYvVSnLUoxs2+xmfLrDPNjBVQXMCFbOlqtHeON6wtu/blOyySDr8TCBCdse1bdcIbn7m8xJNxVFL8o4Q==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.2.tgz", + "integrity": "sha512-nMD/RHVYxJxrLqjWQX2n0B94ANwpnuUv/3PUDT8Aaf+mSteFvZGFng4ypAYq70zW4svryyV+8TRlbRZ+6cgv9A==", "funding": [ { "type": "patreon", @@ -1156,9 +1156,9 @@ } }, "@ericblade/quagga2": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.2.tgz", - "integrity": "sha512-Uae90msCxpNRGlRVNQ4VpmuIUUyPntI4nlYR5qY3Gl3fFjIk+0UhK88C2icLEOk6rZ1yuJRl7iJ2RLXMXKwkuQ==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.3.tgz", + "integrity": "sha512-c6OEkGXj903K72SKbUviQuvC/i4IHo6TySXVq0w8ywDARrp+K+uaTgOv2QXTgnLS5lTvmpFCCiKTvEF9sBvhKA==", "requires": { "@babel/polyfill": "^7.12.1", "fsevents": "2.3.2", @@ -1890,9 +1890,9 @@ "integrity": "sha512-bS4odcsdj5D5jEg6riZuMg5NKelzPtmsCbD9RG+8umU03TeNkdWnP6pqbCm0s8UQNBkqk29w/Bdubn3C+HWSwA==" }, "swiper": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.3.2.tgz", - "integrity": "sha512-8wsC7ORYvVSnLUoxs2+xmfLrDPNjBVQXMCFbOlqtHeON6wtu/blOyySDr8TCBCdse1bdcIbn7m8xJNxVFL8o4Q==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.2.tgz", + "integrity": "sha512-nMD/RHVYxJxrLqjWQX2n0B94ANwpnuUv/3PUDT8Aaf+mSteFvZGFng4ypAYq70zW4svryyV+8TRlbRZ+6cgv9A==", "requires": { "dom7": "^4.0.4", "ssr-window": "^4.0.2" diff --git a/webroot/package.json b/webroot/package.json index 5e1fec8869..cc53db9669 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", - "@ericblade/quagga2": "^1.7.2", + "@ericblade/quagga2": "^1.7.3", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.1", @@ -36,7 +36,7 @@ "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", "svelte": "^3.50.1", - "swiper": "8.3.2", + "swiper": "8.4.2", "tooltipster": "^4.2.8", "uglify-js": "^3.17.0", "webrtc-adapter": "^8.1.2" From 5c02d90bf1eceb770d64a46440339002402dbd29 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 19 Sep 2022 22:05:17 +0200 Subject: [PATCH 071/646] update composer.lock --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index fafa13dd5e..8f23c156fa 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8f8bdf2c86575b07d24e7895efcaf672", + "content-hash": "0319c8fa46a664469640bfdf9bd5f376", "packages": [ { "name": "cakephp/cakephp", From 9ce228077eb94d93f6db040cff2f9d9e59d186db Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 20 Sep 2022 08:41:14 +0200 Subject: [PATCH 072/646] add custom validations for each cronjob --- .../src/Controller/CronjobsController.php | 13 ++- resources/locales/de_DE/default.mo | Bin 75497 -> 75599 bytes resources/locales/de_DE/default.po | 7 +- resources/locales/default.pot | 5 +- resources/locales/en_US/default.mo | Bin 71058 -> 71169 bytes resources/locales/en_US/default.po | 7 +- src/Model/Table/CronjobsTable.php | 43 +++++++++ .../src/Model/Table/CronjobsTableTest.php | 83 +++++++++++++++++- 8 files changed, 148 insertions(+), 10 deletions(-) diff --git a/plugins/Admin/src/Controller/CronjobsController.php b/plugins/Admin/src/Controller/CronjobsController.php index c2dba74ff6..b92f4a1623 100644 --- a/plugins/Admin/src/Controller/CronjobsController.php +++ b/plugins/Admin/src/Controller/CronjobsController.php @@ -71,7 +71,18 @@ public function edit($cronjobId) $this->setRequest($this->getRequest()->withParsedBody($this->Sanitize->trimRecursive($this->getRequest()->getData()))); $this->setRequest($this->getRequest()->withParsedBody($this->Sanitize->stripTagsAndPurifyRecursive($this->getRequest()->getData()))); - $cronjob = $this->Cronjob->patchEntity($cronjob, $this->getRequest()->getData()); + $validationName = $cronjob->getOriginalValues()['name']; + if (!method_exists($this->Cronjob, 'validation'.$validationName)) { + $validationName = 'default'; + } + + $cronjob = $this->Cronjob->patchEntity( + $cronjob, + $this->getRequest()->getData(), + [ + 'validate' => $validationName, + ], + ); if ($cronjob->hasErrors()) { $this->Flash->error(__d('admin', 'Errors_while_saving!')); $this->set('cronjob', $cronjob); diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index 55a5523a3421294331a900eb3e478855b9d30797..14cc541e55884a71ba19f3f9b10850b5d8d32932 100644 GIT binary patch delta 19694 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 F{tu(tXEy)< delta 19593 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 D{H#ly diff --git a/resources/locales/de_DE/default.po b/resources/locales/de_DE/default.po index 93c096cadf..a7821aa65f 100644 --- a/resources/locales/de_DE/default.po +++ b/resources/locales/de_DE/default.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-19 21:16+0200\n" -"PO-Revision-Date: 2022-09-19 21:19+0200\n" +"POT-Creation-Date: 2022-09-20 08:24+0200\n" +"PO-Revision-Date: 2022-09-20 08:28+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -1791,6 +1791,9 @@ msgstr "Beim Interval \"{0}\" bitte keinen Wochentag angeben." msgid "Please_enter_a_valid_time." msgstr "Bitte gib eine gültige Uhrzeit ein." +msgid "The_time_interval_needs_to_equal_\"{0}\"" +msgstr "Das Intervall muss \"{0}\" sein." + msgid "Last_day_of_month" msgstr "Monatsletzter" diff --git a/resources/locales/default.pot b/resources/locales/default.pot index b2c618d1fa..cd820f2a46 100644 --- a/resources/locales/default.pot +++ b/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-09-19 21:16+0200\n" +"POT-Creation-Date: 2022-09-20 08:24+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -1790,6 +1790,9 @@ msgstr "" msgid "Please_enter_a_valid_time." msgstr "" +msgid "The_time_interval_needs_to_equal_\"{0}\"" +msgstr "" + msgid "Last_day_of_month" msgstr "" diff --git a/resources/locales/en_US/default.mo b/resources/locales/en_US/default.mo index 528f977bd414763198ea43c7599814e508fb2940..1d56332296e10225bedfc0817c13bba3ea45d36f 100644 GIT binary patch delta 19699 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 delta 19592 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 diff --git a/resources/locales/en_US/default.po b/resources/locales/en_US/default.po index 71315ae76e..541544c09d 100644 --- a/resources/locales/en_US/default.po +++ b/resources/locales/en_US/default.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-19 21:16+0200\n" -"PO-Revision-Date: 2022-09-19 21:16+0200\n" +"POT-Creation-Date: 2022-09-20 08:24+0200\n" +"PO-Revision-Date: 2022-09-20 08:29+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: en_US\n" @@ -1791,6 +1791,9 @@ msgstr "No weekday allowed for time interval \"{0}\"." msgid "Please_enter_a_valid_time." msgstr "Please enter a valid time." +msgid "The_time_interval_needs_to_equal_\"{0}\"" +msgstr "The time interval needs to equal \"{0}\"." + msgid "Last_day_of_month" msgstr "Last day of month" diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index f99ffd0fc2..33d14596ef 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -111,6 +111,49 @@ public function validationDefault(Validator $validator): Validator return $validator; } + public function validationPickupReminder(Validator $validator): Validator + { + $validator = $this->validationDefault($validator); + $validator = $this->getAllowOnlyOneTimeIntervalValidator($validator, 'week', __('weekly')); + return $validator; + } + + public function validationEmailOrderReminder(Validator $validator): Validator + { + $validator = $this->validationDefault($validator); + $validator = $this->getAllowOnlyOneTimeIntervalValidator($validator, 'week', __('weekly')); + return $validator; + } + + public function validationSendDeliveryNotes(Validator $validator): Validator + { + $validator = $this->validationDefault($validator); + $validator = $this->getAllowOnlyOneTimeIntervalValidator($validator, 'month', __('monthly')); + return $validator; + } + + public function validationSendInvoicesToManufacturers(Validator $validator): Validator + { + $validator = $this->validationDefault($validator); + $validator = $this->getAllowOnlyOneTimeIntervalValidator($validator, 'month', __('monthly')); + return $validator; + } + + public function validationSendOrderLists(Validator $validator): Validator + { + $validator = $this->validationDefault($validator); + $validator = $this->getAllowOnlyOneTimeIntervalValidator($validator, 'day', __('daily')); + return $validator; + } + + private function getAllowOnlyOneTimeIntervalValidator($validator, $timeInterval, $timeIntervalString) + { + $validator = $validator->equals('time_interval', $timeInterval, __('The_time_interval_needs_to_equal_"{0}"', [ + $timeIntervalString, + ])); + return $validator; + } + public function getTimeIntervals() { return [ diff --git a/tests/TestCase/src/Model/Table/CronjobsTableTest.php b/tests/TestCase/src/Model/Table/CronjobsTableTest.php index f2e1f52b9f..99ceea7af0 100644 --- a/tests/TestCase/src/Model/Table/CronjobsTableTest.php +++ b/tests/TestCase/src/Model/Table/CronjobsTableTest.php @@ -77,17 +77,92 @@ public function testEditWeeklyOk() { $this->assertEquals(false, $result->hasErrors()); } - public function testEditMonthlyValidations() + public function testPickupReminderValidation() { $entity = $this->Cronjob->get(1); $result = $this->Cronjob->patchEntity($entity, [ + 'time_interval' => 'week', + 'day_of_month' => '2', + 'weekday' => '', + ]); + $errors = $result->getErrors(); + $this->assertEquals('Bitte wähle einen Wochentag aus.', $errors['weekday']['_empty']); + $this->assertEquals('Beim Interval "wöchentlich" bitte keinen Tag (Monat) angeben.', $errors['day_of_month']['time-interval-day-or-week-no-day-of-month']); + } + + public function testEditPickupReminderValidations() + { + $entity = $this->Cronjob->get(1); + $result = $this->Cronjob->patchEntity($entity, [ + 'name' => 'PickupReminder', 'time_interval' => 'month', 'day_of_month' => '', 'weekday' => 'Sunday', - ]); + ], + ['validate' => 'PickupReminder'], + ); + $errors = $result->getErrors(); + $this->assertEquals('Das Intervall muss "wöchentlich" sein.', $errors['time_interval']['equals']); + } + + public function testEditEmailOrderReminderValidations() + { + $entity = $this->Cronjob->get(1); + $result = $this->Cronjob->patchEntity($entity, [ + 'name' => 'PickupReminder', + 'time_interval' => 'month', + 'day_of_month' => '', + 'weekday' => 'Sunday', + ], + ['validate' => 'EmailOrderReminder'], + ); + $errors = $result->getErrors(); + $this->assertEquals('Das Intervall muss "wöchentlich" sein.', $errors['time_interval']['equals']); + } + + public function testEditSendDeliveryNotesValidations() + { + $entity = $this->Cronjob->get(1); + $result = $this->Cronjob->patchEntity($entity, [ + 'name' => 'SendDeliveryNotes', + 'time_interval' => 'week', + 'day_of_month' => '', + 'weekday' => 'Sunday', + ], + ['validate' => 'SendDeliveryNotes'], + ); + $errors = $result->getErrors(); + $this->assertEquals('Das Intervall muss "monatlich" sein.', $errors['time_interval']['equals']); + } + + public function testEditSendInvoicesToManufacturersValidations() + { + $entity = $this->Cronjob->get(1); + $result = $this->Cronjob->patchEntity($entity, [ + 'name' => 'SendInvoicesToManufacturers', + 'time_interval' => 'day', + 'day_of_month' => '', + 'weekday' => '', + ], + ['validate' => 'SendInvoicesToManufacturers'], + ); + $errors = $result->getErrors(); + $this->assertEquals('Das Intervall muss "monatlich" sein.', $errors['time_interval']['equals']); + } + + public function testEditSendOrderListsValidations() + { + $entity = $this->Cronjob->get(1); + $result = $this->Cronjob->patchEntity($entity, [ + 'name' => 'SendOrderLists', + 'time_interval' => 'week', + 'day_of_month' => '', + 'weekday' => '', + ], + ['validate' => 'SendOrderLists'], + ); $errors = $result->getErrors(); - $this->assertEquals('Bitte wähle einen Tag (Monat) aus.', $errors['day_of_month']['_empty']); - $this->assertEquals('Beim Interval "monatlich" bitte keinen Wochentag angeben.', $errors['weekday']['time-interval-day-or-month-no-weekday']); + $this->assertEquals('Das Intervall muss "täglich" sein.', $errors['time_interval']['equals']); } public function testEditMonthlyOk() From b81b9e1064f5cf94f883dab3dd422b67ba7fe16f Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 20 Sep 2022 09:06:18 +0200 Subject: [PATCH 073/646] link with action log --- plugins/Admin/templates/Cronjobs/index.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/plugins/Admin/templates/Cronjobs/index.php b/plugins/Admin/templates/Cronjobs/index.php index 6d73a4378c..c8e59f50f6 100644 --- a/plugins/Admin/templates/Cronjobs/index.php +++ b/plugins/Admin/templates/Cronjobs/index.php @@ -14,6 +14,7 @@ */ use Cake\Core\Configure; +use Cake\Utility\Inflector; $this->element('addScript', [ 'script' => Configure::read('app.jsNamespace') . ".Admin.init(); " . @@ -115,8 +116,17 @@ echo '

'; From 946c54c4070c68a681c84f5abe7d5964a6dbf742 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 20 Sep 2022 09:11:51 +0200 Subject: [PATCH 074/646] 860 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 125db7110f..b1e3e8892c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe * [mrothauer](https://github.com/mrothauer) ### Neue Funktionen / Verbesserungen +- Superadmins können Tag und Uhrzeit der Cronjobs (z.B. die automatische Bestell-Erinnerung, Rechnungsversand) jetzt selber im Admin-Bereich (Homepage-Verwaltung / Einstellungen / neuer Tab "Cronjobs") ändern. [I#860](https://github.com/foodcoopshop/foodcoopshop/issues/860) / [PR#74](https://github.com/foodcoopshop/foodcoopshop/pull/874) - Die Konfiguration "Freitag Bestellschluss / Samstag Bestelllisten-Versand / Donnerstag Abholtag" ist jetzt möglich. [I#866](https://github.com/foodcoopshop/foodcoopshop/issues/866) / [PR#867](https://github.com/foodcoopshop/foodcoopshop/pull/867) From a5dff3a8c087ad17cf0348ebf83b2bc0ae4a2f89 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 20 Sep 2022 09:27:53 +0200 Subject: [PATCH 075/646] better visibility of deactivated cronjobs --- plugins/Admin/templates/Cronjobs/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Admin/templates/Cronjobs/index.php b/plugins/Admin/templates/Cronjobs/index.php index c8e59f50f6..948c221c11 100644 --- a/plugins/Admin/templates/Cronjobs/index.php +++ b/plugins/Admin/templates/Cronjobs/index.php @@ -62,6 +62,7 @@ ]; if (! $cronjob->active) { $rowClass[] = 'deactivated'; + $rowClass[] = 'line-through'; } echo ''; @@ -110,7 +111,7 @@ if ($cronjob->active == 1) { echo ''; } else { - echo ''; + echo ''; } echo ''; From 387765c8eb5ff68c392151617ffaecee5687fe58 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 20 Sep 2022 09:33:47 +0200 Subject: [PATCH 076/646] show string "last of month" in list --- plugins/Admin/templates/Cronjobs/index.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/Admin/templates/Cronjobs/index.php b/plugins/Admin/templates/Cronjobs/index.php index 948c221c11..9d115f75c2 100644 --- a/plugins/Admin/templates/Cronjobs/index.php +++ b/plugins/Admin/templates/Cronjobs/index.php @@ -15,6 +15,7 @@ use Cake\Core\Configure; use Cake\Utility\Inflector; +use Cake\Datasource\FactoryLocator; $this->element('addScript', [ 'script' => Configure::read('app.jsNamespace') . ".Admin.init(); " . @@ -91,7 +92,10 @@ echo ''; echo ''; echo ''; echo ''; echo ''; -echo ''; if (Configure::read('app.htmlHelper')->paymentIsCashless()) { echo ''; } @@ -95,7 +94,6 @@ echo ''; $i = 0; -$sumOrderDetailsCount = 0; $sumEmailReminders = 0; $sumNewsletter = 0; $sumFeedback = 0; @@ -222,11 +220,6 @@ echo ''; - echo ''; - if ($this->Html->paymentIsCashless()) { $negativeClass = $customer->credit_balance < 0 ? 'negative' : ''; echo ''; echo ''; -echo ''; if ($this->Html->paymentIsCashless()) { echo ''; } From ed080e3676fa1262fd941e89811b238d4b21a55a Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 12 Oct 2022 09:30:24 +0200 Subject: [PATCH 170/646] add check credit reminder column --- .../Admin/resources/locales/de_DE/admin.po | 14 ++++++------ plugins/Admin/resources/locales/default.pot | 11 ++++------ .../Admin/resources/locales/en_US/admin.po | 14 ++++++------ plugins/Admin/templates/Customers/index.php | 22 +++++++++++++++---- 4 files changed, 36 insertions(+), 25 deletions(-) diff --git a/plugins/Admin/resources/locales/de_DE/admin.po b/plugins/Admin/resources/locales/de_DE/admin.po index 82b1bcaa01..2173727b0b 100644 --- a/plugins/Admin/resources/locales/de_DE/admin.po +++ b/plugins/Admin/resources/locales/de_DE/admin.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-19 16:36+0200\n" +"POT-Creation-Date: 2022-10-12 09:27+0200\n" "PO-Revision-Date: 2022-09-14 15:19+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -1122,12 +1122,6 @@ msgstr "Gruppe" msgid "Status" msgstr "Status" -msgid "Ordered_products" -msgstr "Bestellte Produkte" - -msgid "Reminder" -msgstr "Erinnerung" - msgid "Feedback" msgstr "Feedback" @@ -2016,6 +2010,9 @@ msgstr "Gib dem Hersteller Feedback zum Produkt" msgid "Click_to_change_name" msgstr "Zum Ändern des Namens anklicken" +msgid "Ordered_products" +msgstr "Bestellte Produkte" + msgid "Show_all_ordered_products_from_{0}" msgstr "Alle bestellten Produkte von {0} anzeigen" @@ -2406,6 +2403,9 @@ msgstr "Das tatsächlich gelieferte Gewicht wird evtl. noch angepasst, d. h. der msgid "Product_ID" msgstr "Produkt-Nr." +#~ msgid "Reminder" +#~ msgstr "Erinnerung" + #, fuzzy #~ msgid "Please_chose" #~ msgstr "Bitte auswählen..." diff --git a/plugins/Admin/resources/locales/default.pot b/plugins/Admin/resources/locales/default.pot index bf1c4bf1b2..b81303aa57 100644 --- a/plugins/Admin/resources/locales/default.pot +++ b/plugins/Admin/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-09-19 16:36+0200\n" +"POT-Creation-Date: 2022-10-12 09:27+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -1121,12 +1121,6 @@ msgstr "" msgid "Status" msgstr "" -msgid "Ordered_products" -msgstr "" - -msgid "Reminder" -msgstr "" - msgid "Feedback" msgstr "" @@ -2006,6 +2000,9 @@ msgstr "" msgid "Click_to_change_name" msgstr "" +msgid "Ordered_products" +msgstr "" + msgid "Show_all_ordered_products_from_{0}" msgstr "" diff --git a/plugins/Admin/resources/locales/en_US/admin.po b/plugins/Admin/resources/locales/en_US/admin.po index 1656dbfc19..4e8c978039 100644 --- a/plugins/Admin/resources/locales/en_US/admin.po +++ b/plugins/Admin/resources/locales/en_US/admin.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-19 16:36+0200\n" +"POT-Creation-Date: 2022-10-12 09:27+0200\n" "PO-Revision-Date: 2022-09-14 15:20+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -1122,12 +1122,6 @@ msgstr "Group" msgid "Status" msgstr "Status" -msgid "Ordered_products" -msgstr "Ordered products" - -msgid "Reminder" -msgstr "Reminder" - msgid "Feedback" msgstr "Feedback" @@ -2013,6 +2007,9 @@ msgstr "Give the manufacturer feedback for the product" msgid "Click_to_change_name" msgstr "Click to change name" +msgid "Ordered_products" +msgstr "Ordered products" + msgid "Show_all_ordered_products_from_{0}" msgstr "Show all ordered products from {0}" @@ -2403,6 +2400,9 @@ msgstr "The delivered weight will eventually be adapted, so the price can change msgid "Product_ID" msgstr "ProductID" +#~ msgid "Reminder" +#~ msgstr "Reminder" + #, fuzzy #~ msgid "Please_chose" #~ msgstr "Please select..." diff --git a/plugins/Admin/templates/Customers/index.php b/plugins/Admin/templates/Customers/index.php index b7337dfa7f..ec1316a687 100644 --- a/plugins/Admin/templates/Customers/index.php +++ b/plugins/Admin/templates/Customers/index.php @@ -74,7 +74,10 @@ echo ''; } if (Configure::read('app.emailOrderReminderEnabled')) { - echo ''; + echo ''; +} +if (Configure::read('app.htmlHelper')->paymentIsCashless()) { + echo ''; } if (Configure::read('appDb.FCS_NEWSLETTER_ENABLED')) { echo ''; @@ -94,7 +97,8 @@ echo ''; $i = 0; -$sumEmailReminders = 0; +$sumOrderReminders = 0; +$sumCreditReminders = 0; $sumNewsletter = 0; $sumFeedback = 0; $sumFeedbackNotApproved = 0; @@ -244,11 +248,20 @@ echo ''; } + if ($this->Html->paymentIsCashless()) { + echo ''; + } + if (Configure::read('app.emailOrderReminderEnabled')) { echo ''; } @@ -347,9 +360,10 @@ echo ''; if ($this->Html->paymentIsCashless()) { echo ''; + echo ''; } if (Configure::read('app.emailOrderReminderEnabled')) { - echo ''; + echo ''; } if (Configure::read('appDb.FCS_NEWSLETTER_ENABLED')) { echo ''; From 9d52c1a298e76dd203d8db15b858b27fc34426e2 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 12 Oct 2022 09:36:57 +0200 Subject: [PATCH 171/646] better ux --- webroot/css/table.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webroot/css/table.css b/webroot/css/table.css index 6983f1b420..72683aaa4a 100644 --- a/webroot/css/table.css +++ b/webroot/css/table.css @@ -82,7 +82,7 @@ table.list td.slim { line-height: 15px; } table.list th { - font-weight: 600; + font-weight: normal; position: sticky; position: -webkit-sticky; top: 44px; /* overriden in admin.initStickyTableHeader */ @@ -123,6 +123,7 @@ table.list a.btn { .sort a.desc:before { font-family: 'Font Awesome 6 Free'; padding-right: 5px; + font-weight: 600; } .sort a.asc:before { content: "\f0aa"; From 661897222273a88de15a9d780f13284d5c6a3fe5 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 12 Oct 2022 09:38:43 +0200 Subject: [PATCH 172/646] better mobile ux --- plugins/Admin/webroot/css/admin.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugins/Admin/webroot/css/admin.css b/plugins/Admin/webroot/css/admin.css index 4b4b63fb5c..719bb35a44 100644 --- a/plugins/Admin/webroot/css/admin.css +++ b/plugins/Admin/webroot/css/admin.css @@ -253,9 +253,6 @@ td.amount .fa-times { body.products.index .filter-container div.input.select { margin-right: 4px; } -body.products.index .bootstrap-select { - width: 172px ! important; -} body.products.index td.status { text-align: center; width: 49px; From 388815ff19b7123a1743658d5282263811683bd5 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 12 Oct 2022 09:51:00 +0200 Subject: [PATCH 173/646] never show future orders in last-order-dropdown --- src/Model/Table/OrderDetailsTable.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Table/OrderDetailsTable.php b/src/Model/Table/OrderDetailsTable.php index 6b39b07752..12e301c4d9 100644 --- a/src/Model/Table/OrderDetailsTable.php +++ b/src/Model/Table/OrderDetailsTable.php @@ -252,7 +252,7 @@ public function getLastOrderDetailsForDropdown($customerId) $foundOrders = 0; $result = []; - $i = 0; + $i = 1; while($foundOrders < $ordersToLoad) { $dateFrom = strtotime('- '.$i * 7 . 'day', strtotime(DeliveryRhythm::getOrderPeriodFirstDay(Configure::read('app.timeHelper')->getCurrentDay()))); From 67eded89834b0c0e27b97b3ed47ee788f42e2479 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 12 Oct 2022 12:09:59 +0200 Subject: [PATCH 174/646] add servername info --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a452ff95c6..d83ca64930 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop) * Gitpod: When all containers are up and running (takes about 1 minute), open your Bash-terminal (not in the Docker-terminal) and run * `bash ./devtools/init-dev-setup.sh` +* In your custom_config.php, change `app.cakeServerName` to your Gitpod-Domain (BE AWARE: NO TRAILING SLASH!). ## ✨ Features * user-friendly web shop optimized for selling food from different producers From 07d9e0872f474dea9a7e18dc68612aa94dc5f093 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 13 Oct 2022 08:58:31 +0200 Subject: [PATCH 175/646] corrected colspan --- plugins/Admin/templates/Customers/index.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/Admin/templates/Customers/index.php b/plugins/Admin/templates/Customers/index.php index ec1316a687..28299f8594 100644 --- a/plugins/Admin/templates/Customers/index.php +++ b/plugins/Admin/templates/Customers/index.php @@ -358,6 +358,7 @@ echo ''; echo ''; +$colspan = 3; if ($this->Html->paymentIsCashless()) { echo ''; echo ''; @@ -370,8 +371,9 @@ } if (Configure::read('appDb.FCS_USER_FEEDBACK_ENABLED') && $sumFeedback > 0) { echo ''; +} else { + $colspan++; } -$colspan = 3; if (Configure::read('appDb.FCS_MEMBER_FEE_PRODUCTS') != '') { $colspan++; } From e888cd340694d369b36ca5ba5937870e10760c74 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 13 Oct 2022 10:28:53 +0200 Subject: [PATCH 176/646] add paypal.me link in invoice mail to customer --- config/app_config.php | 3 +++ .../Admin/resources/locales/de_DE/admin.mo | Bin 70959 -> 70992 bytes .../Admin/resources/locales/de_DE/admin.po | 7 +++++-- plugins/Admin/resources/locales/default.pot | 5 ++++- .../Admin/resources/locales/en_US/admin.mo | Bin 66333 -> 66363 bytes .../Admin/resources/locales/en_US/admin.po | 7 +++++-- .../email/html/send_invoice_to_customer.php | 6 ++++++ src/Lib/HelloCash/HelloCash.php | 1 + src/Lib/Invoice/GenerateInvoiceToCustomer.php | 1 + src/Lib/Invoice/SendInvoiceToCustomer.php | 2 ++ src/View/Helper/MyHtmlHelper.php | 15 +++++++++++++++ .../SendInvoicesToCustomersShellTest.php | 2 ++ 12 files changed, 44 insertions(+), 5 deletions(-) diff --git a/config/app_config.php b/config/app_config.php index 35f943d410..2486e5aa3f 100644 --- a/config/app_config.php +++ b/config/app_config.php @@ -180,6 +180,9 @@ 'sendEmailWhenOrderDetailCustomerChanged' => true, + // if set, a paypal.me-link is added to the invoice-to-customer email + 'paypalMeUsername' => '', + 'helloCashRestEndpoint' => 'https://api.hellocash.business/api/v1', 'helloCashAtCredentials' => [ diff --git a/plugins/Admin/resources/locales/de_DE/admin.mo b/plugins/Admin/resources/locales/de_DE/admin.mo index 848a05fa5089aa9cfd44bb020e6d92562c44c4d3..37e955024bd50144f66fa9401871d499cddee7bb 100644 GIT binary patch delta 10214 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 F{{SH>p!@&; delta 10179 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 fWiKU^^!+N@*RSn}f?>n@j~F#\n" "Language: de_DE\n" @@ -2328,6 +2328,9 @@ msgstr "Deine Rechnung befindet sich im Anhang." msgid "{0}_thanks_you_for_your_purchase!" msgstr "{0} sagt Danke für Deinen Einkauf!" +msgid "Pay_invoice_with_paypal" +msgstr "Rechnung mit Paypal bezahlen" + msgid "this_invoice_contains_all_products_that_have_been_delivered_in_{0}." msgstr "in dieser Rechnung sind alle Produkte enthalten, die im {0} geliefert wurden." diff --git a/plugins/Admin/resources/locales/default.pot b/plugins/Admin/resources/locales/default.pot index b81303aa57..c17f005113 100644 --- a/plugins/Admin/resources/locales/default.pot +++ b/plugins/Admin/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-10-12 09:27+0200\n" +"POT-Creation-Date: 2022-10-13 10:23+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -2318,6 +2318,9 @@ msgstr "" msgid "{0}_thanks_you_for_your_purchase!" msgstr "" +msgid "Pay_invoice_with_paypal" +msgstr "" + msgid "this_invoice_contains_all_products_that_have_been_delivered_in_{0}." msgstr "" diff --git a/plugins/Admin/resources/locales/en_US/admin.mo b/plugins/Admin/resources/locales/en_US/admin.mo index c50b97a825e52f85db7363e54e0b45d861ef1208..b7ab7bbf774a653eeeb49efdcd198677554596a4 100644 GIT binary patch delta 10161 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

Q7^k6@us5o5L-r3fADXx6h^J#CYI9scJ@}jT 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 diff --git a/plugins/Admin/resources/locales/en_US/admin.po b/plugins/Admin/resources/locales/en_US/admin.po index 4e8c978039..d39a9341d0 100644 --- a/plugins/Admin/resources/locales/en_US/admin.po +++ b/plugins/Admin/resources/locales/en_US/admin.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-10-12 09:27+0200\n" -"PO-Revision-Date: 2022-09-14 15:20+0200\n" +"POT-Creation-Date: 2022-10-13 10:23+0200\n" +"PO-Revision-Date: 2022-10-13 10:23+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: en_US\n" @@ -2325,6 +2325,9 @@ msgstr "Please find your invoice attached." msgid "{0}_thanks_you_for_your_purchase!" msgstr "Thank you for your purchase!" +msgid "Pay_invoice_with_paypal" +msgstr "Pay invoice with paypal" + msgid "this_invoice_contains_all_products_that_have_been_delivered_in_{0}." msgstr "this invoice contains all products that have been delivered in {0}." diff --git a/plugins/Admin/templates/email/html/send_invoice_to_customer.php b/plugins/Admin/templates/email/html/send_invoice_to_customer.php index a2bf30acf4..234b42c99f 100644 --- a/plugins/Admin/templates/email/html/send_invoice_to_customer.php +++ b/plugins/Admin/templates/email/html/send_invoice_to_customer.php @@ -31,6 +31,12 @@

+ +

+ MyHtml->getCurrencyIsoCode(Configure::read('appDb.FCS_CURRENCY_SYMBOL')); ?> +

+ +

: Slug->getCustomerProfile(); ?>

diff --git a/src/Lib/HelloCash/HelloCash.php b/src/Lib/HelloCash/HelloCash.php index 276a79991e..0de7911a49 100644 --- a/src/Lib/HelloCash/HelloCash.php +++ b/src/Lib/HelloCash/HelloCash.php @@ -276,6 +276,7 @@ protected function sendInvoiceToCustomer($customer, $invoice, $isCancellationInv $sendInvoiceToCustomer->customerEmail = $customer->email; $sendInvoiceToCustomer->invoicePdfFile = ''; $sendInvoiceToCustomer->invoiceNumber = $invoice->invoice_number; + $sendInvoiceToCustomer->invoiceSumPriceIncl = $invoice->sumPriceIncl; $sendInvoiceToCustomer->invoiceDate = $invoice->created->i18nFormat(Configure::read('app.timeHelper')->getI18Format('DateLong2')); $sendInvoiceToCustomer->invoiceId = $invoice->id; $sendInvoiceToCustomer->originalInvoiceId = $invoice->original_invoice_id ?? null; diff --git a/src/Lib/Invoice/GenerateInvoiceToCustomer.php b/src/Lib/Invoice/GenerateInvoiceToCustomer.php index b775ab73da..e678f2e234 100644 --- a/src/Lib/Invoice/GenerateInvoiceToCustomer.php +++ b/src/Lib/Invoice/GenerateInvoiceToCustomer.php @@ -85,6 +85,7 @@ public function run($data, $currentDay, $paidInCash) $sendInvoiceToCustomer->customerEmail = $data->email; $sendInvoiceToCustomer->invoicePdfFile = $invoicePdfFile; $sendInvoiceToCustomer->invoiceNumber = $invoiceNumber; + $sendInvoiceToCustomer->invoiceSumPriceIncl = $data->sumPriceIncl; $sendInvoiceToCustomer->invoiceDate = $invoiceDate; $sendInvoiceToCustomer->invoiceId = $newInvoice->id; $sendInvoiceToCustomer->originalInvoiceId = null; diff --git a/src/Lib/Invoice/SendInvoiceToCustomer.php b/src/Lib/Invoice/SendInvoiceToCustomer.php index 3f3debdfb2..17956ca060 100644 --- a/src/Lib/Invoice/SendInvoiceToCustomer.php +++ b/src/Lib/Invoice/SendInvoiceToCustomer.php @@ -42,6 +42,7 @@ public function run() $invoiceNumber = $this->invoiceNumber; $invoiceDate = $this->invoiceDate; $invoiceId = $this->invoiceId; + $invoiceSumPriceIncl = $this->invoiceSumPriceIncl; $paidInCash = $this->paidInCash; $isCancellationInvoice = (bool) $this->isCancellationInvoice; $originalInvoiceId = $this->originalInvoiceId ?? $invoiceId; @@ -59,6 +60,7 @@ public function run() ->setSubject($subject) ->setViewVars([ 'paidInCash' => $paidInCash, + 'invoiceSumPriceIncl' => $invoiceSumPriceIncl, 'customerName' => $customerName, 'creditBalance' => $creditBalance, ]); diff --git a/src/View/Helper/MyHtmlHelper.php b/src/View/Helper/MyHtmlHelper.php index 020bb912af..9064961aef 100644 --- a/src/View/Helper/MyHtmlHelper.php +++ b/src/View/Helper/MyHtmlHelper.php @@ -234,6 +234,21 @@ public function getCurrencyName($currencySymbol) } } + public function getCurrencyIsoCode($currencySymbol) + { + switch($currencySymbol) { + case '€': + return 'EUR'; + break; + case '$': + return 'USD'; + break; + default: + return ''; + break; + } + } + public function getFontAwesomeIconForCurrencyName($currencySymbol) { $currencyIcon = 'fas fa-fw ok fa-'.strtolower(Configure::read('app.currencyName')).'-sign'; diff --git a/tests/TestCase/src/Shell/SendInvoicesToCustomersShellTest.php b/tests/TestCase/src/Shell/SendInvoicesToCustomersShellTest.php index 2398a8bee0..1bef665db5 100644 --- a/tests/TestCase/src/Shell/SendInvoicesToCustomersShellTest.php +++ b/tests/TestCase/src/Shell/SendInvoicesToCustomersShellTest.php @@ -98,6 +98,7 @@ public function testSendInvoicesWithExcludedFutureOrder() $this->changeConfiguration('FCS_SEND_INVOICES_TO_CUSTOMERS', 1); $this->loginAsSuperadmin(); + Configure::write('app.paypalMeUsername', 'username'); $customerId = Configure::read('test.superadminId'); $this->prepareOrdersAndPaymentsForInvoice($customerId); @@ -153,6 +154,7 @@ public function testSendInvoicesWithExcludedFutureOrder() $this->assertMailSentToAt(1, Configure::read('test.loginEmailSuperadmin')); $this->assertMailSubjectContainsAt(1, 'Rechnung Nr. 2018-000001, 02.02.2018'); $this->assertMailContainsHtmlAt(1, 'Guthaben beträgt 61,97 €'); + $this->assertMailContainsHtmlAt(1, 'https://paypal.me/username/35.71EUR'); $this->assertMailContainsAttachment($pdfFilenameWithoutPath); $this->getAndAssertOrderDetailsAfterInvoiceGeneration($invoice->id, 4); From 905a933474c82d3c8c4c45a03103eac664b1a4e1 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 13 Oct 2022 10:36:58 +0200 Subject: [PATCH 177/646] defined var --- src/Lib/Invoice/SendInvoiceToCustomer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Lib/Invoice/SendInvoiceToCustomer.php b/src/Lib/Invoice/SendInvoiceToCustomer.php index 17956ca060..11d9160d0c 100644 --- a/src/Lib/Invoice/SendInvoiceToCustomer.php +++ b/src/Lib/Invoice/SendInvoiceToCustomer.php @@ -28,6 +28,7 @@ class SendInvoiceToCustomer public $invoiceNumber; public $invoiceDate; public $invoiceId; + public $invoiceSumPriceIncl; public $paidInCash; public $isCancellationInvoice; public $originalInvoiceId; From 50bdf732a1f5c63e2b6be52ca02d60e31e3fac25 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 13 Oct 2022 10:46:07 +0200 Subject: [PATCH 178/646] paypal link only if sum > 0 --- plugins/Admin/templates/email/html/send_invoice_to_customer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Admin/templates/email/html/send_invoice_to_customer.php b/plugins/Admin/templates/email/html/send_invoice_to_customer.php index 234b42c99f..9906f0c5ea 100644 --- a/plugins/Admin/templates/email/html/send_invoice_to_customer.php +++ b/plugins/Admin/templates/email/html/send_invoice_to_customer.php @@ -31,7 +31,7 @@

- + 0) { ?>

MyHtml->getCurrencyIsoCode(Configure::read('appDb.FCS_CURRENCY_SYMBOL')); ?>

From 11b1b82c81cce6e8f124097abc607e924533f3b1 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 13 Oct 2022 10:46:21 +0200 Subject: [PATCH 179/646] code cleaning --- plugins/Admin/templates/Configurations/index.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/plugins/Admin/templates/Configurations/index.php b/plugins/Admin/templates/Configurations/index.php index 2d7afd6f14..f587528d63 100644 --- a/plugins/Admin/templates/Configurations/index.php +++ b/plugins/Admin/templates/Configurations/index.php @@ -360,18 +360,6 @@ - elementExists('latestGitCommit')) { - echo ''; - echo ''; - echo ''; - echo ''; - } - ?> - From 8921a818deeb8db4d8ebeadce0c5f1ede5aed4b5 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 13 Oct 2022 10:47:07 +0200 Subject: [PATCH 180/646] add paypalMeUsername --- plugins/Admin/templates/Configurations/index.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/Admin/templates/Configurations/index.php b/plugins/Admin/templates/Configurations/index.php index f587528d63..e125a7aec7 100644 --- a/plugins/Admin/templates/Configurations/index.php +++ b/plugins/Admin/templates/Configurations/index.php @@ -370,6 +370,11 @@ + + + + + From e12f5ff8bb9375b9769aa1379c062c7594b2180b Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 13 Oct 2022 10:57:45 +0200 Subject: [PATCH 181/646] wording --- .../Admin/resources/locales/de_DE/admin.mo | Bin 70992 -> 70813 bytes .../Admin/resources/locales/de_DE/admin.po | 20 +++++++++--------- plugins/Admin/resources/locales/default.pot | 10 ++------- .../Admin/resources/locales/en_US/admin.mo | Bin 66363 -> 66199 bytes .../Admin/resources/locales/en_US/admin.po | 20 +++++++++--------- .../email/html/send_invoice_to_customer.php | 2 +- 6 files changed, 23 insertions(+), 29 deletions(-) diff --git a/plugins/Admin/resources/locales/de_DE/admin.mo b/plugins/Admin/resources/locales/de_DE/admin.mo index 37e955024bd50144f66fa9401871d499cddee7bb..dab245d04694f6e7464d9afde93248371b37a5b3 100644 GIT binary patch delta 16214 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 Q=Jh}Mz%OsYxsw_H2lj;;MF0Q* delta 16389 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 diff --git a/plugins/Admin/resources/locales/de_DE/admin.po b/plugins/Admin/resources/locales/de_DE/admin.po index efc8190bbe..156f936a13 100644 --- a/plugins/Admin/resources/locales/de_DE/admin.po +++ b/plugins/Admin/resources/locales/de_DE/admin.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-10-13 10:23+0200\n" -"PO-Revision-Date: 2022-10-13 10:23+0200\n" +"POT-Creation-Date: 2022-10-13 10:55+0200\n" +"PO-Revision-Date: 2022-10-13 10:55+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: de_DE\n" @@ -924,12 +924,6 @@ msgstr "Version FoodCoopShop" msgid "Last_executed_migration" msgstr "Zuletzt ausgeführte Migration" -msgid "Software_update_version" -msgstr "Software-Update / Version" - -msgid "Please_find_more_information_in_the_changelog_{0}." -msgstr "Mehr Informationen zu den Änderungen findest du im {0}." - msgid "activated" msgstr "aktiviert" @@ -2328,8 +2322,8 @@ msgstr "Deine Rechnung befindet sich im Anhang." msgid "{0}_thanks_you_for_your_purchase!" msgstr "{0} sagt Danke für Deinen Einkauf!" -msgid "Pay_invoice_with_paypal" -msgstr "Rechnung mit Paypal bezahlen" +msgid "Pay_this_invoice_with_paypal" +msgstr "Diese Rechnung mit Paypal bezahlen" msgid "this_invoice_contains_all_products_that_have_been_delivered_in_{0}." msgstr "in dieser Rechnung sind alle Produkte enthalten, die im {0} geliefert wurden." @@ -2406,6 +2400,12 @@ msgstr "Das tatsächlich gelieferte Gewicht wird evtl. noch angepasst, d. h. der msgid "Product_ID" msgstr "Produkt-Nr." +#~ msgid "Software_update_version" +#~ msgstr "Software-Update / Version" + +#~ msgid "Please_find_more_information_in_the_changelog_{0}." +#~ msgstr "Mehr Informationen zu den Änderungen findest du im {0}." + #~ msgid "Reminder" #~ msgstr "Erinnerung" diff --git a/plugins/Admin/resources/locales/default.pot b/plugins/Admin/resources/locales/default.pot index c17f005113..3135298be7 100644 --- a/plugins/Admin/resources/locales/default.pot +++ b/plugins/Admin/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-10-13 10:23+0200\n" +"POT-Creation-Date: 2022-10-13 10:55+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -923,12 +923,6 @@ msgstr "" msgid "Last_executed_migration" msgstr "" -msgid "Software_update_version" -msgstr "" - -msgid "Please_find_more_information_in_the_changelog_{0}." -msgstr "" - msgid "activated" msgstr "" @@ -2318,7 +2312,7 @@ msgstr "" msgid "{0}_thanks_you_for_your_purchase!" msgstr "" -msgid "Pay_invoice_with_paypal" +msgid "Pay_this_invoice_with_paypal" msgstr "" msgid "this_invoice_contains_all_products_that_have_been_delivered_in_{0}." diff --git a/plugins/Admin/resources/locales/en_US/admin.mo b/plugins/Admin/resources/locales/en_US/admin.mo index b7ab7bbf774a653eeeb49efdcd198677554596a4..9a4b211aa9735c823326e2bc8e06eba3d8f2690f 100644 GIT binary patch delta 16158 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 delta 16293 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\n" "Language: en_US\n" @@ -924,12 +924,6 @@ msgstr "Version of FoodCoopShop" msgid "Last_executed_migration" msgstr "Last executed migration" -msgid "Software_update_version" -msgstr "Software update / Version" - -msgid "Please_find_more_information_in_the_changelog_{0}." -msgstr "Please find more information in the {0}." - msgid "activated" msgstr "activated" @@ -2325,8 +2319,8 @@ msgstr "Please find your invoice attached." msgid "{0}_thanks_you_for_your_purchase!" msgstr "Thank you for your purchase!" -msgid "Pay_invoice_with_paypal" -msgstr "Pay invoice with paypal" +msgid "Pay_this_invoice_with_paypal" +msgstr "Pay this invoice with paypal" msgid "this_invoice_contains_all_products_that_have_been_delivered_in_{0}." msgstr "this invoice contains all products that have been delivered in {0}." @@ -2403,6 +2397,12 @@ msgstr "The delivered weight will eventually be adapted, so the price can change msgid "Product_ID" msgstr "ProductID" +#~ msgid "Software_update_version" +#~ msgstr "Software update / Version" + +#~ msgid "Please_find_more_information_in_the_changelog_{0}." +#~ msgstr "Please find more information in the {0}." + #~ msgid "Reminder" #~ msgstr "Reminder" diff --git a/plugins/Admin/templates/email/html/send_invoice_to_customer.php b/plugins/Admin/templates/email/html/send_invoice_to_customer.php index 9906f0c5ea..476f6fbf95 100644 --- a/plugins/Admin/templates/email/html/send_invoice_to_customer.php +++ b/plugins/Admin/templates/email/html/send_invoice_to_customer.php @@ -33,7 +33,7 @@ 0) { ?>

- MyHtml->getCurrencyIsoCode(Configure::read('appDb.FCS_CURRENCY_SYMBOL')); ?> + MyHtml->getCurrencyIsoCode(Configure::read('appDb.FCS_CURRENCY_SYMBOL')); ?>

From 604a0af5a21d25aa5044e8c0fe2356479761102a Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 13 Oct 2022 11:12:26 +0200 Subject: [PATCH 182/646] fix --- src/Model/Table/InvoicesTable.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/Model/Table/InvoicesTable.php b/src/Model/Table/InvoicesTable.php index 8aba2b17ac..73b7556690 100644 --- a/src/Model/Table/InvoicesTable.php +++ b/src/Model/Table/InvoicesTable.php @@ -67,11 +67,23 @@ public function getLatestInvoicesForCustomer($customerId) ])->toArray(); foreach($invoices as &$invoice) { + foreach($invoice->invoice_taxes as $invoiceTax) { $invoice->total_sum_price_excl += $invoiceTax->total_price_tax_excl; $invoice->total_sum_tax += $invoiceTax->total_price_tax; $invoice->total_sum_price_incl += $invoiceTax->total_price_tax_incl; } + + if (is_null($invoice->total_sum_price_excl)) { + $invoice->total_sum_price_excl = 0; + } + if (is_null($invoice->total_sum_tax)) { + $invoice->total_sum_tax = 0; + } + if (is_null($invoice->total_sum_price_incl)) { + $invoice->total_sum_price_incl = 0; + } + } return $invoices; From 8cc94dde0e41490f9c050d219b390dc7481af5d1 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 13 Oct 2022 19:36:04 +0200 Subject: [PATCH 183/646] vendor updates --- composer.lock | 70 ++++++++++++++++++++++---------------------- webroot/package.json | 2 +- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/composer.lock b/composer.lock index 1c6cc10daf..ed14ca80d9 100644 --- a/composer.lock +++ b/composer.lock @@ -280,16 +280,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.3.3", + "version": "1.3.4", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c" + "reference": "69098eca243998b53eed7a48d82dedd28b447cd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/30897edbfb15e784fe55587b4f73ceefd3c4d98c", - "reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/69098eca243998b53eed7a48d82dedd28b447cd5", + "reference": "69098eca243998b53eed7a48d82dedd28b447cd5", "shasum": "" }, "require": { @@ -336,7 +336,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.3.3" + "source": "https://github.com/composer/ca-bundle/tree/1.3.4" }, "funding": [ { @@ -352,7 +352,7 @@ "type": "tidelift" } ], - "time": "2022-07-20T07:14:26+00:00" + "time": "2022-10-12T12:08:29+00:00" }, { "name": "cviebrock/discourse-php", @@ -405,16 +405,16 @@ }, { "name": "dereuromark/cakephp-queue", - "version": "6.4.3", + "version": "6.4.4", "source": { "type": "git", "url": "https://github.com/dereuromark/cakephp-queue.git", - "reference": "d16535e928bfb12aa96458e14f1c4ab5b2f846da" + "reference": "ee7ff4d0da6ee7d8e2c842ad7bba7f1063ddce17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dereuromark/cakephp-queue/zipball/d16535e928bfb12aa96458e14f1c4ab5b2f846da", - "reference": "d16535e928bfb12aa96458e14f1c4ab5b2f846da", + "url": "https://api.github.com/repos/dereuromark/cakephp-queue/zipball/ee7ff4d0da6ee7d8e2c842ad7bba7f1063ddce17", + "reference": "ee7ff4d0da6ee7d8e2c842ad7bba7f1063ddce17", "shasum": "" }, "require": { @@ -472,7 +472,7 @@ "issues": "https://github.com/dereuromark/cakephp-queue/issues", "source": "https://github.com/dereuromark/cakephp-queue" }, - "time": "2022-08-19T11:35:33+00:00" + "time": "2022-09-30T12:08:35+00:00" }, { "name": "ezyang/htmlpurifier", @@ -2793,16 +2793,16 @@ }, { "name": "symfony/console", - "version": "v6.1.5", + "version": "v6.1.6", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "17524a64ebcfab68d237bbed247e9a9917747096" + "reference": "7fa3b9cf17363468795e539231a5c91b02b608fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/17524a64ebcfab68d237bbed247e9a9917747096", - "reference": "17524a64ebcfab68d237bbed247e9a9917747096", + "url": "https://api.github.com/repos/symfony/console/zipball/7fa3b9cf17363468795e539231a5c91b02b608fc", + "reference": "7fa3b9cf17363468795e539231a5c91b02b608fc", "shasum": "" }, "require": { @@ -2869,7 +2869,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.1.5" + "source": "https://github.com/symfony/console/tree/v6.1.6" }, "funding": [ { @@ -2885,7 +2885,7 @@ "type": "tidelift" } ], - "time": "2022-09-03T14:24:42+00:00" + "time": "2022-10-07T08:04:03+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3434,16 +3434,16 @@ }, { "name": "symfony/string", - "version": "v6.1.5", + "version": "v6.1.6", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "17c08b068176996a1d7db8d00ffae3c248267016" + "reference": "7e7e0ff180d4c5a6636eaad57b65092014b61864" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/17c08b068176996a1d7db8d00ffae3c248267016", - "reference": "17c08b068176996a1d7db8d00ffae3c248267016", + "url": "https://api.github.com/repos/symfony/string/zipball/7e7e0ff180d4c5a6636eaad57b65092014b61864", + "reference": "7e7e0ff180d4c5a6636eaad57b65092014b61864", "shasum": "" }, "require": { @@ -3499,7 +3499,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.1.5" + "source": "https://github.com/symfony/string/tree/v6.1.6" }, "funding": [ { @@ -3515,7 +3515,7 @@ "type": "tidelift" } ], - "time": "2022-09-02T08:05:20+00:00" + "time": "2022-10-10T09:34:31+00:00" }, { "name": "tecnickcom/tcpdf", @@ -5099,16 +5099,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.8.8", + "version": "1.8.9", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "08310ce271984587e2a4cda94e1ac66510a6ea07" + "reference": "3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/08310ce271984587e2a4cda94e1ac66510a6ea07", - "reference": "08310ce271984587e2a4cda94e1ac66510a6ea07", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2", + "reference": "3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2", "shasum": "" }, "require": { @@ -5138,7 +5138,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.8.8" + "source": "https://github.com/phpstan/phpstan/tree/1.8.9" }, "funding": [ { @@ -5154,7 +5154,7 @@ "type": "tidelift" } ], - "time": "2022-10-06T12:51:57+00:00" + "time": "2022-10-13T13:40:18+00:00" }, { "name": "phpunit/php-code-coverage", @@ -7271,16 +7271,16 @@ }, { "name": "symfony/var-dumper", - "version": "v6.1.5", + "version": "v6.1.6", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "d0833493fb2413a86f522fb54a1896a7718e98ec" + "reference": "0f0adde127f24548e23cbde83bcaeadc491c551f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d0833493fb2413a86f522fb54a1896a7718e98ec", - "reference": "d0833493fb2413a86f522fb54a1896a7718e98ec", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0f0adde127f24548e23cbde83bcaeadc491c551f", + "reference": "0f0adde127f24548e23cbde83bcaeadc491c551f", "shasum": "" }, "require": { @@ -7339,7 +7339,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.1.5" + "source": "https://github.com/symfony/var-dumper/tree/v6.1.6" }, "funding": [ { @@ -7355,7 +7355,7 @@ "type": "tidelift" } ], - "time": "2022-09-08T09:34:40+00:00" + "time": "2022-10-07T08:04:03+00:00" }, { "name": "theseer/tokenizer", diff --git a/webroot/package.json b/webroot/package.json index 010bd7bdcb..e87c8dd011 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -36,7 +36,7 @@ "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", "svelte": "^3.51.0", - "swiper": "8.4.3", + "swiper": "8.4.4", "tooltipster": "^4.2.8", "uglify-js": "^3.17.3", "webrtc-adapter": "^8.1.2" From 4266ac19e2441b43318d9858dc2016066cfbaa03 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 13 Oct 2022 19:36:14 +0200 Subject: [PATCH 184/646] vendor updates --- webroot/package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/webroot/package-lock.json b/webroot/package-lock.json index 09712b81f8..d88a5fcf5b 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -30,7 +30,7 @@ "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", "svelte": "^3.51.0", - "swiper": "8.4.3", + "swiper": "8.4.4", "tooltipster": "^4.2.8", "uglify-js": "^3.17.3", "webrtc-adapter": "^8.1.2" @@ -1007,9 +1007,9 @@ } }, "node_modules/swiper": { - "version": "8.4.3", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.3.tgz", - "integrity": "sha512-+Ne/3rSZ1t28r//Upg8AdLgXJ+/nTw79GZFl6RQb2TckfnX6JTQZWWiNTT3uqP9Cyixb+OhT9fRBqAWnjM444A==", + "version": "8.4.4", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.4.tgz", + "integrity": "sha512-jA/8BfOZwT8PqPSnMX0TENZYitXEhNa7ZSNj1Diqh5LZyUJoBQaZcqAiPQ/PIg1+IPaRn/V8ZYVb0nxHMh51yw==", "funding": [ { "type": "patreon", @@ -1892,9 +1892,9 @@ "integrity": "sha512-PBITYIrsNOuW+Dtds00gSY68raNZQn7i59Dg/fjgf6WwyawPKeBwle692coO7ILZqSO+UJe9899aDn9sMdeOHA==" }, "swiper": { - "version": "8.4.3", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.3.tgz", - "integrity": "sha512-+Ne/3rSZ1t28r//Upg8AdLgXJ+/nTw79GZFl6RQb2TckfnX6JTQZWWiNTT3uqP9Cyixb+OhT9fRBqAWnjM444A==", + "version": "8.4.4", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.4.tgz", + "integrity": "sha512-jA/8BfOZwT8PqPSnMX0TENZYitXEhNa7ZSNj1Diqh5LZyUJoBQaZcqAiPQ/PIg1+IPaRn/V8ZYVb0nxHMh51yw==", "requires": { "dom7": "^4.0.4", "ssr-window": "^4.0.2" From 37a422fb03bb99a38829f438bef557e494f435ce Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sat, 15 Oct 2022 20:15:54 +0200 Subject: [PATCH 185/646] wrong order --- plugins/Admin/templates/Customers/index.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/Admin/templates/Customers/index.php b/plugins/Admin/templates/Customers/index.php index 28299f8594..fd1d01cf0a 100644 --- a/plugins/Admin/templates/Customers/index.php +++ b/plugins/Admin/templates/Customers/index.php @@ -248,20 +248,20 @@ echo ''; } - if ($this->Html->paymentIsCashless()) { + if (Configure::read('app.emailOrderReminderEnabled')) { echo ''; } - if (Configure::read('app.emailOrderReminderEnabled')) { + if ($this->Html->paymentIsCashless()) { echo ''; } From 47e2055eefdce9c3f784593b410e86803088f7d8 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sat, 15 Oct 2022 20:17:55 +0200 Subject: [PATCH 186/646] sort --- plugins/Admin/src/Controller/CustomersController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/Admin/src/Controller/CustomersController.php b/plugins/Admin/src/Controller/CustomersController.php index bef2476ce2..edf786cc0c 100644 --- a/plugins/Admin/src/Controller/CustomersController.php +++ b/plugins/Admin/src/Controller/CustomersController.php @@ -722,6 +722,7 @@ public function index() 'Customers.email', 'Customers.active', 'Customers.email_order_reminder_enabled', + 'Customers.check_credit_reminder_enabled', 'Customers.date_add', 'Customers.newsletter_enabled', 'Feedbacks.modified', From 726356ca774f61036070e4b4a8772b32cc2a88d2 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sat, 15 Oct 2022 20:19:11 +0200 Subject: [PATCH 187/646] rm cf --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index d83ca64930..a46a1d7cfb 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,6 @@ · Docs · - Crowdfunding - · German Demo · English Demo From b43b114bd10989ca488c7cb03d5a692efb7426b2 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 16 Oct 2022 23:23:09 +0200 Subject: [PATCH 188/646] improved debugging --- plugins/Admin/src/Controller/ProductsController.php | 1 - .../Admin/templates/Products/detect_missing_product_images.php | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Admin/src/Controller/ProductsController.php b/plugins/Admin/src/Controller/ProductsController.php index f531a0f5e3..8d29092234 100644 --- a/plugins/Admin/src/Controller/ProductsController.php +++ b/plugins/Admin/src/Controller/ProductsController.php @@ -104,7 +104,6 @@ public function detectMissingProductImages() 'Images', ], 'order' => [ - 'Products.modified' => 'DESC', 'Images.id_image' => 'ASC', ], ]); diff --git a/plugins/Admin/templates/Products/detect_missing_product_images.php b/plugins/Admin/templates/Products/detect_missing_product_images.php index 9bf5d72558..cf38647887 100644 --- a/plugins/Admin/templates/Products/detect_missing_product_images.php +++ b/plugins/Admin/templates/Products/detect_missing_product_images.php @@ -35,7 +35,8 @@ $i++; $outputHtml .= $this->Html->link($product->name, $this->Slug->getProductDetail($product->id_product, $product->name)); $outputHtml .= ' / ' . $this->Html->link('Admin', $this->Slug->getProductAdmin($product->id_manufacturer, $product->id_product)); - $outputHtml .= ' / ' . $product->manufacturer->name . '
'; + $outputHtml .= ' / ' . $product->manufacturer->name; + $outputHtml .= ' / ImageId: ' . $product->image->id_image . '
'; } } } From 409ef21b5ec3708b0b80a7674a7b838b8cc75615 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 17 Oct 2022 10:14:08 +0200 Subject: [PATCH 189/646] layout fix --- webroot/css/frontend.css | 1 + 1 file changed, 1 insertion(+) diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index 104f3185e4..4c673c4f8a 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -1156,6 +1156,7 @@ a.blog-post-wrapper span { float: left; line-height: 19px; color: #333; + word-break: break-word; } a.blog-post-wrapper span.content { max-height: 107px; From 1015f476ececcd4c1556b88fe7a7c6a4912639a4 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 17 Oct 2022 10:20:02 +0200 Subject: [PATCH 190/646] white background behind header --- webroot/css/frontend.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index 4c673c4f8a..7f64c51bb7 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -29,7 +29,7 @@ body { z-index: 100; margin-right: 0px; border-right: 1px solid #d6d4d4; - margin-top: 148px; + padding-top: 148px; } #inner-content { float: left; From 2e4a803ce34cfff0dc1f1658e79721fc6d28a16e Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 17 Oct 2022 10:32:26 +0200 Subject: [PATCH 191/646] german help link to english settings page --- .../Admin/resources/locales/de_DE/admin.mo | Bin 70813 -> 70808 bytes .../Admin/resources/locales/de_DE/admin.po | 4 ++-- .../Admin/templates/Configurations/index.php | 2 +- src/View/Helper/MyHtmlHelper.php | 8 +++++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/plugins/Admin/resources/locales/de_DE/admin.mo b/plugins/Admin/resources/locales/de_DE/admin.mo index dab245d04694f6e7464d9afde93248371b37a5b3..47cd7e58af4d46aef4ad5bb3a898b98a74f52bf3 100644 GIT binary patch delta 523 zcmXZZJ4*sk6u|Lw%~JFIXsCn=Y3Zp!NDb``K}C}_^dKS!3seFNETW+)u!fd~8Ui6m zaww`Phag6L)WVmj_ik_$A2Et`oWY34$P{Khc_U3MDg-p~jC0uTHL{E; zOyDaH;efA^pGPfN!a=Oz7<&DUfhMtyeFF7GHn9V@uonwx!Mnx(zymH2sNpnD1dR0I z5ia39u3$K5q#t)tzvv3JU=?-1I?iHG$Vdb;NN;3%2qJl!6a9i4B}ZGt?Sr5xd!Mpu9*9doYh9SU?9pCfb2#Tqn@LC7cgyHIC=F ziBGtVLlLbe@EGNb?obNWQ3h<{3XYmu4dX$%6nooq&kV+*bMbiDx^kp^$=ytLKbcPF NGCRpk<;bH=;~zcHLVf@M diff --git a/plugins/Admin/resources/locales/de_DE/admin.po b/plugins/Admin/resources/locales/de_DE/admin.po index 156f936a13..1131bae866 100644 --- a/plugins/Admin/resources/locales/de_DE/admin.po +++ b/plugins/Admin/resources/locales/de_DE/admin.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: 2022-10-13 10:55+0200\n" -"PO-Revision-Date: 2022-10-13 10:55+0200\n" +"PO-Revision-Date: 2022-10-17 10:27+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: de_DE\n" @@ -886,7 +886,7 @@ msgid "Description" msgstr "Beschreibung" msgid "docs_route_settings" -msgstr "einstellungen" +msgstr "settings" msgid "The_following_settings_can_be_changed_in_the_admin_area." msgstr "Die folgenden Einstellungen können im Admin-Bereich geändert werden." diff --git a/plugins/Admin/templates/Configurations/index.php b/plugins/Admin/templates/Configurations/index.php index e125a7aec7..3a9bf61e10 100644 --- a/plugins/Admin/templates/Configurations/index.php +++ b/plugins/Admin/templates/Configurations/index.php @@ -33,7 +33,7 @@

- element('headerIcons', ['helperLink' => $this->Html->getDocsUrl(__d('admin', 'docs_route_settings'))]); ?> + element('headerIcons', ['helperLink' => $this->Html->getDocsUrl(__d('admin', 'docs_route_settings'), 'en')]); ?>
diff --git a/src/View/Helper/MyHtmlHelper.php b/src/View/Helper/MyHtmlHelper.php index 9064961aef..4a876945a0 100644 --- a/src/View/Helper/MyHtmlHelper.php +++ b/src/View/Helper/MyHtmlHelper.php @@ -263,11 +263,13 @@ public function getFontAwesomeIconForCurrencyName($currencySymbol) * @param string $page * @return string */ - public function getDocsUrl($page) + public function getDocsUrl($page, $languageCode=null) { - $languageCode = substr(I18n::getLocale(), 0, 2); + if (is_null($languageCode)) { + $languageCode = substr(I18n::getLocale(), 0, 2); + } $url = 'https://foodcoopshop.github.io/' . $languageCode . '/'; - if ($languageCode == 'de') { + if ($languageCode == 'de' || $page == 'settings') { $url .= $page; } return $url; From 8024d94f9abf536b42e291cbe1c462709a33a54f Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 17 Oct 2022 10:34:12 +0200 Subject: [PATCH 192/646] vendor updates --- composer.lock | 74 +++++++++++++++++++++------------------ webroot/package-lock.json | 28 +++++++-------- webroot/package.json | 4 +-- 3 files changed, 55 insertions(+), 51 deletions(-) diff --git a/composer.lock b/composer.lock index ed14ca80d9..e2dd95175a 100644 --- a/composer.lock +++ b/composer.lock @@ -171,16 +171,16 @@ }, { "name": "cakephp/migrations", - "version": "3.5.3", + "version": "3.6.0", "source": { "type": "git", "url": "https://github.com/cakephp/migrations.git", - "reference": "8ba15cc92b9ba938c6f925bbcd3735464b1b1ef7" + "reference": "e1a0a768d6ff572ef5a9aa9024243882f29c96c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/migrations/zipball/8ba15cc92b9ba938c6f925bbcd3735464b1b1ef7", - "reference": "8ba15cc92b9ba938c6f925bbcd3735464b1b1ef7", + "url": "https://api.github.com/repos/cakephp/migrations/zipball/e1a0a768d6ff572ef5a9aa9024243882f29c96c9", + "reference": "e1a0a768d6ff572ef5a9aa9024243882f29c96c9", "shasum": "" }, "require": { @@ -227,7 +227,7 @@ "issues": "https://github.com/cakephp/migrations/issues", "source": "https://github.com/cakephp/migrations" }, - "time": "2022-09-25T02:30:10+00:00" + "time": "2022-10-14T05:38:58+00:00" }, { "name": "cakephp/plugin-installer", @@ -405,16 +405,16 @@ }, { "name": "dereuromark/cakephp-queue", - "version": "6.4.4", + "version": "6.5.0", "source": { "type": "git", "url": "https://github.com/dereuromark/cakephp-queue.git", - "reference": "ee7ff4d0da6ee7d8e2c842ad7bba7f1063ddce17" + "reference": "3c18f31dd3cea930ed1ee37068375fea2944dcef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dereuromark/cakephp-queue/zipball/ee7ff4d0da6ee7d8e2c842ad7bba7f1063ddce17", - "reference": "ee7ff4d0da6ee7d8e2c842ad7bba7f1063ddce17", + "url": "https://api.github.com/repos/dereuromark/cakephp-queue/zipball/3c18f31dd3cea930ed1ee37068375fea2944dcef", + "reference": "3c18f31dd3cea930ed1ee37068375fea2944dcef", "shasum": "" }, "require": { @@ -472,7 +472,7 @@ "issues": "https://github.com/dereuromark/cakephp-queue/issues", "source": "https://github.com/dereuromark/cakephp-queue" }, - "time": "2022-09-30T12:08:35+00:00" + "time": "2022-10-14T22:04:16+00:00" }, { "name": "ezyang/htmlpurifier", @@ -1692,16 +1692,16 @@ }, { "name": "matomo/device-detector", - "version": "6.0.3", + "version": "6.0.4", "source": { "type": "git", "url": "https://github.com/matomo-org/device-detector.git", - "reference": "6ba69e1afd24b45d66b6de7b04553213f7ef2151" + "reference": "aaed4d27c7a9876756d03ae85386977db306492d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/6ba69e1afd24b45d66b6de7b04553213f7ef2151", - "reference": "6ba69e1afd24b45d66b6de7b04553213f7ef2151", + "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/aaed4d27c7a9876756d03ae85386977db306492d", + "reference": "aaed4d27c7a9876756d03ae85386977db306492d", "shasum": "" }, "require": { @@ -1757,7 +1757,7 @@ "source": "https://github.com/matomo-org/matomo", "wiki": "https://dev.matomo.org/" }, - "time": "2022-09-12T11:43:29+00:00" + "time": "2022-10-14T11:08:35+00:00" }, { "name": "mobiledetect/mobiledetectlib", @@ -4016,16 +4016,16 @@ }, { "name": "composer/composer", - "version": "2.4.2", + "version": "2.4.3", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "7d887621e69a0311eb50aed4a16f7044b2b385b9" + "reference": "b34c0e9a93f2cd688c62ce4dfcc69e13b6ce7aa4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/7d887621e69a0311eb50aed4a16f7044b2b385b9", - "reference": "7d887621e69a0311eb50aed4a16f7044b2b385b9", + "url": "https://api.github.com/repos/composer/composer/zipball/b34c0e9a93f2cd688c62ce4dfcc69e13b6ce7aa4", + "reference": "b34c0e9a93f2cd688c62ce4dfcc69e13b6ce7aa4", "shasum": "" }, "require": { @@ -4108,7 +4108,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.4.2" + "source": "https://github.com/composer/composer/tree/2.4.3" }, "funding": [ { @@ -4124,7 +4124,7 @@ "type": "tidelift" } ], - "time": "2022-09-14T14:11:15+00:00" + "time": "2022-10-14T14:56:41+00:00" }, { "name": "composer/metadata-minifier", @@ -5054,16 +5054,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.8.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "8dd908dd6156e974b9a0f8bb4cd5ad0707830f04" + "reference": "7d1e81213b0c7eb8d5a9f524456cbc2778ed5c65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/8dd908dd6156e974b9a0f8bb4cd5ad0707830f04", - "reference": "8dd908dd6156e974b9a0f8bb4cd5ad0707830f04", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/7d1e81213b0c7eb8d5a9f524456cbc2778ed5c65", + "reference": "7d1e81213b0c7eb8d5a9f524456cbc2778ed5c65", "shasum": "" }, "require": { @@ -5093,9 +5093,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.8.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.11.0" }, - "time": "2022-09-04T18:59:06+00:00" + "time": "2022-10-14T13:32:28+00:00" }, { "name": "phpstan/phpstan", @@ -6867,28 +6867,28 @@ }, { "name": "slevomat/coding-standard", - "version": "8.5.2", + "version": "8.6.0", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "f32937dc41b587f3500efed1dbca2f82aa519373" + "reference": "d4175d8bf1246f4bf8be04ab688fbdc6fed18ece" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/f32937dc41b587f3500efed1dbca2f82aa519373", - "reference": "f32937dc41b587f3500efed1dbca2f82aa519373", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/d4175d8bf1246f4bf8be04ab688fbdc6fed18ece", + "reference": "d4175d8bf1246f4bf8be04ab688fbdc6fed18ece", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", "php": "^7.2 || ^8.0", - "phpstan/phpdoc-parser": ">=1.7.0 <1.9.0", + "phpstan/phpdoc-parser": ">=1.11.0 <1.12.0", "squizlabs/php_codesniffer": "^3.7.1" }, "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.10|1.8.6", + "phpstan/phpstan": "1.4.10|1.8.9", "phpstan/phpstan-deprecation-rules": "1.0.0", "phpstan/phpstan-phpunit": "1.0.0|1.1.1", "phpstan/phpstan-strict-rules": "1.4.4", @@ -6910,9 +6910,13 @@ "MIT" ], "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", + "keywords": [ + "dev", + "phpcs" + ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.5.2" + "source": "https://github.com/slevomat/coding-standard/tree/8.6.0" }, "funding": [ { @@ -6924,7 +6928,7 @@ "type": "tidelift" } ], - "time": "2022-09-27T16:45:37+00:00" + "time": "2022-10-16T10:31:02+00:00" }, { "name": "squizlabs/php_codesniffer", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index d88a5fcf5b..8e8156bd88 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -29,11 +29,11 @@ "lazysizes": "^5.3.2", "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", - "svelte": "^3.51.0", + "svelte": "^3.52.0", "swiper": "8.4.4", "tooltipster": "^4.2.8", "uglify-js": "^3.17.3", - "webrtc-adapter": "^8.1.2" + "webrtc-adapter": "^8.2.0" } }, "node_modules/@babel/polyfill": { @@ -999,9 +999,9 @@ "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==" }, "node_modules/svelte": { - "version": "3.51.0", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.51.0.tgz", - "integrity": "sha512-PBITYIrsNOuW+Dtds00gSY68raNZQn7i59Dg/fjgf6WwyawPKeBwle692coO7ILZqSO+UJe9899aDn9sMdeOHA==", + "version": "3.52.0", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.52.0.tgz", + "integrity": "sha512-FxcnEUOAVfr10vDU5dVgJN19IvqeHQCS1zfe8vayTfis9A2t5Fhx+JDe5uv/C3j//bB1umpLJ6quhgs9xyUbCQ==", "engines": { "node": ">= 8" } @@ -1123,9 +1123,9 @@ } }, "node_modules/webrtc-adapter": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-8.1.2.tgz", - "integrity": "sha512-j1tsxKR/NmNgqrlLTL5jsNmFBrsIdTvBWZ2I1UAs/J37M1s1chLy1Fp7RfQHflHk3KoSNAxp/4y6ictHJ8prSw==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-8.2.0.tgz", + "integrity": "sha512-umxCMgedPAVq4Pe/jl3xmelLXLn4XZWFEMR5Iipb5wJ+k1xMX0yC4ZY9CueZUU1MjapFxai1tFGE7R/kotH6Ww==", "dependencies": { "sdp": "^3.0.2" }, @@ -1887,9 +1887,9 @@ "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==" }, "svelte": { - "version": "3.51.0", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.51.0.tgz", - "integrity": "sha512-PBITYIrsNOuW+Dtds00gSY68raNZQn7i59Dg/fjgf6WwyawPKeBwle692coO7ILZqSO+UJe9899aDn9sMdeOHA==" + "version": "3.52.0", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.52.0.tgz", + "integrity": "sha512-FxcnEUOAVfr10vDU5dVgJN19IvqeHQCS1zfe8vayTfis9A2t5Fhx+JDe5uv/C3j//bB1umpLJ6quhgs9xyUbCQ==" }, "swiper": { "version": "8.4.4", @@ -1970,9 +1970,9 @@ } }, "webrtc-adapter": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-8.1.2.tgz", - "integrity": "sha512-j1tsxKR/NmNgqrlLTL5jsNmFBrsIdTvBWZ2I1UAs/J37M1s1chLy1Fp7RfQHflHk3KoSNAxp/4y6ictHJ8prSw==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-8.2.0.tgz", + "integrity": "sha512-umxCMgedPAVq4Pe/jl3xmelLXLn4XZWFEMR5Iipb5wJ+k1xMX0yC4ZY9CueZUU1MjapFxai1tFGE7R/kotH6Ww==", "requires": { "sdp": "^3.0.2" } diff --git a/webroot/package.json b/webroot/package.json index e87c8dd011..4f2f38809e 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -35,10 +35,10 @@ "lazysizes": "^5.3.2", "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", - "svelte": "^3.51.0", + "svelte": "^3.52.0", "swiper": "8.4.4", "tooltipster": "^4.2.8", "uglify-js": "^3.17.3", - "webrtc-adapter": "^8.1.2" + "webrtc-adapter": "^8.2.0" } } From ad4fa977d55b82278ea531a7b48e67afd3f2b736 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 17 Oct 2022 10:44:29 +0200 Subject: [PATCH 193/646] migration --- config/Migrations/{init => }/20220928063531_Initial.php | 0 .../20220928064125_AlterDataOnQueuedJobsToMediumtext.php | 0 devtools/init-dev-setup.sh | 1 - devtools/installation/init-database.sh | 1 - tests/bootstrap.php | 1 - 5 files changed, 3 deletions(-) rename config/Migrations/{init => }/20220928063531_Initial.php (100%) rename config/Migrations/{init => }/20220928064125_AlterDataOnQueuedJobsToMediumtext.php (100%) diff --git a/config/Migrations/init/20220928063531_Initial.php b/config/Migrations/20220928063531_Initial.php similarity index 100% rename from config/Migrations/init/20220928063531_Initial.php rename to config/Migrations/20220928063531_Initial.php diff --git a/config/Migrations/init/20220928064125_AlterDataOnQueuedJobsToMediumtext.php b/config/Migrations/20220928064125_AlterDataOnQueuedJobsToMediumtext.php similarity index 100% rename from config/Migrations/init/20220928064125_AlterDataOnQueuedJobsToMediumtext.php rename to config/Migrations/20220928064125_AlterDataOnQueuedJobsToMediumtext.php diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index b5c3590eb4..0fb8c3aeb7 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -6,7 +6,6 @@ bash ./devtools/setup-dev/copy-config-files.sh CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate -p Queue -CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate --source Migrations/init CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations seed --source Seeds/tests --seed InitTestDataSeed diff --git a/devtools/installation/init-database.sh b/devtools/installation/init-database.sh index 6b65bd9c6d..d78839cefe 100644 --- a/devtools/installation/init-database.sh +++ b/devtools/installation/init-database.sh @@ -14,7 +14,6 @@ if [[ "$locale" == "" ]]; then fi ./bin/cake migrations migrate -p Queue -./bin/cake migrations migrate --source Migrations/init ./bin/cake migrations migrate ./bin/cake migrations seed --source Seeds/locale/$locale --seed InitDataSeed ./bin/cake migrations seed --seed InitDataSeed diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 0b32aba041..6397d7bb9d 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -18,7 +18,6 @@ $migrator = new Migrator(); $migrator->runMany([ ['plugin' => 'Queue', 'connection' => 'test'], - ['source' => 'Migrations' . DS . 'init', 'connection' => 'test'], ]); // 2) run new migrations (located in main folder) From e7968354a631d2f4ef8eb450a7d5d25dc99c80cd Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 17 Oct 2022 11:49:32 +0200 Subject: [PATCH 194/646] composer is preinstalled in nginx image --- .github/workflows/ci.yml | 2 +- docker-compose.yml | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7967683028..06f7a7c626 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: # do not use ./devtools/init-dev-setup.sh because dev db is not needed bash ./devtools/installation/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh - CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install + CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html/webroot fcs-php-nginx composer install CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html/webroot fcs-php-nginx npm install - name: Apply secrets diff --git a/docker-compose.yml b/docker-compose.yml index bab6bfe144..e0f316d6dd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -87,14 +87,5 @@ services: networks: - fcs - composer: - container_name: fcs-composer - image: composer:latest - user: ${CURRENT_UID} - entrypoint: ['composer', '--ignore-platform-reqs'] - working_dir: /var/www/html - volumes: - - ./:/var/www/html - networks: fcs: From d23f88d81ff118ccd22e65e51317f68913e1df7b Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 17 Oct 2022 11:50:42 +0200 Subject: [PATCH 195/646] composer is preinstalled --- devtools/init-dev-setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index 0fb8c3aeb7..cd4d8b0a56 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -3,10 +3,10 @@ bash ./devtools/installation/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh -CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install +CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html/webroot fcs-php-nginx composer install CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate -p Queue CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations seed --source Seeds/tests --seed InitTestDataSeed -docker exec -w /var/www/html/webroot fcs-php-nginx npm install \ No newline at end of file +CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html/webroot fcs-php-nginx npm install \ No newline at end of file From a9262208c5474d146f9d619ae368bef9e8ac2226 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 17 Oct 2022 11:55:09 +0200 Subject: [PATCH 196/646] remove composer image --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06f7a7c626..c3ee9d5e9b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,9 +17,7 @@ jobs: uses: actions/checkout@v2 - name: Run Docker Compose - run: | - CURRENT_UID=$(id -u):$(id -g) docker compose up php-nginx -d - CURRENT_UID=$(id -u):$(id -g) docker compose up composer -d + run: CURRENT_UID=$(id -u):$(id -g) docker compose up php-nginx -d - name: Setup Dev Environment run: | From 26cbe23a338defd250c4aca00669db1e839d13db Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 17 Oct 2022 11:56:44 +0200 Subject: [PATCH 197/646] composer fixes --- .github/workflows/ci.yml | 2 +- devtools/init-dev-setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3ee9d5e9b..88c66dae90 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: # do not use ./devtools/init-dev-setup.sh because dev db is not needed bash ./devtools/installation/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh - CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html/webroot fcs-php-nginx composer install + CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx composer install CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html/webroot fcs-php-nginx npm install - name: Apply secrets diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index cd4d8b0a56..e9aafef11f 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -3,7 +3,7 @@ bash ./devtools/installation/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh -CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html/webroot fcs-php-nginx composer install +CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx composer install CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate -p Queue CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate From d96f65fe423c5aa4a8204eeb937488d4ba35d5ad Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 17 Oct 2022 17:34:09 +0200 Subject: [PATCH 198/646] refactoring: replace app.cakeServerName with App.fullBaseUrl (#892) * refactoring: replace app.cakeServerName with App.fullBaseUrl * App.fullBaseUrl * fix --- README.md | 2 +- config/custom_config.default.php | 11 +++++------ config/custom_config.dev.php | 11 +++++------ .../Admin/src/Controller/BlogPostsController.php | 2 +- .../src/Controller/ConfigurationsController.php | 2 +- .../src/Controller/ManufacturersController.php | 4 ++-- .../src/Controller/OrderDetailsController.php | 2 +- plugins/Admin/src/Controller/PagesController.php | 2 +- plugins/Admin/templates/Configurations/index.php | 14 +++++++------- plugins/Admin/templates/Manufacturers/index.php | 2 +- plugins/Admin/templates/OrderDetails/index.php | 2 +- .../html/accounting_information_invoices_sent.php | 4 ++-- .../templates/email/html/check_credit_balance.php | 4 ++-- .../email/html/credit_csv_upload_successful.php | 2 +- .../templates/email/html/email_order_reminder.php | 6 +++--- .../email/html/payment_status_changed.php | 2 +- .../Admin/templates/email/html/pickup_reminder.php | 2 +- .../html/send_cancellation_invoice_to_customer.php | 2 +- .../email/html/send_invoice_to_customer.php | 2 +- .../Admin/templates/email/html/send_order_list.php | 2 +- .../OrderDetailsControllerEditPickupDayTest.php | 2 +- .../TestCase/src/Model/Table/ProductsTableTest.php | 4 ++-- .../modal-order-for-different-customer-add.js | 4 ++-- plugins/Network/src/Controller/ApiController.php | 6 +++--- plugins/Network/src/Controller/SyncsController.php | 2 +- .../TestCase/src/Controller/ApiControllerTest.php | 2 +- .../src/Controller/SyncsControllerTest.php | 12 ++++++------ src/Controller/Component/AppAuthComponent.php | 2 +- src/Controller/Component/CartComponent.php | 4 ++-- src/Controller/PagesController.php | 4 ++-- src/Log/Engine/FileAndEmailLog.php | 2 +- src/Model/Table/ProductsTable.php | 2 +- src/Shell/BackupDatabaseShell.php | 4 ++-- src/Shell/SavedLocalizedJsAsStaticFileShell.php | 2 +- templates/element/autoPrintInvoice.php | 2 +- templates/element/email/profileLinks.php | 6 +++--- .../directSelling/generalTermsAndConditions.php | 6 +++--- .../legal/de_DE/directSelling/termsOfUse.php | 4 ++-- .../directSelling/termsOfUseForManufacturers.php | 2 +- .../de_DE/retail/generalTermsAndConditions.php | 2 +- .../element/legal/de_DE/retail/termsOfUse.php | 4 ++-- .../de_DE/retail/termsOfUseForManufacturers.php | 2 +- .../email/html/customer_registered_active.php | 2 +- .../html/customer_registered_notification.php | 2 +- .../email/html/new_password_request_successful.php | 2 +- templates/email/html/order_successful.php | 2 +- .../email/html/order_successful_self_service.php | 2 +- .../stock_available_limit_reached_notification.php | 2 +- templates/layout/email/html/default.php | 10 +++++----- .../src/Controller/CartsControllerTest.php | 2 +- .../src/Controller/SelfServiceControllerTest.php | 4 ++-- webroot/js/helper.js | 4 ++-- 52 files changed, 95 insertions(+), 97 deletions(-) diff --git a/README.md b/README.md index a46a1d7cfb..00d02576f4 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop) * Gitpod: When all containers are up and running (takes about 1 minute), open your Bash-terminal (not in the Docker-terminal) and run * `bash ./devtools/init-dev-setup.sh` -* In your custom_config.php, change `app.cakeServerName` to your Gitpod-Domain (BE AWARE: NO TRAILING SLASH!). +* In your custom_config.php, change `App.fullBaseUrl` to your Gitpod-Domain (BE AWARE: NO TRAILING SLASH!). ## ✨ Features * user-friendly web shop optimized for selling food from different producers diff --git a/config/custom_config.default.php b/config/custom_config.default.php index 2bf3659046..c8202221c4 100644 --- a/config/custom_config.default.php +++ b/config/custom_config.default.php @@ -67,6 +67,11 @@ ], ], + 'App' => [ + //* BE AWARE: NO TRAILING SLASH! + 'fullBaseUrl' => false, + ], + 'app' => [ 'discourseSsoEnabled' => false, @@ -76,12 +81,6 @@ */ 'discourseSsoSecret' => '', - /** - * your host's name, eg. http://www.yourfoodcoop.com - * BE AWARE: NO TRAILING SLASH! - */ - 'cakeServerName' => '', - /** * cronjob needs to be activated / deactivated too if you change emailOrderReminderEnabled * @see https://foodcoopshop.github.io/en/cronjobs diff --git a/config/custom_config.dev.php b/config/custom_config.dev.php index 056edaddc6..3b3343135a 100644 --- a/config/custom_config.dev.php +++ b/config/custom_config.dev.php @@ -75,6 +75,11 @@ ], ], + 'App' => [ + //* BE AWARE: NO TRAILING SLASH! + 'fullBaseUrl' => 'http://localhost', + ], + 'app' => [ 'discourseSsoEnabled' => false, @@ -84,12 +89,6 @@ */ 'discourseSsoSecret' => '', - /** - * your host's name, eg. http://www.yourfoodcoop.com - * BE AWARE: NO TRAILING SLASH! - */ - 'cakeServerName' => 'https://localhost', - /** * cronjob needs to be activated / deactivated too if you change emailOrderReminderEnabled * @see https://foodcoopshop.github.io/en/cronjobs diff --git a/plugins/Admin/src/Controller/BlogPostsController.php b/plugins/Admin/src/Controller/BlogPostsController.php index ff79966b97..635c08f23a 100644 --- a/plugins/Admin/src/Controller/BlogPostsController.php +++ b/plugins/Admin/src/Controller/BlogPostsController.php @@ -113,7 +113,7 @@ private function _processForm($blogPost, $isEditMode) $this->set('manufacturersForDropdown', $this->Manufacturer->getForDropdown()); $_SESSION['ELFINDER'] = [ - 'uploadUrl' => Configure::read('app.cakeServerName') . "/files/kcfinder/blog_posts", + 'uploadUrl' => Configure::read('App.fullBaseUrl') . "/files/kcfinder/blog_posts", 'uploadPath' => $_SERVER['DOCUMENT_ROOT'] . "/files/kcfinder/blog_posts" ]; diff --git a/plugins/Admin/src/Controller/ConfigurationsController.php b/plugins/Admin/src/Controller/ConfigurationsController.php index 3a944a9070..8ddb8fd888 100644 --- a/plugins/Admin/src/Controller/ConfigurationsController.php +++ b/plugins/Admin/src/Controller/ConfigurationsController.php @@ -53,7 +53,7 @@ public function edit($configurationId) if (in_array($configuration->type, ['textarea_big'])) { $_SESSION['ELFINDER'] = [ - 'uploadUrl' => Configure::read('app.cakeServerName') . "/files/kcfinder/configurations/", + 'uploadUrl' => Configure::read('App.fullBaseUrl') . "/files/kcfinder/configurations/", 'uploadPath' => $_SERVER['DOCUMENT_ROOT'] . "/files/kcfinder/configurations/" ]; } diff --git a/plugins/Admin/src/Controller/ManufacturersController.php b/plugins/Admin/src/Controller/ManufacturersController.php index b59feda672..498d8cd465 100644 --- a/plugins/Admin/src/Controller/ManufacturersController.php +++ b/plugins/Admin/src/Controller/ManufacturersController.php @@ -99,7 +99,7 @@ public function edit($manufacturerId) } $_SESSION['ELFINDER'] = [ - 'uploadUrl' => Configure::read('app.cakeServerName') . "/files/kcfinder/manufacturers/" . $manufacturerId, + 'uploadUrl' => Configure::read('App.fullBaseUrl') . "/files/kcfinder/manufacturers/" . $manufacturerId, 'uploadPath' => $_SERVER['DOCUMENT_ROOT'] . "/files/kcfinder/manufacturers/" . $manufacturerId ]; @@ -256,7 +256,7 @@ public function setElFinderUploadPath($manufacturerId) } $_SESSION['ELFINDER'] = [ - 'uploadUrl' => Configure::read('app.cakeServerName') . "/files/kcfinder/manufacturers/" . $manufacturerId, + 'uploadUrl' => Configure::read('App.fullBaseUrl') . "/files/kcfinder/manufacturers/" . $manufacturerId, 'uploadPath' => $_SERVER['DOCUMENT_ROOT'] . "/files/kcfinder/manufacturers/" . $manufacturerId ]; diff --git a/plugins/Admin/src/Controller/OrderDetailsController.php b/plugins/Admin/src/Controller/OrderDetailsController.php index 70e2cfbdf3..a7d6e8108e 100644 --- a/plugins/Admin/src/Controller/OrderDetailsController.php +++ b/plugins/Admin/src/Controller/OrderDetailsController.php @@ -1966,7 +1966,7 @@ public function setElFinderUploadPath($orderDetailId) $this->RequestHandler->renderAs($this, 'json'); $_SESSION['ELFINDER'] = [ - 'uploadUrl' => Configure::read('app.cakeServerName') . "/files/kcfinder/order_details/" . $orderDetailId, + 'uploadUrl' => Configure::read('App.fullBaseUrl') . "/files/kcfinder/order_details/" . $orderDetailId, 'uploadPath' => $_SERVER['DOCUMENT_ROOT'] . "/files/kcfinder/order_details/" . $orderDetailId ]; diff --git a/plugins/Admin/src/Controller/PagesController.php b/plugins/Admin/src/Controller/PagesController.php index dce21c99a5..f2a9708e63 100644 --- a/plugins/Admin/src/Controller/PagesController.php +++ b/plugins/Admin/src/Controller/PagesController.php @@ -99,7 +99,7 @@ public function edit($pageId) private function _processForm($page, $isEditMode) { $_SESSION['ELFINDER'] = [ - 'uploadUrl' => Configure::read('app.cakeServerName') . "/files/kcfinder/pages", + 'uploadUrl' => Configure::read('App.fullBaseUrl') . "/files/kcfinder/pages", 'uploadPath' => $_SERVER['DOCUMENT_ROOT'] . "/files/kcfinder/pages" ]; $this->set('pagesForSelect', $this->Page->getForSelect($page->id_page)); diff --git a/plugins/Admin/templates/Configurations/index.php b/plugins/Admin/templates/Configurations/index.php index 3a9bf61e10..417a8718ef 100644 --- a/plugins/Admin/templates/Configurations/index.php +++ b/plugins/Admin/templates/Configurations/index.php @@ -239,8 +239,8 @@ - - + + @@ -381,27 +381,27 @@ - + - + - + - + - + diff --git a/plugins/Admin/templates/Manufacturers/index.php b/plugins/Admin/templates/Manufacturers/index.php index 49455abdc0..e24e6fe88f 100644 --- a/plugins/Admin/templates/Manufacturers/index.php +++ b/plugins/Admin/templates/Manufacturers/index.php @@ -25,7 +25,7 @@ Configure::read('app.jsNamespace') . ".Admin.init();" . Configure::read('app.jsNamespace') . ".Admin.initEmailToAllButton();" . Configure::read('app.jsNamespace') . ".ModalImage.init('a.open-with-modal');" . - Configure::read('app.jsNamespace') . ".Helper.setCakeServerName('" . Configure::read('app.cakeServerName') . "');". + Configure::read('app.jsNamespace') . ".Helper.setFullBaseUrl('" . Configure::read('App.fullBaseUrl') . "');". Configure::read('app.jsNamespace') . ".Helper.initTooltip('.manufacturer-details-read-button, .manufacturer-email-button, .test-order-list, .no-delivery-days-button, .feedback-button');" ]); $this->element('highlightRowAfterEdit', [ diff --git a/plugins/Admin/templates/OrderDetails/index.php b/plugins/Admin/templates/OrderDetails/index.php index fc528d04af..01821e305e 100644 --- a/plugins/Admin/templates/OrderDetails/index.php +++ b/plugins/Admin/templates/OrderDetails/index.php @@ -22,7 +22,7 @@ 'script' => Configure::read('app.jsNamespace') . ".Helper.initDatepicker(); $('input.datepicker').datepicker();". Configure::read('app.jsNamespace').".Admin.init();" . - Configure::read('app.jsNamespace').".Helper.setCakeServerName('" . Configure::read('app.cakeServerName') . "');" . + Configure::read('app.jsNamespace').".Helper.setFullBaseUrl('" . Configure::read('App.fullBaseUrl') . "');" . Configure::read('app.jsNamespace').".Helper.setIsManufacturer(" . $appAuth->isManufacturer() . ");" . Configure::read('app.jsNamespace').".Admin.selectMainMenuAdmin('".__d('admin', 'Orders')."');" . Configure::read('app.jsNamespace').".Admin.initProductDropdown(" . ($productId != '' ? $productId : '0') . ", " . ($manufacturerId != '' ? $manufacturerId : '0') . ");". diff --git a/plugins/Admin/templates/email/html/accounting_information_invoices_sent.php b/plugins/Admin/templates/email/html/accounting_information_invoices_sent.php index ec5b39a618..202e7929b4 100644 --- a/plugins/Admin/templates/email/html/accounting_information_invoices_sent.php +++ b/plugins/Admin/templates/email/html/accounting_information_invoices_sent.php @@ -34,14 +34,14 @@


MyTime->formatToDateShort($cronjobRunDay); ?> - Slug->getActionLogsList() . '?types[]=cronjob_send_invoices&dateFrom='.$formattedCurrentDay.'&dateTo='.$formattedCurrentDay; ?> + Slug->getActionLogsList() . '?types[]=cronjob_send_invoices&dateFrom='.$formattedCurrentDay.'&dateTo='.$formattedCurrentDay; ?>

MyHtml->paymentIsCashless()) { ?>


- Slug->getReport('product'); ?> + Slug->getReport('product'); ?>

diff --git a/plugins/Admin/templates/email/html/check_credit_balance.php b/plugins/Admin/templates/email/html/check_credit_balance.php index 8a114eca0c..d03941c51c 100644 --- a/plugins/Admin/templates/email/html/check_credit_balance.php +++ b/plugins/Admin/templates/email/html/check_credit_balance.php @@ -35,7 +35,7 @@


- Slug->getMyCreditBalance(); ?> + Slug->getMyCreditBalance(); ?>

- : Slug->getCustomerProfile(); ?> + : Slug->getCustomerProfile(); ?>

diff --git a/plugins/Admin/templates/email/html/credit_csv_upload_successful.php b/plugins/Admin/templates/email/html/credit_csv_upload_successful.php index be54cffbf3..7c1061dade 100644 --- a/plugins/Admin/templates/email/html/credit_csv_upload_successful.php +++ b/plugins/Admin/templates/email/html/credit_csv_upload_successful.php @@ -36,7 +36,7 @@

- : Slug->getCustomerProfile(); ?> + : Slug->getCustomerProfile(); ?>

diff --git a/plugins/Admin/templates/email/html/email_order_reminder.php b/plugins/Admin/templates/email/html/email_order_reminder.php index 50bac8ebdc..6656dca62a 100644 --- a/plugins/Admin/templates/email/html/email_order_reminder.php +++ b/plugins/Admin/templates/email/html/email_order_reminder.php @@ -26,15 +26,15 @@


- //addLastOrderToCart + //addLastOrderToCart

- :
+ :

- : Slug->getCustomerProfile(); ?> + : Slug->getCustomerProfile(); ?>

diff --git a/plugins/Admin/templates/email/html/payment_status_changed.php b/plugins/Admin/templates/email/html/payment_status_changed.php index 0fe658bebc..f9690de31b 100644 --- a/plugins/Admin/templates/email/html/payment_status_changed.php +++ b/plugins/Admin/templates/email/html/payment_status_changed.php @@ -48,7 +48,7 @@


- Slug->getMyCreditBalance(); ?> + Slug->getMyCreditBalance(); ?>

diff --git a/plugins/Admin/templates/email/html/pickup_reminder.php b/plugins/Admin/templates/email/html/pickup_reminder.php index a16f304d86..bca38b4db0 100644 --- a/plugins/Admin/templates/email/html/pickup_reminder.php +++ b/plugins/Admin/templates/email/html/pickup_reminder.php @@ -37,7 +37,7 @@

- : Slug->getCustomerProfile(); ?> + : Slug->getCustomerProfile(); ?>

diff --git a/plugins/Admin/templates/email/html/send_cancellation_invoice_to_customer.php b/plugins/Admin/templates/email/html/send_cancellation_invoice_to_customer.php index e3494271b3..fad35a8c10 100644 --- a/plugins/Admin/templates/email/html/send_cancellation_invoice_to_customer.php +++ b/plugins/Admin/templates/email/html/send_cancellation_invoice_to_customer.php @@ -32,7 +32,7 @@

- : Slug->getCustomerProfile(); ?> + : Slug->getCustomerProfile(); ?>

diff --git a/plugins/Admin/templates/email/html/send_invoice_to_customer.php b/plugins/Admin/templates/email/html/send_invoice_to_customer.php index 476f6fbf95..76287db38e 100644 --- a/plugins/Admin/templates/email/html/send_invoice_to_customer.php +++ b/plugins/Admin/templates/email/html/send_invoice_to_customer.php @@ -38,7 +38,7 @@

- : Slug->getCustomerProfile(); ?> + : Slug->getCustomerProfile(); ?>

diff --git a/plugins/Admin/templates/email/html/send_order_list.php b/plugins/Admin/templates/email/html/send_order_list.php index 5ee19a051b..21523bb414 100644 --- a/plugins/Admin/templates/email/html/send_order_list.php +++ b/plugins/Admin/templates/email/html/send_order_list.php @@ -30,7 +30,7 @@

- : /admin + : /admin

diff --git a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditPickupDayTest.php b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditPickupDayTest.php index 3da7767460..04dae0f2ef 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditPickupDayTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditPickupDayTest.php @@ -59,7 +59,7 @@ public function testEditPickupDayAsSuperadminOkIsSubscribeNewsletterLinkAddedToM $this->editPickupDayOfOrderDetails([$this->orderDetailIdA, $this->orderDetailIdB], '2018-09-07', $reason, true); $this->assertJsonOk(); $this->runAndAssertQueue(); - $this->assertMailContainsAt(0, 'Du kannst unseren Newsletter im Admin-Bereich unter "Meine Daten" abonnieren.'); + $this->assertMailContainsAt(0, 'Du kannst unseren Newsletter im Admin-Bereich unter "Meine Daten" abonnieren.'); } public function testEditPickupDayAsSuperadminWithoutEmailsOk() diff --git a/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableTest.php b/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableTest.php index 0fbf6f7a4c..75b48f3c49 100644 --- a/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableTest.php +++ b/plugins/Admin/tests/TestCase/src/Model/Table/ProductsTableTest.php @@ -89,7 +89,7 @@ public function testChangeImageInvalidImage() { $productId = 346; $products = [ - [$productId => Configure::read('app.cakeServerName') . '/css/global.css'] + [$productId => Configure::read('App.fullBaseUrl') . '/css/global.css'] ]; $exceptionThrown = false; @@ -106,7 +106,7 @@ public function testChangeImageNonExistingFile() { $productId = 346; $products = [ - [$productId => Configure::read('app.cakeServerName') . '/img/tests/non-existing-file.jpg'] + [$productId => Configure::read('App.fullBaseUrl') . '/img/tests/non-existing-file.jpg'] ]; $exceptionThrown = false; diff --git a/plugins/Admin/webroot/js/modal/modal-order-for-different-customer-add.js b/plugins/Admin/webroot/js/modal/modal-order-for-different-customer-add.js index 90680fcfa3..a850e7afd2 100644 --- a/plugins/Admin/webroot/js/modal/modal-order-for-different-customer-add.js +++ b/plugins/Admin/webroot/js/modal/modal-order-for-different-customer-add.js @@ -83,7 +83,7 @@ foodcoopshop.ModalIOrderForDifferentCustomerAdd = { // always preselect user if there is a dropdown called #customerId (for call from order detail) var customerId = $('#customerid').val(); foodcoopshop.Admin.initCustomerDropdown(customerId, 0, 0, customerDropdownSelector, function () { - var newSrc = foodcoopshop.Helper.cakeServerName + iframeSrcInit + '/' + $(customerDropdownSelector).val(); + var newSrc = foodcoopshop.Helper.fullBaseUrl + iframeSrcInit + '/' + $(customerDropdownSelector).val(); $(modalSelector + ' iframe').attr('src', newSrc); }); @@ -92,7 +92,7 @@ foodcoopshop.ModalIOrderForDifferentCustomerAdd = { // START IFRAME var iframe = $(''); - iframe.attr('src', foodcoopshop.Helper.cakeServerName + iframeSrc); + iframe.attr('src', foodcoopshop.Helper.fullBaseUrl + iframeSrc); iframe.css('width', '100%'); iframe.css('border', 'none'); $(modalSelector + ' .modal-body').append(iframe); diff --git a/plugins/Network/src/Controller/ApiController.php b/plugins/Network/src/Controller/ApiController.php index 91d1a70772..d0154279a8 100644 --- a/plugins/Network/src/Controller/ApiController.php +++ b/plugins/Network/src/Controller/ApiController.php @@ -387,7 +387,7 @@ public function updateProducts() $this->set([ 'app' => [ 'name' => $this->getInstallationName(), - 'domain' => Configure::read('app.cakeServerName') + 'domain' => Configure::read('App.fullBaseUrl') ], 'status' => count($syncFieldsError) == 0, 'msg' => $message, @@ -399,7 +399,7 @@ public function updateProducts() private function getInstallationName() { - return Configure::check('appDb.FCS_APP_NAME') ? Configure::read('appDb.FCS_APP_NAME') : Configure::read('app.cakeServerName'); + return Configure::check('appDb.FCS_APP_NAME') ? Configure::read('appDb.FCS_APP_NAME') : Configure::read('App.fullBaseUrl'); } public function getProducts() @@ -416,7 +416,7 @@ public function getProducts() $this->set([ 'app' => [ 'name' => $this->getInstallationName(), - 'domain' => Configure::read('app.cakeServerName'), + 'domain' => Configure::read('App.fullBaseUrl'), 'variableMemberFee' => $variableMemberFee ], 'loggedUser' => $this->AppAuth->user(), diff --git a/plugins/Network/src/Controller/SyncsController.php b/plugins/Network/src/Controller/SyncsController.php index 3ab5812f4d..365429ef83 100644 --- a/plugins/Network/src/Controller/SyncsController.php +++ b/plugins/Network/src/Controller/SyncsController.php @@ -134,7 +134,7 @@ public function products() 'products' => $matchedProducts, 'app' => [ 'name' => Configure::read('appDb.FCS_APP_NAME'), - 'domain' => Configure::read('app.cakeServerName') + 'domain' => Configure::read('App.fullBaseUrl') ] ]; $localResponse = json_decode(json_encode($localResponse), true); diff --git a/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php b/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php index 8b60c94743..144dcd1981 100644 --- a/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php +++ b/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php @@ -60,7 +60,7 @@ public function testGetProductsAsManufacturer() $preparedResponse = str_replace( [ DeliveryRhythm::getDbFormattedPickupDayByDbFormattedDate(date('Y-m-d')), - json_encode(Configure::read('app.cakeServerName')), + json_encode(Configure::read('App.fullBaseUrl')), ], [ '2020-01-17', diff --git a/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php b/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php index 76e812aa23..836e127153 100644 --- a/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php +++ b/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php @@ -36,7 +36,7 @@ public function setUp(): void protected function correctSyncDomain() { - $this->dbConnection->query("UPDATE fcs_sync_domains SET domain = REPLACE(domain, '{{serverName}}', '" . Configure::read('app.cakeServerName') . "');"); + $this->dbConnection->query("UPDATE fcs_sync_domains SET domain = REPLACE(domain, '{{serverName}}', '" . Configure::read('App.fullBaseUrl') . "');"); } public function testDenyAccessIfVariableMemberFeeEnabled() @@ -91,7 +91,7 @@ public function testSaveProductAssociationForProductThatIsNotOwnedByLoggedInManu $productId = 47; // joghurt, owner: milk manufactuer $productName = 'Joghurt'; - $response = $this->saveProductRelation($productId, $productId, $productName, Configure::read('app.cakeServerName')); + $response = $this->saveProductRelation($productId, $productId, $productName, Configure::read('App.fullBaseUrl')); $this->assertFalse((boolean) $response->status); $this->assertRegExpWithUnquotedString('product ' . $productId . ' is not associated with manufacturer ' . $manufacturerId, $response->msg); @@ -105,12 +105,12 @@ public function testCorrectSaveProductAssociation() $productId = 339; $productName = 'Kartoffel'; - $response = $this->saveProductRelation($productId, $productId, $productName, Configure::read('app.cakeServerName')); + $response = $this->saveProductRelation($productId, $productId, $productName, Configure::read('App.fullBaseUrl')); $this->assertTrue($response->status); $this->assertNotEmpty($response->product); $this->assertEquals($response->product->localProductId, $productId); $this->assertEquals($response->product->remoteProductId, $productId); - $this->assertEquals($response->product->domain, Configure::read('app.cakeServerName')); + $this->assertEquals($response->product->domain, Configure::read('App.fullBaseUrl')); $this->assertEquals($response->product->productName, strip_tags($productName, '')); $this->assertResponseOk(); } @@ -122,7 +122,7 @@ public function testCorrectDeleteProductAssociation() $productId = 339; $productName = 'Kartoffel'; - $this->saveProductRelation($productId, $productId, $productName, Configure::read('app.cakeServerName')); + $this->saveProductRelation($productId, $productId, $productName, Configure::read('App.fullBaseUrl')); $response = $this->deleteProductRelation($productId, $productId, $productName); $this->assertTrue($response->status); @@ -145,7 +145,7 @@ private function deleteProductRelation($localProductId, $remoteProductId, $produ [ 'localProductId' => $localProductId, 'remoteProductId' => $remoteProductId, - 'domain' => Configure::read('app.cakeServerName'), + 'domain' => Configure::read('App.fullBaseUrl'), 'productName' => $productName ] ]); diff --git a/src/Controller/Component/AppAuthComponent.php b/src/Controller/Component/AppAuthComponent.php index cdc42b40f8..5cee423643 100644 --- a/src/Controller/Component/AppAuthComponent.php +++ b/src/Controller/Component/AppAuthComponent.php @@ -258,7 +258,7 @@ public function isSelfServiceModeByReferer() '/' . __('route_cart') . '/ajaxRemove/' ]; if (isset($serverParams['HTTP_REFERER'])) { - $result = preg_match('`' . preg_quote(Configure::read('app.cakeServerName')) . '/' . __('route_self_service') . '`', $serverParams['HTTP_REFERER']); + $result = preg_match('`' . preg_quote(Configure::read('App.fullBaseUrl')) . '/' . __('route_self_service') . '`', $serverParams['HTTP_REFERER']); } if (!in_array($serverParams['REQUEST_URI'], $requestUriAllowed)) { $result = false; diff --git a/src/Controller/Component/CartComponent.php b/src/Controller/Component/CartComponent.php index 0165682457..7e034d9b64 100644 --- a/src/Controller/Component/CartComponent.php +++ b/src/Controller/Component/CartComponent.php @@ -542,7 +542,7 @@ public function finish() $message .= ' '.__('Sign_out').''; $message .= ' '.__('Continue_shopping').''; if (isset($invoiceRoute)) { - $message .= ' '.__('Print_receipt').''; + $message .= ' '.__('Print_receipt').''; } $messageForActionLog = __('{0}_has_placed_a_new_order_({1}).', [$this->AppAuth->getUsername(), Configure::read('app.numberHelper')->formatAsCurrency($this->getProductSum())]); @@ -786,7 +786,7 @@ private function sendStockAvailableLimitReachedEmailToManufacturer($cartId) 'stockAvailable' => $stockAvailable, 'manufacturer' => $cartProduct->product->manufacturer, 'showManufacturerName' => true, - 'notificationEditLink' => __('You_can_unsubscribe_this_email_in_the_settings_of_the_manufacturer.', [Configure::read('app.cakeServerName') . Configure::read('app.slugHelper')->getManufacturerEditOptions($cartProduct->product->id_manufacturer)]) + 'notificationEditLink' => __('You_can_unsubscribe_this_email_in_the_settings_of_the_manufacturer.', [Configure::read('App.fullBaseUrl') . Configure::read('app.slugHelper')->getManufacturerEditOptions($cartProduct->product->id_manufacturer)]) ]); $email->addToQueue(); } diff --git a/src/Controller/PagesController.php b/src/Controller/PagesController.php index 349599ce70..07338013b0 100644 --- a/src/Controller/PagesController.php +++ b/src/Controller/PagesController.php @@ -67,8 +67,8 @@ public function home() echo '

Please copy this Security => salt to your custom_config.php: '.hash('sha256', Security::randomBytes(64)).'

'; $securityErrors++; } - if (Configure::read('app.cakeServerName') == '') { - echo '

Please copy http://' . $_SERVER['HTTP_HOST'] . ' to custom_config.php

'; + if (Configure::read('App.fullBaseUrl') == '') { + echo '

Please copy ' . $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'] . ' to custom_config.php

'; $securityErrors++; } if ($securityErrors > 0) { diff --git a/src/Log/Engine/FileAndEmailLog.php b/src/Log/Engine/FileAndEmailLog.php index b8ac248c4d..5b8745771f 100644 --- a/src/Log/Engine/FileAndEmailLog.php +++ b/src/Log/Engine/FileAndEmailLog.php @@ -90,7 +90,7 @@ private function sendEmailWithErrorInformation($message) $loggedUser = $session->read('Auth'); } - $subject = Configure::read('app.cakeServerName') . ' ' . Text::truncate($message, 90) . ' ' . date(Configure::read('DateFormat.DatabaseWithTimeAlt')); + $subject = Configure::read('App.fullBaseUrl') . ' ' . Text::truncate($message, 90) . ' ' . date(Configure::read('DateFormat.DatabaseWithTimeAlt')); try { $email = new Mailer(false); $email->setProfile('debug'); diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index 3268e3bd01..d3cafd3d03 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -910,7 +910,7 @@ public function getProductsForBackend($appAuth, $productIds, $manufacturerId, $a $imageFile = Configure::read('app.htmlHelper')->removeTimestampFromFile($imageFile); if ($imageFile != '' && !preg_match('/de-default-home/', $imageFile) && file_exists($imageFile)) { $product->image->hash = sha1_file($imageFile); - $product->image->src = Configure::read('app.cakeServerName') . $imageSrc; + $product->image->src = Configure::read('App.fullBaseUrl') . $imageSrc; } } diff --git a/src/Shell/BackupDatabaseShell.php b/src/Shell/BackupDatabaseShell.php index ca63443b3c..4211589e8b 100644 --- a/src/Shell/BackupDatabaseShell.php +++ b/src/Shell/BackupDatabaseShell.php @@ -39,7 +39,7 @@ public function main() $dbConfig = ConnectionManager::getConfig('default'); $backupdir = ROOT . DS . 'files_private' . DS . 'db-backups'; - $preparedHostWithoutProtocol = Configure::read('app.htmlHelper')->getHostWithoutProtocol(Configure::read('app.cakeServerName')); + $preparedHostWithoutProtocol = Configure::read('app.htmlHelper')->getHostWithoutProtocol(Configure::read('App.fullBaseUrl')); $preparedHostWithoutProtocol = str_replace('www.', '', $preparedHostWithoutProtocol); $preparedHostWithoutProtocol = StringComponent::slugify($preparedHostWithoutProtocol); $filename = $backupdir . DS . $preparedHostWithoutProtocol . '-' . date('Y-m-d_H-i-s', time()) . '.bz2'; @@ -74,7 +74,7 @@ public function main() $email = new Mailer(false); $email->setProfile('debug'); $email->setTo(Configure::read('app.hostingEmail')) - ->setSubject($message . ': ' . Configure::read('app.cakeServerName')) + ->setSubject($message . ': ' . Configure::read('App.fullBaseUrl')) ->setAttachments([ $filename ]) diff --git a/src/Shell/SavedLocalizedJsAsStaticFileShell.php b/src/Shell/SavedLocalizedJsAsStaticFileShell.php index 860a7dde4c..92fd79755b 100644 --- a/src/Shell/SavedLocalizedJsAsStaticFileShell.php +++ b/src/Shell/SavedLocalizedJsAsStaticFileShell.php @@ -28,7 +28,7 @@ class SavedLocalizedJsAsStaticFileShell extends AppShell * * this script was written to be executed in the deploy process * in order to get the javascript content from the tmp installation - * (and not from app.cakeServerName where the new code is not yet available) + * (and not from App.fullBaseUrl where the new code is not yet available) * the built-in HttpClient from IntegrationTest is used * * run this script to generate a static file for production use diff --git a/templates/element/autoPrintInvoice.php b/templates/element/autoPrintInvoice.php index d3e2df4e2c..b9686fc238 100644 --- a/templates/element/autoPrintInvoice.php +++ b/templates/element/autoPrintInvoice.php @@ -17,7 +17,7 @@ if (!$isMobile && $this->request->getSession()->read('invoiceRouteForAutoPrint') != '') { $this->element('addScript', ['script' => - Configure::read('app.jsNamespace').".Helper.openPrintDialogForFile('".Configure::read('app.cakeServerName') . $this->request->getSession()->read('invoiceRouteForAutoPrint') . "');" + Configure::read('app.jsNamespace').".Helper.openPrintDialogForFile('".Configure::read('App.fullBaseUrl') . $this->request->getSession()->read('invoiceRouteForAutoPrint') . "');" ]); $this->request->getSession()->delete('invoiceRouteForAutoPrint'); } diff --git a/templates/element/email/profileLinks.php b/templates/element/email/profileLinks.php index 487e86c8ff..0fb83e87d1 100644 --- a/templates/element/email/profileLinks.php +++ b/templates/element/email/profileLinks.php @@ -17,7 +17,7 @@ ?>

:
- Slug->getLogin(); ?>

+ Slug->getLogin(); ?>

: address_customer->email; ?>
:

@@ -28,10 +28,10 @@

:
- Slug->getChangePassword(); ?> + Slug->getChangePassword(); ?>

:
- Slug->getCustomerProfile(); ?> + Slug->getCustomerProfile(); ?>

diff --git a/templates/element/legal/de_DE/directSelling/generalTermsAndConditions.php b/templates/element/legal/de_DE/directSelling/generalTermsAndConditions.php index bcec8e06eb..ee6e265c83 100644 --- a/templates/element/legal/de_DE/directSelling/generalTermsAndConditions.php +++ b/templates/element/legal/de_DE/directSelling/generalTermsAndConditions.php @@ -23,13 +23,13 @@

1. Geltung

-

1.1. Für alle gegenwärtigen und zukünftigen Leistungen, die der Betreiber im Rahmen seiner Internet-Dienstleistung unter der Domain für seine Nutzer erbringt (im Folgenden gemeinsam kurz: die Leistung), gelten ausschließlich die nachfolgenden Bedingungen.

+

1.1. Für alle gegenwärtigen und zukünftigen Leistungen, die der Betreiber im Rahmen seiner Internet-Dienstleistung unter der Domain für seine Nutzer erbringt (im Folgenden gemeinsam kurz: die Leistung), gelten ausschließlich die nachfolgenden Bedingungen.

1.2. Geschäftsbedingungen des Nutzers kommen nicht zur Anwendung.

2. Leistungen und Entgelte

-

2.1. Die vom Hersteller in der Plattform des Betreibers unter der Domain dargebotenen Waren und Leistungen sind eine unverbindliche Aufforderung des Herstellers an den Vertragspartner, ein verbindliches Anbot für die angebotenen Waren und Leistungen zu legen. Durch die Bestellung im Onlineshop legt der Vertragspartner ein solches verbindliches Anbot. Ein Vertrag zwischen dem Vertragspartner und dem Hersteller kommt erst zustande, wenn der Lieferant mit der Leistungserbringung begonnen hat oder die Waren zur Abholung bereitgelegt hat.

+

2.1. Die vom Hersteller in der Plattform des Betreibers unter der Domain dargebotenen Waren und Leistungen sind eine unverbindliche Aufforderung des Herstellers an den Vertragspartner, ein verbindliches Anbot für die angebotenen Waren und Leistungen zu legen. Durch die Bestellung im Onlineshop legt der Vertragspartner ein solches verbindliches Anbot. Ein Vertrag zwischen dem Vertragspartner und dem Hersteller kommt erst zustande, wenn der Lieferant mit der Leistungserbringung begonnen hat oder die Waren zur Abholung bereitgelegt hat.

2.2. Die auf der Website angegebenen Preise verstehen sich inklusive der gesetzlichen Steuer, jedoch exklusive der Verpackungs- und Versandkosten. Allfällige weitere Kosten (etwa Pfand) sind gesondert ausgewiesen.

@@ -54,7 +54,7 @@

5. Rücktrittsrecht

-

5.1. Informationen über das Rücktrittsrecht erhalten Sie hier.

+

5.1. Informationen über das Rücktrittsrecht erhalten Sie hier.

5.2. Der Lieferant wird von den alternativen Streitbeilegungsstellen "Online-Streitbeilegung" (https://webgate.ec.europa.eu/odr) sowie "Internetombudsmann" (www.ombudsmann.at) erfasst. Wenn der Vertragspartner ein Verbraucher ist, haben diese auf den genannten Plattformen die Möglichkeit, außergerichtliche Streitbeilegung durch eine unparteiische Schlichtungsstelle in Anspruch zu nehmen.

diff --git a/templates/element/legal/de_DE/directSelling/termsOfUse.php b/templates/element/legal/de_DE/directSelling/termsOfUse.php index e71df29c63..c3819c1429 100644 --- a/templates/element/legal/de_DE/directSelling/termsOfUse.php +++ b/templates/element/legal/de_DE/directSelling/termsOfUse.php @@ -23,7 +23,7 @@

1. Geltung

-

1.1. Für alle gegenwärtigen und zukünftigen Leistungen, die der Betreiber im Rahmen ihrer Internet-Dienstleistung unter der Domain für seine Nutzer erbringt (im Folgenden gemeinsam kurz: die Leistung), gelten ausschließlich die nachfolgenden Bedingungen.

+

1.1. Für alle gegenwärtigen und zukünftigen Leistungen, die der Betreiber im Rahmen ihrer Internet-Dienstleistung unter der Domain für seine Nutzer erbringt (im Folgenden gemeinsam kurz: die Leistung), gelten ausschließlich die nachfolgenden Bedingungen.

1.2. Geschäftsbedingungen des Nutzers kommen nicht zur Anwendung.

@@ -45,7 +45,7 @@

4. Rücktrittsrecht

-

4.1. Der Nutzer schließt den Vertrag mit dem jeweiligen Hersteller direkt. Der Nutzer erhält Informationen über das Rücktrittsrecht hier. Grundsätzlich ist das Rücktrittsrecht für die Lieferung von Lebensmittel ausgeschlossen.

+

4.1. Der Nutzer schließt den Vertrag mit dem jeweiligen Hersteller direkt. Der Nutzer erhält Informationen über das Rücktrittsrecht hier. Grundsätzlich ist das Rücktrittsrecht für die Lieferung von Lebensmittel ausgeschlossen.

4.2. Der jeweilige Hersteller wird von den alternativen Streitbeilegungsstellen "Online-Streitbeilegung" (https://webgate.ec.europa.eu/odr) sowie "Internetombudsmann" (www.ombudsmann.at) erfasst. Der Nutzer hat auf den genannten Plattformen die Möglichkeit, außergerichtliche Streitbeilegung durch eine unparteiische Schlichtungsstelle in Anspruch zu nehmen.

diff --git a/templates/element/legal/de_DE/directSelling/termsOfUseForManufacturers.php b/templates/element/legal/de_DE/directSelling/termsOfUseForManufacturers.php index 5d9be25711..ff9238dc46 100644 --- a/templates/element/legal/de_DE/directSelling/termsOfUseForManufacturers.php +++ b/templates/element/legal/de_DE/directSelling/termsOfUseForManufacturers.php @@ -23,7 +23,7 @@

1. Geltung

-

1.1. Für alle gegenwärtigen und zukünftigen Leistungen, die der Betreiber im Rahmen ihrer Internet-Dienstleistung unter der Domain für den Hersteller erbringt (im Folgenden gemeinsam kurz: die Leistung), gelten ausschließlich die nachfolgenden Bedingungen.

+

1.1. Für alle gegenwärtigen und zukünftigen Leistungen, die der Betreiber im Rahmen ihrer Internet-Dienstleistung unter der Domain für den Hersteller erbringt (im Folgenden gemeinsam kurz: die Leistung), gelten ausschließlich die nachfolgenden Bedingungen.

1.2. Geschäftsbedingungen des Herstellers kommen nicht zur Anwendung.

diff --git a/templates/element/legal/de_DE/retail/generalTermsAndConditions.php b/templates/element/legal/de_DE/retail/generalTermsAndConditions.php index 9391eae4fd..499a1dba6f 100644 --- a/templates/element/legal/de_DE/retail/generalTermsAndConditions.php +++ b/templates/element/legal/de_DE/retail/generalTermsAndConditions.php @@ -45,7 +45,7 @@

4. Rücktrittsrecht

-

4.1. Der Nutzer schließt den Vertrag mit dem Betreiber. Der Nutzer erhält Informationen über das Rücktrittsrecht hier. Grundsätzlich ist das Rücktrittsrecht für die Lieferung von Lebensmittel ausgeschlossen.

+

4.1. Der Nutzer schließt den Vertrag mit dem Betreiber. Der Nutzer erhält Informationen über das Rücktrittsrecht hier. Grundsätzlich ist das Rücktrittsrecht für die Lieferung von Lebensmittel ausgeschlossen.

4.2. Der Betreiber wird von den alternativen Streitbeilegungsstellen "Online-Streitbeilegung" (https://webgate.ec.europa.eu/odr) sowie "Internetombudsmann" (www.ombudsmann.at) erfasst. Der Nutzer hat auf den genannten Plattformen die Möglichkeit, außergerichtliche Streitbeilegung durch eine unparteiische Schlichtungsstelle in Anspruch zu nehmen.

diff --git a/templates/element/legal/de_DE/retail/termsOfUse.php b/templates/element/legal/de_DE/retail/termsOfUse.php index abbdbef573..0fd6bebc85 100644 --- a/templates/element/legal/de_DE/retail/termsOfUse.php +++ b/templates/element/legal/de_DE/retail/termsOfUse.php @@ -23,7 +23,7 @@

1. Geltung

-

1.1. Für alle gegenwärtigen und zukünftigen Leistungen, die der Betreiber im Rahmen ihrer Internet-Dienstleistung unter der Domain für seine Nutzer erbringt (im Folgenden gemeinsam kurz: die Leistung), gelten ausschließlich die nachfolgenden Bedingungen.

+

1.1. Für alle gegenwärtigen und zukünftigen Leistungen, die der Betreiber im Rahmen ihrer Internet-Dienstleistung unter der Domain für seine Nutzer erbringt (im Folgenden gemeinsam kurz: die Leistung), gelten ausschließlich die nachfolgenden Bedingungen.

1.2. Geschäftsbedingungen des Nutzers kommen nicht zur Anwendung.

@@ -49,7 +49,7 @@

4. Rücktrittsrecht

-

4.1. Der Nutzer schließt den Vertrag mit dem Betreiber. Der Nutzer erhält Informationen über das Rücktrittsrecht hier. Grundsätzlich ist das Rücktrittsrecht für die Lieferung von Lebensmittel ausgeschlossen.

+

4.1. Der Nutzer schließt den Vertrag mit dem Betreiber. Der Nutzer erhält Informationen über das Rücktrittsrecht hier. Grundsätzlich ist das Rücktrittsrecht für die Lieferung von Lebensmittel ausgeschlossen.

4.2. Der Betreiber wird von den alternativen Streitbeilegungsstellen "Online-Streitbeilegung" (https://webgate.ec.europa.eu/odr) sowie "Internetombudsmann" (www.ombudsmann.at) erfasst. Der Nutzer hat auf den genannten Plattformen die Möglichkeit, außergerichtliche Streitbeilegung durch eine unparteiische Schlichtungsstelle in Anspruch zu nehmen.

diff --git a/templates/element/legal/de_DE/retail/termsOfUseForManufacturers.php b/templates/element/legal/de_DE/retail/termsOfUseForManufacturers.php index 19ff7632a4..51246b7d1e 100644 --- a/templates/element/legal/de_DE/retail/termsOfUseForManufacturers.php +++ b/templates/element/legal/de_DE/retail/termsOfUseForManufacturers.php @@ -23,7 +23,7 @@

1. Geltung

-

1.1. Für alle gegenwärtigen und zukünftigen Leistungen, die der Betreiber im Rahmen ihrer Internet-Dienstleistung unter der Domain für den Hersteller erbringt (im Folgenden gemeinsam kurz: die Leistung), gelten ausschließlich die nachfolgenden Bedingungen.

+

1.1. Für alle gegenwärtigen und zukünftigen Leistungen, die der Betreiber im Rahmen ihrer Internet-Dienstleistung unter der Domain für den Hersteller erbringt (im Folgenden gemeinsam kurz: die Leistung), gelten ausschließlich die nachfolgenden Bedingungen.

1.2. Geschäftsbedingungen des Herstellers kommen nicht zur Anwendung.

diff --git a/templates/email/html/customer_registered_active.php b/templates/email/html/customer_registered_active.php index a8e9e0cb36..c84c59a72d 100644 --- a/templates/email/html/customer_registered_active.php +++ b/templates/email/html/customer_registered_active.php @@ -27,7 +27,7 @@

:
- Slug->getActivateEmailAddress($data->activate_email_code); ?> + Slug->getActivateEmailAddress($data->activate_email_code); ?>

diff --git a/templates/email/html/customer_registered_notification.php b/templates/email/html/customer_registered_notification.php index 806c44a774..dd2293b2dc 100644 --- a/templates/email/html/customer_registered_notification.php +++ b/templates/email/html/customer_registered_notification.php @@ -25,7 +25,7 @@

'.$data->firstname . ' ' . $data->lastname . '', $data->email, ''.$data->address_customer->city.'']); ?>

- +

: diff --git a/templates/email/html/new_password_request_successful.php b/templates/email/html/new_password_request_successful.php index 520d1cb2c4..20c438a6b3 100644 --- a/templates/email/html/new_password_request_successful.php +++ b/templates/email/html/new_password_request_successful.php @@ -26,7 +26,7 @@

:
- Slug->getActivateNewPassword($activateNewPasswordCode); ?> + Slug->getActivateNewPassword($activateNewPasswordCode); ?>

diff --git a/templates/email/html/order_successful.php b/templates/email/html/order_successful.php index de44bd3091..2c24787b53 100644 --- a/templates/email/html/order_successful.php +++ b/templates/email/html/order_successful.php @@ -113,7 +113,7 @@ user('newsletter_enabled')) { echo ''; } ?> diff --git a/templates/email/html/order_successful_self_service.php b/templates/email/html/order_successful_self_service.php index 5655777271..a28fc978e4 100644 --- a/templates/email/html/order_successful_self_service.php +++ b/templates/email/html/order_successful_self_service.php @@ -80,7 +80,7 @@ user('newsletter_enabled')) { echo ''; } ?> diff --git a/templates/email/html/stock_available_limit_reached_notification.php b/templates/email/html/stock_available_limit_reached_notification.php index 2c004e85d6..925604749a 100644 --- a/templates/email/html/stock_available_limit_reached_notification.php +++ b/templates/email/html/stock_available_limit_reached_notification.php @@ -45,7 +45,7 @@ ' . $this->MyNumber->formatAsDecimal($stockAvailable->sold_out_limit, 0) . ''; ?>

- +

@@ -47,11 +47,11 @@ '; @@ -134,8 +137,8 @@ } $cronjobFilterString = $cronjobFilterString; echo $this->Html->link( - $this->Time->getWeekdayName($this->Time->formatAsWeekday($cronjob->cronjob_logs[0]->created->toUnixString())) . ', ' . - $cronjob->cronjob_logs[0]->created->i18nFormat($this->Time->getI18Format('DateNTimeShort')), + $this->Time->getWeekdayName($this->Time->formatAsWeekday((int) $cronjob->cronjob_logs[0]->created->toUnixString())) . ', ' . + $cronjob->cronjob_logs[0]->created->i18nFormat($this->Time->getI18Format('DateNTimeShort')), $this->Slug->getActionLogsList() . '/?dateFrom=' . date(Configure::read('app.timeHelper')->getI18Format('DateShortAlt'), strtotime('-3 month')) . '&types[]=' . $cronjobFilterString, ); } @@ -145,9 +148,9 @@ } echo ''; -echo ''; +echo ''; echo ''; echo '
'; if (!empty($cronjob->cronjob_logs[0])) { - echo $this->Time->getWeekdayName($this->Time->formatAsWeekday($cronjob->cronjob_logs[0]->created->toUnixString())) . ', '; - echo $cronjob->cronjob_logs[0]->created->i18nFormat($this->Time->getI18Format('DateNTimeShort')); + $name = $cronjob->getOriginalValues()['name']; + $cronjobFilterString = Inflector::underscore($name); + if (preg_match('/SendInvoices/', $name)) { + $cronjobFilterString = 'send_invoices'; + } + $cronjobFilterString = 'cronjob_' . $cronjobFilterString; + echo $this->Html->link( + $this->Time->getWeekdayName($this->Time->formatAsWeekday($cronjob->cronjob_logs[0]->created->toUnixString())) . ', ' . + $cronjob->cronjob_logs[0]->created->i18nFormat($this->Time->getI18Format('DateNTimeShort')), + $this->Slug->getActionLogsList() . '/?dateFrom=' . date(Configure::read('app.timeHelper')->getI18Format('DateShortAlt'), strtotime('-3 month')) . '&types[]=' . $cronjobFilterString, + ); } echo '
'; - echo $cronjob->day_of_month; + if ($cronjob->day_of_month != '') { + $cm = FactoryLocator::get('Table')->get('Cronjobs'); + echo $cm->getDaysOfMonth()[$cronjob->day_of_month]; + } echo ''; From 6888620f1723d12c721ae29f63ef7dfcf139d01a Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 20 Sep 2022 09:49:45 +0200 Subject: [PATCH 077/646] link to correct invoice cronjob --- plugins/Admin/templates/Cronjobs/index.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/Admin/templates/Cronjobs/index.php b/plugins/Admin/templates/Cronjobs/index.php index 9d115f75c2..55f8c4de9f 100644 --- a/plugins/Admin/templates/Cronjobs/index.php +++ b/plugins/Admin/templates/Cronjobs/index.php @@ -123,10 +123,14 @@ if (!empty($cronjob->cronjob_logs[0])) { $name = $cronjob->getOriginalValues()['name']; $cronjobFilterString = Inflector::underscore($name); - if (preg_match('/SendInvoices/', $name)) { + if (preg_match('/SendInvoicesToManufacturers/', $name)) { $cronjobFilterString = 'send_invoices'; } $cronjobFilterString = 'cronjob_' . $cronjobFilterString; + if (preg_match('/SendInvoicesToCustomers/', $name)) { + $cronjobFilterString = 'invoice_added'; + } + $cronjobFilterString = $cronjobFilterString; echo $this->Html->link( $this->Time->getWeekdayName($this->Time->formatAsWeekday($cronjob->cronjob_logs[0]->created->toUnixString())) . ', ' . $cronjob->cronjob_logs[0]->created->i18nFormat($this->Time->getI18Format('DateNTimeShort')), From 0d8b742e6435d74f09deb671283d5f12e2c2bb3a Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 20 Sep 2022 11:08:30 +0200 Subject: [PATCH 078/646] archived blog posts were shown after order --- src/Controller/CartsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/CartsController.php b/src/Controller/CartsController.php index 6e9f2c7e15..5e15392d4a 100644 --- a/src/Controller/CartsController.php +++ b/src/Controller/CartsController.php @@ -132,7 +132,7 @@ public function orderSuccessful($cartId) $this->set('cart', $cart); $this->BlogPost = $this->getTableLocator()->get('BlogPosts'); - $blogPosts = $this->BlogPost->findBlogPosts($this->AppAuth); + $blogPosts = $this->BlogPost->findBlogPosts($this->AppAuth, null, true); $this->set('blogPosts', $blogPosts); $this->set('title_for_layout', __('Your_order_has_been_placed')); From 5ba49d4362a51e1bdcc594c915301f0baf9cb59f Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Fri, 23 Sep 2022 20:11:26 +0200 Subject: [PATCH 079/646] Docker Dev Environment (#876) * initial docker for dev * phpinfo * new structure * move in root dir * intl extension working * docker-dev * db settings * removed / * tmpfs mysql * dev * set fixed mysql credentials and add test data * use mysql port 3310 * replace with php-nginx * linux drive * add composer * add node * corrected port * pma upload limit * rename database * improvements * easier commands without -f * not working * necessary * do not login as root * folder rename * add docker dev * fixes * unneeded * fix * code cleaning * install ncu * add second database service for test database * fix * docker dev environment * fixes * enable calling update-translations.sh * add port * add initial db test data * obsolete * new strategy --- CHANGELOG.md | 3 + README.md | 3 +- config/app_config.php | 6 - .../docker-dev/database-dev/data/.gitignore | 2 + config/docker-dev/node/Dockerfile | 3 + config/docker-dev/php-nginx/Dockerfile | 3 + .../php-nginx/php-ini-overrides.ini | 2 + devtools/db_dump_all | 23 -- devtools/db_dump_common.php | 232 ------------------ devtools/db_dump_install.php | 25 -- devtools/db_dump_test.php | 25 -- devtools/get_mysql_cmd.php | 41 ---- devtools/get_mysqldump_cmd.php | 41 ---- devtools/git-pre-commit.sh | 0 devtools/pre-commit | 0 devtools/setup-git.sh | 0 devtools/update-translations.sh | 6 +- docker-compose.yml | 109 ++++++++ 18 files changed, 127 insertions(+), 397 deletions(-) create mode 100644 config/docker-dev/database-dev/data/.gitignore create mode 100644 config/docker-dev/node/Dockerfile create mode 100644 config/docker-dev/php-nginx/Dockerfile create mode 100644 config/docker-dev/php-nginx/php-ini-overrides.ini delete mode 100644 devtools/db_dump_all delete mode 100755 devtools/db_dump_common.php delete mode 100755 devtools/db_dump_install.php delete mode 100755 devtools/db_dump_test.php delete mode 100644 devtools/get_mysql_cmd.php delete mode 100644 devtools/get_mysqldump_cmd.php mode change 100755 => 100644 devtools/git-pre-commit.sh mode change 100755 => 100644 devtools/pre-commit mode change 100755 => 100644 devtools/setup-git.sh create mode 100644 docker-compose.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index b1e3e8892c..2481c4883b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,9 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe - Superadmins können Tag und Uhrzeit der Cronjobs (z.B. die automatische Bestell-Erinnerung, Rechnungsversand) jetzt selber im Admin-Bereich (Homepage-Verwaltung / Einstellungen / neuer Tab "Cronjobs") ändern. [I#860](https://github.com/foodcoopshop/foodcoopshop/issues/860) / [PR#74](https://github.com/foodcoopshop/foodcoopshop/pull/874) - Die Konfiguration "Freitag Bestellschluss / Samstag Bestelllisten-Versand / Donnerstag Abholtag" ist jetzt möglich. [I#866](https://github.com/foodcoopshop/foodcoopshop/issues/866) / [PR#867](https://github.com/foodcoopshop/foodcoopshop/pull/867) +### For developers +- 🐳 The new [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) makes contributing much easier. Try it out! [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) + # v3.5.0 diff --git a/README.md b/README.md index b42700bfc2..a1799398af 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,8 @@ Before installing don't forget to read the legal information in [German](https://foodcoopshop.github.io/de/rechtliches) or [English](https://foodcoopshop.github.io/en/legal-information). ## 🤖 Self-hosting / developing -Our [installation guide](https://foodcoopshop.github.io/en/installation-guide) helps you. +* 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment) +* [Installation guide](https://foodcoopshop.github.io/en/installation-guide) ## 😎 Maintainer [Mario Rothauer](https://github.com/mrothauer) started the project in 2014 and maintains it. diff --git a/config/app_config.php b/config/app_config.php index 6b89a4ec87..8df912008c 100644 --- a/config/app_config.php +++ b/config/app_config.php @@ -153,12 +153,6 @@ */ 'mysqlDumpCommand' => 'mysqldump', - /** - * if you work on windows, change to e.g - * '"C:\\Programme\\xampp\\mysql\\bin\\mysql.exe"' - */ - 'mysqlCommand' => 'mysql', - /** * date of the last update of terms of use */ diff --git a/config/docker-dev/database-dev/data/.gitignore b/config/docker-dev/database-dev/data/.gitignore new file mode 100644 index 0000000000..c96a04f008 --- /dev/null +++ b/config/docker-dev/database-dev/data/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/config/docker-dev/node/Dockerfile b/config/docker-dev/node/Dockerfile new file mode 100644 index 0000000000..becdecba62 --- /dev/null +++ b/config/docker-dev/node/Dockerfile @@ -0,0 +1,3 @@ +FROM node:18 + +RUN npm install -g npm-check-updates \ No newline at end of file diff --git a/config/docker-dev/php-nginx/Dockerfile b/config/docker-dev/php-nginx/Dockerfile new file mode 100644 index 0000000000..9c4939dfc5 --- /dev/null +++ b/config/docker-dev/php-nginx/Dockerfile @@ -0,0 +1,3 @@ +FROM webdevops/php-nginx:8.1 + +RUN apt-get update && apt-get install gettext-base && apt-get install gettext \ No newline at end of file diff --git a/config/docker-dev/php-nginx/php-ini-overrides.ini b/config/docker-dev/php-nginx/php-ini-overrides.ini new file mode 100644 index 0000000000..cbc3705d75 --- /dev/null +++ b/config/docker-dev/php-nginx/php-ini-overrides.ini @@ -0,0 +1,2 @@ +upload_max_filesize = 200M +post_max_size = 200M \ No newline at end of file diff --git a/devtools/db_dump_all b/devtools/db_dump_all deleted file mode 100644 index b80a18dedb..0000000000 --- a/devtools/db_dump_all +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash -# get the script dir -DIR=`php -r "echo dirname(realpath('$0'));"` - -###################################### -# -# HOW TO CREATE NEW DATABASE DUMPS (if a new migration was created) -# -# 1) rename database in default db config to "foodcoopshop_tmp" or whatever name -# 3) run devtools/db_dump_all - triggers error on first call as "foodcoopshop_tmp" does not exist yet. just ignore. -# 4) rename database in default db config to initial name -# 5) commit the modified database dumps -# -###################################### - - -source $(dirname $0)/locales.sh -for locale in "${LOCALES[@]}" -do - php -f $DIR/db_dump_install.php $locale -done - -php -f $DIR/db_dump_test.php de_DE diff --git a/devtools/db_dump_common.php b/devtools/db_dump_common.php deleted file mode 100755 index 16315b5195..0000000000 --- a/devtools/db_dump_common.php +++ /dev/null @@ -1,232 +0,0 @@ - - * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com - * @link https://www.foodcoopshop.com - */ - -if (!defined('DATASOURCE')) { - exit('Do not use directly.'); -} - -$tmpDbName = 'foodcoopshop_tmp'; - -$datasource = array( - 'PROD' => array( - 'structure' => 'config' . DS . 'sql' . DS . '_installation' . DS . 'clean-db-structure.sql', - 'data' => 'config' . DS . 'sql' . DS . '_installation' . DS . 'clean-db-data-' . $locale . '.sql', - ), - 'TEST' => array( - 'structure' => 'config' . DS . 'sql' . DS . '_installation' . DS . 'clean-db-structure.sql', - 'data' => 'tests' . DS . 'config' . DS . 'sql' . DS . 'test-db-data.sql', - ), -); - -echo 'Loading config for ' . DATASOURCE . ', locale: ' . $locale . ' '; - -// get the project dir from being in [project]/devtools/ -$dir = dirname(realpath(__DIR__)) . DS; - -// include DB config -$config = @include $dir . 'config' . DS . 'custom_config.php'; -$dbConfig = $config['Datasources']; - -if (DATASOURCE == 'PROD') { - if (empty($dbConfig['default'])) { - exit(PHP_EOL . 'Cannot read config' . DS . 'custom_config.php.' . PHP_EOL); - } - $db_conf = $dbConfig['default']; // use production DB -} - -if (DATASOURCE == 'TEST') { - if (empty($dbConfig['test'])) { - exit(PHP_EOL . 'Cannot read config' . DS . 'custom_config.php.' . PHP_EOL); - } - $db_conf = $dbConfig['test']; // use test DB -} - -if (empty($db_conf)) { - exit(PHP_EOL . 'Unknown datasource.' . PHP_EOL); -} - -echo 'done' . PHP_EOL; -echo 'Reading dump command...'; - -$unmodifiedStructureFile = $dir . 'devtools' . DS . 'unmodified-structure.sql'; -if (DATASOURCE == 'PROD' && $locale == 'de_DE') { - copy($dir . $datasource[DATASOURCE]['structure'], $unmodifiedStructureFile); -} -$mysqldump_cmd = ''; -$mysql_cmd = ''; -$lines = @file($dir . 'config' . DS . 'app_config.php'); -require('get_mysqldump_cmd.php'); -require('get_mysql_cmd.php'); - -if (file_exists($dir . 'config' . DS . 'custom_config.php')) { - $lines = @file($dir . 'config' . DS . 'custom_config.php'); - require('get_mysqldump_cmd.php'); - require('get_mysql_cmd.php'); -} - -echo 'done' . PHP_EOL; -echo 'Resetting database and executing migrations...'; -$cmd = sprintf('"%1$s" -h %2$s -u %3$s -p%4$s -e "DROP DATABASE %5$s;"', $mysql_cmd, $db_conf['host'], $db_conf['username'], $db_conf['password'], $tmpDbName); -exec($cmd); -$cmd = sprintf('"%1$s" -h %2$s -u %3$s -p%4$s -e "CREATE DATABASE %5$s;"', $mysql_cmd, $db_conf['host'], $db_conf['username'], $db_conf['password'], $tmpDbName); -exec($cmd); -$cmd = sprintf('"%1$s" -h %2$s -u %3$s -p%4$s %5$s < %6$s', $mysql_cmd, $db_conf['host'], $db_conf['username'], $db_conf['password'], $tmpDbName, $unmodifiedStructureFile); -exec($cmd); -$cmd = sprintf('"%1$s" -h %2$s -u %3$s -p%4$s %5$s < %6$s', $mysql_cmd, $db_conf['host'], $db_conf['username'], $db_conf['password'], $tmpDbName, $dir . $datasource[DATASOURCE]['data']); -exec($cmd); - -$cmd = 'bash ' . $dir . 'bin/cake migrations migrate'; -exec($cmd, $result); -foreach ($result as $line) { - echo PHP_EOL . $line; -} - -$cmd = 'bash ' . $dir . 'bin/cake migrations migrate -p Queue'; -exec($cmd, $result); -foreach ($result as $line) { - echo PHP_EOL . $line; -} - -echo PHP_EOL . 'Dumping structure...'; -$result = array(); -$cmd = sprintf('"%1$s" --host="%2$s" --user="%3$s" --password="%4$s" --no-create-db --no-data --events --routines --skip-opt --create-options --add-drop-table --disable-keys --extended-insert --quick --set-charset --quote-names --skip-comments --skip-add-locks --single-transaction --force --result-file="%5$s" %6$s 2>&1', $mysqldump_cmd, $db_conf['host'], $db_conf['username'], $db_conf['password'], $dir . $datasource[DATASOURCE]['structure'] . '.tmp', $tmpDbName); -exec($cmd, $result); - -foreach ($result as $line) { - echo PHP_EOL . $line; -} -if (!empty($result)) { - echo PHP_EOL; -} - -// check dump has a result file with some content of > 4k bytes (no error message should be that long) -clearstatcache(); -if (!is_readable($datasource[DATASOURCE]['structure'] . '.tmp') - || filesize($datasource[DATASOURCE]['structure'] . '.tmp') < 4096 -) { - exit(PHP_EOL . 'Structure not dumped. Seek for help!' . PHP_EOL); -} - -rename($datasource[DATASOURCE]['structure'] . '.tmp', $datasource[DATASOURCE]['structure']); - -echo 'done' . PHP_EOL; -echo 'Dumping data...'; - -$result = array(); -$cmd = sprintf('"%1$s" --host="%2$s" --user="%3$s" --password="%4$s" --no-create-info --skip-opt --create-options --disable-keys --extended-insert --quick --set-charset --quote-names --skip-comments --skip-add-locks --single-transaction --force --result-file="%5$s" %6$s 2>&1', $mysqldump_cmd, $db_conf['host'], $db_conf['username'], $db_conf['password'], $dir . $datasource[DATASOURCE]['data'] . '.tmp', $tmpDbName); -exec($cmd, $result); - -foreach ($result as $line) { - echo PHP_EOL . $line; -} -if (!empty($result)) { - echo PHP_EOL; -} - -// check dump has a result file with some content of > 4k bytes (no error message should be that long) -clearstatcache(); -if (!is_readable($datasource[DATASOURCE]['data'] . '.tmp') - || filesize($datasource[DATASOURCE]['data'] . '.tmp') < 4096 -) { - exit(PHP_EOL . 'Data not dumped. Seek for help!' . PHP_EOL); -} - -rename($datasource[DATASOURCE]['data'] . '.tmp', $datasource[DATASOURCE]['data']); - -echo 'done' . PHP_EOL; -echo 'Strip autoincrement value from structure dump...'; - -$infile = fopen($dir . $datasource[DATASOURCE]['structure'], 'rb'); -$outfile = fopen($dir . $datasource[DATASOURCE]['structure'] . '.tmp', 'wb'); -if ($infile === false) { - exit(PHP_EOL . 'Cannot open ' . $datasource[DATASOURCE]['structure'] . 'for reading' . PHP_EOL); -} -if ($outfile === false) { - exit(PHP_EOL . 'Cannot open ' . $datasource[DATASOURCE]['structure'] . '.tmp' . 'for writing' . PHP_EOL); -} - -while (!feof($infile)) { - $line = fgets($infile); - if (stripos($line, 'AUTO_INCREMENT=') !== false) { - $line = preg_replace('/AUTO_INCREMENT=[0-9]*/i', '', $line); - } - fwrite($outfile, $line); -} -fclose($infile); -fclose($outfile); - -rename($datasource[DATASOURCE]['structure'] . '.tmp', $datasource[DATASOURCE]['structure']); - -echo 'done' . PHP_EOL; -echo 'Insert line breaks into inserts in data dump...'; - -$infile = fopen($dir . $datasource[DATASOURCE]['data'], 'rb'); -$outfile = fopen($dir . $datasource[DATASOURCE]['data'] . '.tmp', 'wb'); -if ($infile === false) { - exit(PHP_EOL . 'Cannot open ' . $datasource[DATASOURCE]['data'] . 'for reading' . PHP_EOL); -} -if ($outfile === false) { - exit(PHP_EOL . 'Cannot open ' . $datasource[DATASOURCE]['data'] . '.tmp' . 'for writing' . PHP_EOL); -} - -while (!feof($infile)) { - $line = fgets($infile); - $line = str_replace('VALUES (', 'VALUES' . PHP_EOL . '(', $line); - $line = str_replace('),(', '),' . PHP_EOL . '(', $line); - fwrite($outfile, $line); -} -fclose($infile); -fclose($outfile); - -rename($datasource[DATASOURCE]['data'] . '.tmp', $datasource[DATASOURCE]['data']); - -echo 'done' . PHP_EOL; -echo 'Add table truncation to data dump...'; - -// get the table names from structure dump -$truncates = array(); -exec('grep -i -e "^CREATE TABLE" "' . $dir . $datasource[DATASOURCE]['structure'] . '"', $truncates); -foreach ($truncates as $k => $v) { - $truncates[$k] = str_ireplace(array('CREATE TABLE', ' ('), array('TRUNCATE TABLE', ';'), $v); -} - -$infile = fopen($dir . $datasource[DATASOURCE]['data'], 'rb'); -$outfile = fopen($dir . $datasource[DATASOURCE]['data'] . '.tmp', 'wb'); -if ($infile === false) { - exit(PHP_EOL . 'Cannot open ' . $datasource[DATASOURCE]['data'] . 'for reading' . PHP_EOL); -} -if ($outfile === false) { - exit(PHP_EOL . 'Cannot open ' . $datasource[DATASOURCE]['data'] . '.tmp' . 'for writing' . PHP_EOL); -} - -$done = false; -while (!feof($infile)) { - $line = fgets($infile); - if (!$done && (stripos($line, '/*!40000 ALTER TABLE') === 0)) { - $done = true; - fwrite($outfile, '-- Truncate tables before insertion' . PHP_EOL); - foreach ($truncates as $v) { - fwrite($outfile, $v . PHP_EOL); - } - fwrite($outfile, PHP_EOL); - } - fwrite($outfile, $line); -} -fclose($infile); -fclose($outfile); - -rename($datasource[DATASOURCE]['data'] . '.tmp', $datasource[DATASOURCE]['data']); - -echo 'done' . PHP_EOL; diff --git a/devtools/db_dump_install.php b/devtools/db_dump_install.php deleted file mode 100755 index 941f80a9bf..0000000000 --- a/devtools/db_dump_install.php +++ /dev/null @@ -1,25 +0,0 @@ - - * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com - * @link https://www.foodcoopshop.com - */ - -if (!defined('DATASOURCE')) { - define('DATASOURCE', 'PROD'); -} - -if (!defined('DS')) { - define('DS', DIRECTORY_SEPARATOR); -} - -$locale= $argv[1]; -include realpath(__DIR__) . DS . 'db_dump_common.php'; diff --git a/devtools/db_dump_test.php b/devtools/db_dump_test.php deleted file mode 100755 index cf6d9c06ab..0000000000 --- a/devtools/db_dump_test.php +++ /dev/null @@ -1,25 +0,0 @@ - - * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com - * @link https://www.foodcoopshop.com - */ - -if (!defined('DATASOURCE')) { - define('DATASOURCE', 'TEST'); -} - -if (!defined('DS')) { - define('DS', DIRECTORY_SEPARATOR); -} - -$locale= $argv[1]; -include realpath(__DIR__) . DS . 'db_dump_common.php'; diff --git a/devtools/get_mysql_cmd.php b/devtools/get_mysql_cmd.php deleted file mode 100644 index c26cc54cef..0000000000 --- a/devtools/get_mysql_cmd.php +++ /dev/null @@ -1,41 +0,0 @@ - - * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com - * @link https://www.foodcoopshop.com - */ - -if (!is_array($lines) - || empty($lines) - ) { - exit(PHP_EOL . 'Cannot load config' . DS . 'app_config.php.' . PHP_EOL); - } - - foreach ($lines as $line) { - if (($pos = strpos($line, '\'mysqlCommand\'')) !== false) { - $line = substr($line, $pos + strlen('\'mysqlCommand\',')); - $line = explode('\'', $line); - if (count($line) == 3) { - $mysql_cmd = $line[1]; - } else { - $mysql_cmd = $line[0]; - } - } - } - - if (empty($mysql_cmd)) { - exit(PHP_EOL . 'Cannot read mysqlCommand from Config' . DS . 'app_config.php.' . PHP_EOL); - } - - if (strpos($mysql_cmd, 'mysql') === false) { - exit(PHP_EOL . 'Cannot use mysqlCommand from Config' . DS . 'app_config.php. Must use mysql' . PHP_EOL); - } -?> \ No newline at end of file diff --git a/devtools/get_mysqldump_cmd.php b/devtools/get_mysqldump_cmd.php deleted file mode 100644 index d7b857fe7d..0000000000 --- a/devtools/get_mysqldump_cmd.php +++ /dev/null @@ -1,41 +0,0 @@ - - * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com - * @link https://www.foodcoopshop.com - */ - -if (!is_array($lines) - || empty($lines) - ) { - exit(PHP_EOL . 'Cannot load config' . DS . 'app_config.php.' . PHP_EOL); - } - - foreach ($lines as $line) { - if (($pos = strpos($line, '\'mysqlDumpCommand\'')) !== false) { - $line = substr($line, $pos + strlen('\'mysqlDumpCommand\',')); - $line = explode('\'', $line); - if (count($line) == 3) { - $mysqldump_cmd = $line[1]; - } else { - $mysqldump_cmd = $line[0]; - } - } - } - - if (empty($mysqldump_cmd)) { - exit(PHP_EOL . 'Cannot read mysqlDumpCommand from Config' . DS . 'app_config.php.' . PHP_EOL); - } - - if (strpos($mysqldump_cmd, 'mysqldump') === false) { - exit(PHP_EOL . 'Cannot use mysqlDumpCommand from Config' . DS . 'app_config.php. Must use mysqldump' . PHP_EOL); - } -?> \ No newline at end of file diff --git a/devtools/git-pre-commit.sh b/devtools/git-pre-commit.sh old mode 100755 new mode 100644 diff --git a/devtools/pre-commit b/devtools/pre-commit old mode 100755 new mode 100644 diff --git a/devtools/setup-git.sh b/devtools/setup-git.sh old mode 100755 new mode 100644 diff --git a/devtools/update-translations.sh b/devtools/update-translations.sh index 25f3a9f464..761d30544a 100644 --- a/devtools/update-translations.sh +++ b/devtools/update-translations.sh @@ -5,7 +5,7 @@ source $(dirname $0)/locales.sh #get and merge translations for main app #to extract core strings change --extract-core to "yes" -bin/cake i18n extract --output resources\\locales --paths config,src,templates --overwrite --extract-core no --merge no --no-location --exclude plugins +bash bin/cake i18n extract --output resources\\locales --paths config,src,templates --overwrite --extract-core no --merge no --no-location --exclude plugins for locale in "${LOCALES[@]}" do msgmerge resources/locales/$locale/cake.po resources/locales/cake.pot --output-file=resources/locales/$locale/cake.po --width=1000 @@ -13,14 +13,14 @@ do done #get and merge translations for admin plugin -bin/cake i18n extract --plugin Admin --overwrite --extract-core no --merge yes --no-location +bash bin/cake i18n extract --plugin Admin --overwrite --extract-core no --merge yes --no-location for locale in "${LOCALES[@]}" do msgmerge plugins/Admin/resources/locales/$locale/admin.po plugins/Admin/resources/locales/default.pot --output-file=plugins/Admin/resources/locales/$locale/admin.po --width=1000 done #get and merge translations for network plugin -bin/cake i18n extract --plugin Network --overwrite --extract-core no --merge yes --no-location +bash bin/cake i18n extract --plugin Network --overwrite --extract-core no --merge yes --no-location for locale in "${LOCALES[@]}" do msgmerge plugins/Network/resources/locales/$locale/network.po plugins/Network/resources/locales/default.pot --output-file=plugins/Network/resources/locales/$locale/network.po --width=1000 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000000..10f167e4b8 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,109 @@ +version: '3' + +services: + + php-nginx: + #image: webdevops/php-nginx:8.1 + build: ./config/docker-dev/php-nginx + container_name: fcs-php-nginx + restart: always + environment: + - WEB_DOCUMENT_ROOT=/var/www/html/webroot + volumes: + - ./:/var/www/html + - ./config/docker-dev/php-nginx/php-ini-overrides.ini:/usr/local/etc/php/conf.d/99-overrides.ini + ports: + - "8001:80" + depends_on: + - database-dev + - database-test + networks: + - fcs + + database-dev: + image: mysql:8.0 + container_name: fcs-database-dev + restart: always + ports: + - '3310:3306' + environment: + MYSQL_USER: user + MYSQL_PASSWORD: secret + MYSQL_DATABASE: foodcoopshop-dev + MYSQL_ALLOW_EMPTY_PASSWORD: true + MYSQL_TCP_PORT: 3310 + volumes: + - ./config/docker-dev/database-dev/data:/var/lib/mysql + networks: + - fcs + + database-test: + image: mysql:8.0 + container_name: fcs-database-test + restart: always + tmpfs: /var/lib/mysql:exec,size=1G + ports: + - '3311:3306' + environment: + MYSQL_USER: user + MYSQL_PASSWORD: secret + MYSQL_DATABASE: foodcoopshop-test + MYSQL_ALLOW_EMPTY_PASSWORD: true + MYSQL_TCP_PORT: 3311 + volumes: + - ./config/sql/_installation/clean-db-structure.sql:/docker-entrypoint-initdb.d/1.sql + - ./tests/config/sql/test-db-data.sql:/docker-entrypoint-initdb.d/2.sql + networks: + - fcs + + phpmyadmin-dev: + depends_on: + - database-dev + image: phpmyadmin/phpmyadmin + container_name: fcs-phpmyadmin-dev + restart: always + ports: + - '8080:80' + environment: + PMA_HOST: database-dev + PMA_USER: root + PMA_PORT: 3310 + UPLOAD_LIMIT: 300M + networks: + - fcs + + phpmyadmin-test: + depends_on: + - database-test + image: phpmyadmin/phpmyadmin + container_name: fcs-phpmyadmin-test + restart: always + ports: + - '8081:80' + environment: + PMA_HOST: database-test + PMA_USER: root + PMA_PORT: 3311 + UPLOAD_LIMIT: 300M + networks: + - fcs + + composer: + container_name: fcs-composer + image: composer:latest + entrypoint: ['composer', '--ignore-platform-reqs'] + working_dir: /var/www/html + volumes: + - ./:/var/www/html + + node: + container_name: fcs-node + build: ./config/docker-dev/node + working_dir: /var/www/html + volumes: + - ./:/var/www/html + networks: + - fcs + +networks: + fcs: From cb212666d87cf46c391f87160909e41e04baa676 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Fri, 23 Sep 2022 20:19:51 +0200 Subject: [PATCH 080/646] permissions --- devtools/db_dump_common.php | 0 devtools/db_dump_install.php | 0 devtools/db_dump_test.php | 0 devtools/git-pre-commit.sh | 0 devtools/pre-commit | 0 devtools/setup-git.sh | 0 6 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 devtools/db_dump_common.php mode change 100755 => 100644 devtools/db_dump_install.php mode change 100755 => 100644 devtools/db_dump_test.php mode change 100755 => 100644 devtools/git-pre-commit.sh mode change 100755 => 100644 devtools/pre-commit mode change 100755 => 100644 devtools/setup-git.sh diff --git a/devtools/db_dump_common.php b/devtools/db_dump_common.php old mode 100755 new mode 100644 diff --git a/devtools/db_dump_install.php b/devtools/db_dump_install.php old mode 100755 new mode 100644 diff --git a/devtools/db_dump_test.php b/devtools/db_dump_test.php old mode 100755 new mode 100644 diff --git a/devtools/git-pre-commit.sh b/devtools/git-pre-commit.sh old mode 100755 new mode 100644 diff --git a/devtools/pre-commit b/devtools/pre-commit old mode 100755 new mode 100644 diff --git a/devtools/setup-git.sh b/devtools/setup-git.sh old mode 100755 new mode 100644 From 12bcd83988f4ab4432f456c2ebede5fb867db795 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Fri, 23 Sep 2022 20:20:12 +0200 Subject: [PATCH 081/646] gitignore --- config/docker-dev/database-dev/data/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 config/docker-dev/database-dev/data/.gitignore diff --git a/config/docker-dev/database-dev/data/.gitignore b/config/docker-dev/database-dev/data/.gitignore new file mode 100644 index 0000000000..c96a04f008 --- /dev/null +++ b/config/docker-dev/database-dev/data/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file From 85ffb7341c6679e27c32ea0228e959e815116b42 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sat, 24 Sep 2022 22:11:54 +0200 Subject: [PATCH 082/646] remove comment --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 10f167e4b8..7213a29017 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,6 @@ version: '3' services: php-nginx: - #image: webdevops/php-nginx:8.1 build: ./config/docker-dev/php-nginx container_name: fcs-php-nginx restart: always From 5a8409fa0f10110215d9821c4c5ee810266c16b3 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sat, 24 Sep 2022 23:10:58 +0200 Subject: [PATCH 083/646] added gitpod --- .gitpod.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 0000000000..7b40dec9dc --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,19 @@ +tasks: + - init: | + docker compose pull + - command: | + docker compose up + docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ~./config/sql/_installation/clean-db-structure.sql + docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ~./tests/config/sql/test-db-data.sql + docker compose run -w /var/www/html/webroot --rm node npm install + docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake npm_post_install + command: | + echo "The FoodCoopShop application is ready to use." + echo "@see https://foodcoopshop.github.io/en/docker-dev-environment.html'" +ports: + - port: 8001 + onOpen: open-preview + - port: 8080 + onOpen: open-preview + - port: 8081 + onOpen: open-preview \ No newline at end of file From 93de95cd4448b0c5d14e62323f14f00d1c5db573 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sat, 24 Sep 2022 23:11:49 +0200 Subject: [PATCH 084/646] fix --- .gitpod.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 7b40dec9dc..8bdbbf36fe 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -7,7 +7,6 @@ tasks: docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ~./tests/config/sql/test-db-data.sql docker compose run -w /var/www/html/webroot --rm node npm install docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake npm_post_install - command: | echo "The FoodCoopShop application is ready to use." echo "@see https://foodcoopshop.github.io/en/docker-dev-environment.html'" ports: From 522b49072ec708b995c1626a52cb4e324dde7850 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 25 Sep 2022 10:38:46 +0200 Subject: [PATCH 085/646] gitpod not yet working --- .gitpod.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index 8bdbbf36fe..0000000000 --- a/.gitpod.yml +++ /dev/null @@ -1,18 +0,0 @@ -tasks: - - init: | - docker compose pull - - command: | - docker compose up - docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ~./config/sql/_installation/clean-db-structure.sql - docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ~./tests/config/sql/test-db-data.sql - docker compose run -w /var/www/html/webroot --rm node npm install - docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake npm_post_install - echo "The FoodCoopShop application is ready to use." - echo "@see https://foodcoopshop.github.io/en/docker-dev-environment.html'" -ports: - - port: 8001 - onOpen: open-preview - - port: 8080 - onOpen: open-preview - - port: 8081 - onOpen: open-preview \ No newline at end of file From 2e751abef65c5e912c5b825f978c501a4d26c845 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 25 Sep 2022 21:02:01 +0200 Subject: [PATCH 086/646] Gitpod integration (#879) * add gitpod.yml * ignore mysql-ports and run composer * set permissions and setup dev config * dev debug true * init * pull * fixed import command * valid security salt * only notify phpmyadmin ports * use local bash * add lines * gitpod init * test * remove quote * no empty lines * adaptions * test * fix * open-browser * tasks * do not overwrite existing config files * not applied * notify * add gitpod link * further up * updaet * format * demoslider * file renamings * info * add prebuilds * update * fixes * show docker commands --- .gitpod.yml | 19 + README.md | 10 +- config/custom_config.dev.php | 106 +++++ devtools/setup-dev-init.sh | 9 + devtools/setup-dev/copy-config-files.sh | 4 + devtools/setup-dev/set-permissions.sh | 8 + tests/config/sql/test-db-data.sql | 592 ++++++++++++------------ 7 files changed, 448 insertions(+), 300 deletions(-) create mode 100644 .gitpod.yml create mode 100644 config/custom_config.dev.php create mode 100644 devtools/setup-dev-init.sh create mode 100644 devtools/setup-dev/copy-config-files.sh create mode 100644 devtools/setup-dev/set-permissions.sh diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 0000000000..04f1c914d6 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,19 @@ +tasks: + - name: Bash + - name: Docker + init: | + docker compose pull + docker compose up + +ports: + - port: 8001 + onOpen: notify + - port: 8080 + onOpen: ignore + - port: 8081 + onOpen: ignore + - port: 3310 + onOpen: ignore + - port: 3311 + onOpen: ignore + \ No newline at end of file diff --git a/README.md b/README.md index a1799398af..824d6a50fc 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,12 @@ Users +## 🤖 Self-hosting / developing +* 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment) / [Installation guide](https://foodcoopshop.github.io/en/installation-guide) + +[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop) +* Gitpod: When all containers are up and running, open your bash terminal (not: Docker) and run: `bash ./devtools/setup-dev-init.sh` + ## ✨ Features * user-friendly web shop optimized for selling food from different producers * many delivery rhythms for products (once a week, every first / last friday...) @@ -60,10 +66,6 @@ ## ❗ Legal information Before installing don't forget to read the legal information in [German](https://foodcoopshop.github.io/de/rechtliches) or [English](https://foodcoopshop.github.io/en/legal-information). -## 🤖 Self-hosting / developing -* 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment) -* [Installation guide](https://foodcoopshop.github.io/en/installation-guide) - ## 😎 Maintainer [Mario Rothauer](https://github.com/mrothauer) started the project in 2014 and maintains it. diff --git a/config/custom_config.dev.php b/config/custom_config.dev.php new file mode 100644 index 0000000000..0d89acb9cf --- /dev/null +++ b/config/custom_config.dev.php @@ -0,0 +1,106 @@ + + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ + +return [ + 'debug' => true, + 'EmailTransport' => [ + 'default' => [ + 'className' => 'Smtp', + 'host' => '', + 'port' => 25, + 'timeout' => 30, + 'username' => '', + 'password' => '', + 'client' => null, + 'tls' => null, + ] + ], + 'Email' => [ + 'default' => [ + 'from' => [], // [email-address => name] syntax necessary (not only [email] + ] + ], + 'Datasources' => [ + 'default' => [ + 'host' => 'database-dev', + 'username' => 'user', + 'password' => 'secret', + 'database' => 'foodcoopshop-dev', + 'port' => 3310, + ], + 'test' => [ + 'host' => 'database-test', + 'username' => 'user', + 'password' => 'secret', + 'database' => 'foodcoopshop-test', + 'port' => 3311, + ], + ], + + /** + * A random string used in security hashing methods. + */ + 'Security' => [ + 'salt' => '3f4c77c698213b1ee8d0eca929340b69ee555c7585c99a17347991c8c9260f44' + ], + + 'Cache' => [ + 'default' => [ + 'prefix' => 'example_com_', + ], + 'short' => [ + 'prefix' => 'example_com_', + ], + '_cake_core_' => [ + 'prefix' => 'example_com_', + ], + '_cake_model_' => [ + 'prefix' => 'example_com_', + ], + ], + + 'app' => [ + + 'discourseSsoEnabled' => false, + + /** + * A random string used for Discourse SSO + */ + 'discourseSsoSecret' => '', + + /** + * your host's name, eg. http://www.yourfoodcoop.com + */ + 'cakeServerName' => 'https://localhost', + + /** + * cronjob needs to be activated / deactivated too if you change emailOrderReminderEnabled + * @see https://foodcoopshop.github.io/en/cronjobs + */ + 'emailOrderReminderEnabled' => true, + + /** + * valid options of array: 'cashless' or 'cash' (or both but this is not recommended) + */ + 'paymentMethods' => [ + 'cashless' + ] + + ] +]; diff --git a/devtools/setup-dev-init.sh b/devtools/setup-dev-init.sh new file mode 100644 index 0000000000..e5befdf0d9 --- /dev/null +++ b/devtools/setup-dev-init.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ./config/sql/_installation/clean-db-structure.sql +docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ./tests/config/sql/test-db-data.sql +docker compose run --rm composer install +bash ./devtools/setup-dev/set-permissions.sh +bash ./devtools/setup-dev/copy-config-files.sh +docker compose run -w /var/www/html/webroot --rm node npm install +docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake npm_post_install diff --git a/devtools/setup-dev/copy-config-files.sh b/devtools/setup-dev/copy-config-files.sh new file mode 100644 index 0000000000..039ce936f2 --- /dev/null +++ b/devtools/setup-dev/copy-config-files.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +cp -n ./config/custom_config.dev.php ./config/custom_config.php +cp -n ./config/credentials.default.php ./config/credentials.php \ No newline at end of file diff --git a/devtools/setup-dev/set-permissions.sh b/devtools/setup-dev/set-permissions.sh new file mode 100644 index 0000000000..e752c4b0b5 --- /dev/null +++ b/devtools/setup-dev/set-permissions.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +chmod -R a+w ./logs +chmod -R a+w ./tmp +chmod -R a+w ./webroot/tmp +chmod -R a+w ./webroot/files +chmod -R a+w ./webroot/cache +chmod -R a+w ./files_private diff --git a/tests/config/sql/test-db-data.sql b/tests/config/sql/test-db-data.sql index b1fb4b64c8..da01dfdc3a 100644 --- a/tests/config/sql/test-db-data.sql +++ b/tests/config/sql/test-db-data.sql @@ -10,80 +10,80 @@ /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; --- Truncate tables before insertion -TRUNCATE TABLE `fcs_action_logs`; -TRUNCATE TABLE `fcs_address`; -TRUNCATE TABLE `fcs_attribute`; -TRUNCATE TABLE `fcs_barcodes`; -TRUNCATE TABLE `fcs_blog_posts`; -TRUNCATE TABLE `fcs_cart_product_units`; -TRUNCATE TABLE `fcs_cart_products`; -TRUNCATE TABLE `fcs_carts`; -TRUNCATE TABLE `fcs_category`; -TRUNCATE TABLE `fcs_category_product`; -TRUNCATE TABLE `fcs_configuration`; -TRUNCATE TABLE `fcs_cronjob_logs`; -TRUNCATE TABLE `fcs_cronjobs`; -TRUNCATE TABLE `fcs_customer`; -TRUNCATE TABLE `fcs_deposits`; -TRUNCATE TABLE `fcs_feedbacks`; -TRUNCATE TABLE `fcs_images`; -TRUNCATE TABLE `fcs_invoice_taxes`; -TRUNCATE TABLE `fcs_invoices`; -TRUNCATE TABLE `fcs_manufacturer`; -TRUNCATE TABLE `fcs_order_detail`; -TRUNCATE TABLE `fcs_order_detail_feedbacks`; -TRUNCATE TABLE `fcs_order_detail_purchase_prices`; -TRUNCATE TABLE `fcs_order_detail_units`; -TRUNCATE TABLE `fcs_pages`; -TRUNCATE TABLE `fcs_payments`; -TRUNCATE TABLE `fcs_pickup_days`; -TRUNCATE TABLE `fcs_product`; -TRUNCATE TABLE `fcs_product_attribute`; -TRUNCATE TABLE `fcs_product_attribute_combination`; -TRUNCATE TABLE `fcs_purchase_prices`; -TRUNCATE TABLE `fcs_sliders`; -TRUNCATE TABLE `fcs_stock_available`; -TRUNCATE TABLE `fcs_storage_locations`; -TRUNCATE TABLE `fcs_sync_domains`; -TRUNCATE TABLE `fcs_sync_products`; -TRUNCATE TABLE `fcs_tax`; -TRUNCATE TABLE `fcs_units`; -TRUNCATE TABLE `phinxlog`; -TRUNCATE TABLE `queue_phinxlog`; -TRUNCATE TABLE `queue_processes`; -TRUNCATE TABLE `queued_jobs`; - +-- Truncate tables before insertion +TRUNCATE TABLE `fcs_action_logs`; +TRUNCATE TABLE `fcs_address`; +TRUNCATE TABLE `fcs_attribute`; +TRUNCATE TABLE `fcs_barcodes`; +TRUNCATE TABLE `fcs_blog_posts`; +TRUNCATE TABLE `fcs_cart_product_units`; +TRUNCATE TABLE `fcs_cart_products`; +TRUNCATE TABLE `fcs_carts`; +TRUNCATE TABLE `fcs_category`; +TRUNCATE TABLE `fcs_category_product`; +TRUNCATE TABLE `fcs_configuration`; +TRUNCATE TABLE `fcs_cronjob_logs`; +TRUNCATE TABLE `fcs_cronjobs`; +TRUNCATE TABLE `fcs_customer`; +TRUNCATE TABLE `fcs_deposits`; +TRUNCATE TABLE `fcs_feedbacks`; +TRUNCATE TABLE `fcs_images`; +TRUNCATE TABLE `fcs_invoice_taxes`; +TRUNCATE TABLE `fcs_invoices`; +TRUNCATE TABLE `fcs_manufacturer`; +TRUNCATE TABLE `fcs_order_detail`; +TRUNCATE TABLE `fcs_order_detail_feedbacks`; +TRUNCATE TABLE `fcs_order_detail_purchase_prices`; +TRUNCATE TABLE `fcs_order_detail_units`; +TRUNCATE TABLE `fcs_pages`; +TRUNCATE TABLE `fcs_payments`; +TRUNCATE TABLE `fcs_pickup_days`; +TRUNCATE TABLE `fcs_product`; +TRUNCATE TABLE `fcs_product_attribute`; +TRUNCATE TABLE `fcs_product_attribute_combination`; +TRUNCATE TABLE `fcs_purchase_prices`; +TRUNCATE TABLE `fcs_sliders`; +TRUNCATE TABLE `fcs_stock_available`; +TRUNCATE TABLE `fcs_storage_locations`; +TRUNCATE TABLE `fcs_sync_domains`; +TRUNCATE TABLE `fcs_sync_products`; +TRUNCATE TABLE `fcs_tax`; +TRUNCATE TABLE `fcs_units`; +TRUNCATE TABLE `phinxlog`; +TRUNCATE TABLE `queue_phinxlog`; +TRUNCATE TABLE `queue_processes`; +TRUNCATE TABLE `queued_jobs`; + /*!40000 ALTER TABLE `fcs_action_logs` DISABLE KEYS */; /*!40000 ALTER TABLE `fcs_action_logs` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_address` DISABLE KEYS */; -INSERT INTO `fcs_address` VALUES -(153,87,0,'Mitglied','Demo','Demostrasse 4','','4644','Scharnstein','','','0664/000000000','fcs-demo-mitglied@mailinator.com','2014-12-02 12:19:31','2014-12-02 12:19:31'), -(154,88,0,'Admin','Demo','Demostrasse 4','','4644','Scharnstein','test','','0600/000000','fcs-demo-admin@mailinator.com','2014-12-02 12:28:44','2014-12-02 12:28:44'), -(173,0,4,'Fleisch-Hersteller','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-demo-fleisch-hersteller@mailinator.com','2014-05-27 22:20:18','2015-04-07 16:18:28'), -(177,0,15,'Milch-Hersteller','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-demo-milch-hersteller@mailinator.com','2014-06-04 21:46:38','2015-10-16 10:06:52'), -(180,0,5,'Gemüse-Hersteller','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-demo-gemuese-hersteller@mailinator.com','2014-05-14 21:20:05','2015-12-30 00:54:35'), -(181,0,16,'Hersteller ohne Customer-Eintrag','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-hersteller-ohne-customer-eintrag@mailinator.com','2014-05-14 21:20:05','2015-12-30 00:54:35'), -(182,92,0,'Superadmin','Demo','Demostrasse 4','','4644','Demostadt',NULL,'','0600/000000','fcs-demo-superadmin@mailinator.com','2017-07-26 13:19:19','2017-07-26 13:19:19'), +INSERT INTO `fcs_address` VALUES +(153,87,0,'Mitglied','Demo','Demostrasse 4','','4644','Scharnstein','','','0664/000000000','fcs-demo-mitglied@mailinator.com','2014-12-02 12:19:31','2014-12-02 12:19:31'), +(154,88,0,'Admin','Demo','Demostrasse 4','','4644','Scharnstein','test','','0600/000000','fcs-demo-admin@mailinator.com','2014-12-02 12:28:44','2014-12-02 12:28:44'), +(173,0,4,'Fleisch-Hersteller','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-demo-fleisch-hersteller@mailinator.com','2014-05-27 22:20:18','2015-04-07 16:18:28'), +(177,0,15,'Milch-Hersteller','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-demo-milch-hersteller@mailinator.com','2014-06-04 21:46:38','2015-10-16 10:06:52'), +(180,0,5,'Gemüse-Hersteller','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-demo-gemuese-hersteller@mailinator.com','2014-05-14 21:20:05','2015-12-30 00:54:35'), +(181,0,16,'Hersteller ohne Customer-Eintrag','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-hersteller-ohne-customer-eintrag@mailinator.com','2014-05-14 21:20:05','2015-12-30 00:54:35'), +(182,92,0,'Superadmin','Demo','Demostrasse 4','','4644','Demostadt',NULL,'','0600/000000','fcs-demo-superadmin@mailinator.com','2017-07-26 13:19:19','2017-07-26 13:19:19'), (183,93,0,'SB-Kunde','Demo','Demostrasse 4','','4644','Demostadt',NULL,'','0600/000000','fcs-demo-sb-kunde@mailinator.com','2017-07-26 13:19:19','2017-07-26 13:19:19'); /*!40000 ALTER TABLE `fcs_address` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_attribute` DISABLE KEYS */; -INSERT INTO `fcs_attribute` VALUES -(33,'0,5l',0,1,NULL,NULL), -(35,'1 kg',1,1,NULL,NULL), +INSERT INTO `fcs_attribute` VALUES +(33,'0,5l',0,1,NULL,NULL), +(35,'1 kg',1,1,NULL,NULL), (36,'0,5 kg',1,1,NULL,NULL); /*!40000 ALTER TABLE `fcs_attribute` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_barcodes` DISABLE KEYS */; -INSERT INTO `fcs_barcodes` VALUES -(1,349,0,'1234567890123'), +INSERT INTO `fcs_barcodes` VALUES +(1,349,0,'1234567890123'), (2,0,13,'2345678901234'); /*!40000 ALTER TABLE `fcs_barcodes` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_blog_posts` DISABLE KEYS */; -INSERT INTO `fcs_blog_posts` VALUES +INSERT INTO `fcs_blog_posts` VALUES (2,'Demo Blog Artikel','Lorem ipsum dolor sit amet, consetetur sadipscing','

Lorem ipsum dolor sit amet.

',88,0,0,1,'2014-12-18 10:37:26','2015-03-16 12:41:46','2021-05-19'); /*!40000 ALTER TABLE `fcs_blog_posts` ENABLE KEYS */; @@ -91,100 +91,100 @@ INSERT INTO `fcs_blog_posts` VALUES /*!40000 ALTER TABLE `fcs_cart_product_units` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_cart_products` DISABLE KEYS */; -INSERT INTO `fcs_cart_products` VALUES -(1,1,346,0,1,'2018-03-01 10:17:14','2018-03-01 10:17:14'), -(2,1,340,0,1,'2018-03-01 10:17:14','2018-03-01 10:17:14'), +INSERT INTO `fcs_cart_products` VALUES +(1,1,346,0,1,'2018-03-01 10:17:14','2018-03-01 10:17:14'), +(2,1,340,0,1,'2018-03-01 10:17:14','2018-03-01 10:17:14'), (3,1,60,10,1,'2018-03-01 10:17:14','2018-03-01 10:17:14'); /*!40000 ALTER TABLE `fcs_cart_products` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_carts` DISABLE KEYS */; -INSERT INTO `fcs_carts` VALUES +INSERT INTO `fcs_carts` VALUES (1,92,1,0,'2018-03-01 10:17:14','2018-03-01 10:17:14'); /*!40000 ALTER TABLE `fcs_carts` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_category` DISABLE KEYS */; -INSERT INTO `fcs_category` VALUES -(16,0,'Fleischprodukte','',11,12,1,'2014-05-14 21:40:51','2014-05-14 21:48:48'), +INSERT INTO `fcs_category` VALUES +(16,0,'Fleischprodukte','',11,12,1,'2014-05-14 21:40:51','2014-05-14 21:48:48'), (20,0,'Alle Produkte','',3,4,1,'2014-05-14 21:53:52','2014-05-17 13:14:22'); /*!40000 ALTER TABLE `fcs_category` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_category_product` DISABLE KEYS */; -INSERT INTO `fcs_category_product` VALUES -(20,60), -(16,102), -(20,102), -(16,103), -(20,103), -(20,163), -(20,339), -(16,340), -(20,340), -(20,344), -(20,346), -(16,347), -(20,347), -(16,348), -(20,348), -(20,349), -(20,350), +INSERT INTO `fcs_category_product` VALUES +(20,60), +(16,102), +(20,102), +(16,103), +(20,103), +(20,163), +(20,339), +(16,340), +(20,340), +(20,344), +(20,346), +(16,347), +(20,347), +(16,348), +(20,348), +(20,349), +(20,350), (20,351); /*!40000 ALTER TABLE `fcs_category_product` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_configuration` DISABLE KEYS */; -INSERT INTO `fcs_configuration` VALUES -(11,1,'FCS_PRODUCT_AVAILABILITY_LOW','Geringe Verfügbarkeit
Ab welcher verfügbaren Produkt-Anzahl soll beim Bestellen der Hinweis \"(x verfügbar\") angezeigt werden?
','10','number',600,'de_DE','2017-07-26 13:19:19','2014-06-01 01:40:34'), -(31,1,'FCS_DAYS_SHOW_PRODUCT_AS_NEW','Wie viele Tage sollen Produkte \"als neu markiert\" bleiben?','7','number',700,'de_DE','2017-07-26 13:19:19','2014-05-14 21:15:45'), -(456,1,'FCS_FOOTER_CMS_TEXT','Zusätzlicher Text für den Footer',NULL,'textarea_big',920,'de_DE','2014-06-11 17:50:55','2016-07-01 21:47:47'), -(508,1,'FCS_FACEBOOK_URL','Facebook-Url für die Einbindung im Footer','https://www.facebook.com/FoodCoopShop/','text',910,'de_DE','2015-07-08 13:23:54','2015-07-08 13:23:54'), -(538,1,'FCS_REGISTRATION_EMAIL_TEXT','Zusätzlicher Text, der in der Bestätigungsmail nach einer Registrierung versendet wird.
E-Mail-Vorschau anzeigen','','textarea_big',1700,'de_DE','2016-06-26 00:00:00','2016-06-26 00:00:00'), -(543,1,'FCS_RIGHT_INFO_BOX_HTML','Inhalt der Box in der rechten Spalte unterhalb des Warenkorbes.
Um eine Zeile grün zu hinterlegen (Überschrift) bitte als \"Überschrift 3\" formatieren.
','

Abholzeiten

\r\n\r\n

Der Abholtag steht jetzt immer in der Produktbeschreibung, du kannst deine Produkte am Freitag abholen.

\r\n\r\n

Du kannst jede Woche bis spätestens Dienstag Mitternacht bestellen und sie am darauffolgenden Freitag abholen.

\r\n','textarea_big',1500,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(544,1,'FCS_NO_DELIVERY_DAYS_GLOBAL','Lieferpause für alle Hersteller?
Hier können lieferfreie Tage (z.B. Feiertage) für die gesamte Foodcoop festgelegt werden.
','','multiple_dropdown',100,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(545,1,'FCS_ACCOUNTING_EMAIL','E-Mail-Adresse des Finanzverantwortlichen
Wer bekommt die Benachrichtigung über den erfolgten Rechnungsversand?
','fcs-demo-superadmin@mailinator.com','text',1100,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(546,1,'FCS_REGISTRATION_INFO_TEXT','Info-Text beim Registrierungsformular
Beim Registrierungsformlar wird unterhalb der E-Mail-Adresse dieser Text angezeigt.
','Um bei uns zu bestellen musst du Vereinsmitglied sein.','textarea_big',1600,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(547,1,'FCS_SHOW_PRODUCTS_FOR_GUESTS','Produkte für nicht eingeloggte Mitglieder sichtbar?','0','boolean',200,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(548,1,'FCS_DEFAULT_NEW_MEMBER_ACTIVE','Neue Mitglieder automatisch aktivieren?','0','boolean',500,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(549,1,'FCS_MINIMAL_CREDIT_BALANCE','Bis zu welchem Guthaben-Betrag sollen Bestellungen möglich sein?','-100','number',1250,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(550,1,'FCS_BANK_ACCOUNT_DATA','Bankverbindung für die Guthaben-Einzahlungen\".','Guthaben-Konto Testbank / IBAN: AT65 5645 4154 8748 8999 / BIC: ABC87878','text',1300,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(552,1,'FCS_DELIVERY_DETAILS_FOR_MANUFACTURERS','Zusätzliche Liefer-Informationen für die Hersteller
wird in den Bestell-Listen nach dem Lieferdatum angezeigt.
',', 15:00 bis 17:00 Uhr','text',1200,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(553,1,'FCS_BACKUP_EMAIL_ADDRESS_BCC','E-Mail-Adresse, an die sämtliche vom System generierten E-Mails als BCC verschickt werden (Backup).
Kann leer gelassen werden.
','','text',1900,'de_DE','2016-10-06 00:00:00','2016-10-06 00:00:00'), -(554,1,'FCS_SHOW_FOODCOOPSHOP_BACKLINK','Auf Homepage Link auf www.foodcoopshop.com anzeigen?
Der Link wird im Footer angezeigt.
','1','boolean',930,'de_DE','2016-11-27 00:00:00','2016-11-27 00:00:00'), -(556,1,'FCS_APP_NAME','Name der Foodcoop','FoodCoop Test','text',50,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(557,1,'FCS_APP_ADDRESS','Adresse der Foodcoop
Wird im Footer von Homepage und E-Mails, Datenschutzerklärung, Nutzungsbedingungen usw. verwendet.
','Demostraße 4
A-4564 Demostadt','textarea',60,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(558,1,'FCS_APP_EMAIL','E-Mail-Adresse der Foodcoop
','demo-foodcoop@maillinator.com','text',900,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(559,1,'FCS_PLATFORM_OWNER','Betreiber der Plattform
Für Datenschutzerklärung und Nutzungsbedingungen, bitte auch Adresse angeben. Kann leer gelassen werden, wenn die Foodcoop selbst die Plattform betreibt.
','','textarea',90,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(564,1,'FCS_ORDER_COMMENT_ENABLED','Kommentarfeld bei Bestell-Abschluss anzeigen?
Wird im Admin-Bereich unter \"Bestellungen\" angezeigt.
','1','boolean',130,'de_DE','2017-07-09 00:00:00','2017-07-09 00:00:00'), -(565,1,'FCS_USE_VARIABLE_MEMBER_FEE','Variablen Mitgliedsbeitrag verwenden?
Den variablen Mitgliedsbeitrag bei den Hersteller-Rechnungen abziehen? Die Produkt-Preise müssen entsprechend höher eingegeben werden.
','0','readonly',400,'de_DE','2017-08-02 00:00:00','2017-08-02 00:00:00'), -(566,1,'FCS_DEFAULT_VARIABLE_MEMBER_FEE_PERCENTAGE','Standardwert für variablen Mitgliedsbeitrag
Der Prozentsatz kann in den Hersteller-Einstellungen auch individuell angepasst werden.
','0','readonly',500,'de_DE','2017-08-02 00:00:00','2017-08-02 00:00:00'), -(567,1,'FCS_NETWORK_PLUGIN_ENABLED','Netzwerk-Modul aktiviert?
Infos zum Netzwerk-Modul
','1','readonly',500,'de_DE','2017-09-14 00:00:00','2017-09-14 00:00:00'), -(574,1,'FCS_SHOW_PRODUCT_PRICE_FOR_GUESTS','Produktpreis für nicht eingeloggte Mitglieder anzeigen?','0','boolean',210,'de_DE','2018-05-28 18:05:57','2018-05-28 18:05:57'), -(575,1,'FCS_CURRENCY_SYMBOL','Währungssymbol','€','readonly',520,'de_DE','2018-06-13 19:53:14','2018-06-13 19:53:14'), -(576,1,'FCS_DEFAULT_LOCALE','Sprache','de_DE','readonly',550,'de_DE','2018-06-26 10:18:55','2018-06-26 10:18:55'), -(577,1,'FCS_FOODCOOPS_MAP_ENABLED','Auf Home Karte mit anderen Foodcoops anzeigen?','1','boolean',1280,'de_DE','2019-02-11 22:22:06','2019-02-11 22:22:06'), -(578,1,'FCS_WEEKLY_PICKUP_DAY','Wöchentlicher Abholtag','5','readonly',600,'de_DE','2019-02-18 12:38:10','2019-02-18 12:38:10'), -(579,1,'FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA','Bestelllisten-Versand: x Tage vor dem Abholtag','2','readonly',650,'de_DE','2019-02-18 12:38:10','2019-02-18 12:38:10'), -(580,1,'FCS_ORDER_POSSIBLE_FOR_STOCK_PRODUCTS_IN_ORDERS_WITH_DELIVERY_RHYTHM','Sollen Lagerprodukte mit der wöchentlichen Bestellung bestellt werden können?','1','boolean',750,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(581,1,'FCS_SHOW_NON_STOCK_PRODUCTS_IN_INSTANT_ORDERS','In der Sofort-Bestellung ausschließlich Lagerprodukte anzeigen?','0','boolean',760,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(582,1,'FCS_INCLUDE_STOCK_PRODUCTS_IN_INVOICES','Lagerprodukte in Rechnungen miteinbeziehen?','1','readonly',600,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(583,1,'FCS_REGISTRATION_NOTIFICATION_EMAILS','Wer soll bei neuen Registrierungen informiert werden?
Mehrere E-Mail-Adressen mit , (ohne Leerzeichen) trennen.
','fcs-demo-superadmin@mailinator.com','text',550,'de_DE','2019-03-05 20:08:00','2019-03-05 20:08:00'), -(584,1,'FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED','Selbstbedienungs-Modus für Lagerprodukte aktiv?
Zur Online-Doku
','0','boolean',3000,'de_DE','2019-04-17 20:01:59','2019-04-17 20:01:59'), -(585,1,'FCS_APP_ADDITIONAL_DATA','Zusätzliche Infos zur Foodcoop
Z.B. ZVR-Zahl
','','textarea',80,'de_DE','2019-08-03 20:07:17','2019-08-03 20:07:17'), -(586,1,'FCS_SELF_SERVICE_MODE_TEST_MODE_ENABLED','Selbstbedienungs-Modus im Test-Modus ausführen?
Keine Verlinkung im Haupt-Menü und bei Lagerprodukten.
','1','boolean',3100,'de_DE','2019-12-09 13:46:41','2019-12-09 13:46:41'), -(587,1,'FCS_CASHLESS_PAYMENT_ADD_TYPE','Art der Eintragung der Guthaben-Aufladungen
Wie gelangen die Guthaben-Aufladungen vom Bankkonto in den FoodCoopShop?
','manual','dropdown',1450,'de_DE','2020-02-11 10:13:10','2020-02-11 10:13:10'), -(589,1,'FCS_FEEDBACK_TO_PRODUCTS_ENABLED','Feedback-Funktion für Produkte aktiviert?
Mitglieder können Feedback zu bestellten Produkte verfassen.
','1','boolean',3200,'de_DE','2020-06-19 09:03:00','2020-06-19 09:03:00'), -(590,1,'FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY','Mitglied kann Abholtag beim Bestellen selbst auswählen.','0','readonly',590,'de_DE','2020-07-06 10:34:48','2020-07-06 10:34:48'), -(592,1,'FCS_SEND_INVOICES_TO_CUSTOMERS','Einzelhandels-Modus aktiviert?
Infos zur Verwendung im Einzelhandel
','0','readonly',580,'de_DE','2020-10-29 10:06:50','2020-10-29 10:06:50'), -(593,1,'FCS_DEPOSIT_TAX_RATE','Umsatzsteuersatz für Pfand','20,00','readonly',581,'de_DE','2020-11-03 15:24:12','2020-11-03 15:24:12'), -(594,1,'FCS_INVOICE_HEADER_TEXT','Header-Text für Rechnungen an Mitglieder','FoodCoop Test
Demostraße 4
A-4564 Demostadt
demo-foodcoop@maillinator.com','readonly',582,'de_DE','2020-11-03 15:24:12','2020-11-03 15:24:12'), -(595,1,'FCS_MEMBER_FEE_PRODUCTS','Welche Produkte werden als Mitgliedsbeitrag verwendet?
Die ausgewählten Produkte sind Datengrundlage der Spalte Mitgliedsbeitrag in der Mitgliederverwaltung und werden nicht in der Umsatzstatistik angezeigt.
','','multiple_dropdown',3300,'de_DE','2020-12-20 19:26:26','2020-12-20 19:26:26'), -(596,1,'FCS_CHECK_CREDIT_BALANCE_LIMIT','Ab welchem Guthaben-Stand soll die Erinnerungsmail versendet werden?','0','number',1450,'de_DE','2021-01-19 11:23:49','2021-01-19 11:23:49'), -(597,1,'FCS_PURCHASE_PRICE_ENABLED','Einkaufspreis für Produkte erfassen?
Der Einkaufspreis ist die Datengrundlage für die Gewinn-Statistik und für Lieferscheine an die Hersteller.
','0','readonly',587,'de_DE','2021-05-12 15:24:17','2021-05-12 15:24:17'), -(598,1,'FCS_HELLO_CASH_API_ENABLED','Schnittstelle (API) zu Registrierkasse HelloCash (hellocash.at) aktivieren?
Alle Rechnungen (bar und unbar) über die Registrierkasse erstellen.
','0','readonly',583,'de_DE','2021-07-07 10:55:14','2021-07-07 10:55:14'), -(599,1,'FCS_SAVE_STORAGE_LOCATION_FOR_PRODUCTS','Lagerort für Produkte erfassen und in Bestelllisten anzeigen?
Lagerorte: Keine Kühlung / Kühlschrank / Tiefkühler. Es erscheint ein zusätzlicher Button neben \"Bestellungen - Bestellungen als PDF generieren\"
','0','boolean',3210,'de_DE','2021-08-02 11:28:40','2021-08-02 11:28:40'), -(600,1,'FCS_INSTAGRAM_URL','Instagram-Url für die Einbindung im Footer','','text',920,'de_DE','2021-09-10 21:23:18','2021-09-10 21:23:18'), -(601,1,'FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY','Bestellungen beim ein- und zweiwöchigen Lieferhythmus sind nur in der Woche vor der Lieferung möglich.','0','boolean',3210,'de_DE','2022-02-01 17:48:46','2022-02-01 17:48:46'), -(602,1,'FCS_INVOICE_NUMBER_PREFIX','Präfix für Rechnungs-Nummernkreis
Max. 6 Zeichen inkl. Trennzeichen.
','','readonly',586,'de_DE','2022-03-21 12:03:07','2022-03-21 12:03:07'), -(603,1,'FCS_TAX_BASED_ON_NET_INVOICE_SUM','Rechnungslegung für pauschalierte Betriebe
Die Berechnung der Umsatzsteuer erfolgt auf Basis der Netto-Rechnungsumme und ist nicht die Summe der Umsatzsteuerbeträge pro Stück.
','0','readonly',585,'de_DE','2022-03-23 09:12:43','2022-03-23 09:12:43'), -(604,1,'FCS_NEWSLETTER_ENABLED','Newsletter-Funktion aktiv?
Mitglieder können sich bei der Registrierung für den Newsletter anmelden. Mehr Infos
','0','boolean',3400,'de_DE','2022-04-12 15:28:47','2022-04-12 15:28:47'), +INSERT INTO `fcs_configuration` VALUES +(11,1,'FCS_PRODUCT_AVAILABILITY_LOW','Geringe Verfügbarkeit
Ab welcher verfügbaren Produkt-Anzahl soll beim Bestellen der Hinweis \"(x verfügbar\") angezeigt werden?
','10','number',600,'de_DE','2017-07-26 13:19:19','2014-06-01 01:40:34'), +(31,1,'FCS_DAYS_SHOW_PRODUCT_AS_NEW','Wie viele Tage sollen Produkte \"als neu markiert\" bleiben?','7','number',700,'de_DE','2017-07-26 13:19:19','2014-05-14 21:15:45'), +(456,1,'FCS_FOOTER_CMS_TEXT','Zusätzlicher Text für den Footer',NULL,'textarea_big',920,'de_DE','2014-06-11 17:50:55','2016-07-01 21:47:47'), +(508,1,'FCS_FACEBOOK_URL','Facebook-Url für die Einbindung im Footer','https://www.facebook.com/FoodCoopShop/','text',910,'de_DE','2015-07-08 13:23:54','2015-07-08 13:23:54'), +(538,1,'FCS_REGISTRATION_EMAIL_TEXT','Zusätzlicher Text, der in der Bestätigungsmail nach einer Registrierung versendet wird.
E-Mail-Vorschau anzeigen','','textarea_big',1700,'de_DE','2016-06-26 00:00:00','2016-06-26 00:00:00'), +(543,1,'FCS_RIGHT_INFO_BOX_HTML','Inhalt der Box in der rechten Spalte unterhalb des Warenkorbes.
Um eine Zeile grün zu hinterlegen (Überschrift) bitte als \"Überschrift 3\" formatieren.
','

Abholzeiten

\r\n\r\n

Der Abholtag steht jetzt immer in der Produktbeschreibung, du kannst deine Produkte am Freitag abholen.

\r\n\r\n

Du kannst jede Woche bis spätestens Dienstag Mitternacht bestellen und sie am darauffolgenden Freitag abholen.

\r\n','textarea_big',1500,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(544,1,'FCS_NO_DELIVERY_DAYS_GLOBAL','Lieferpause für alle Hersteller?
Hier können lieferfreie Tage (z.B. Feiertage) für die gesamte Foodcoop festgelegt werden.
','','multiple_dropdown',100,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(545,1,'FCS_ACCOUNTING_EMAIL','E-Mail-Adresse des Finanzverantwortlichen
Wer bekommt die Benachrichtigung über den erfolgten Rechnungsversand?
','fcs-demo-superadmin@mailinator.com','text',1100,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(546,1,'FCS_REGISTRATION_INFO_TEXT','Info-Text beim Registrierungsformular
Beim Registrierungsformlar wird unterhalb der E-Mail-Adresse dieser Text angezeigt.
','Um bei uns zu bestellen musst du Vereinsmitglied sein.','textarea_big',1600,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(547,1,'FCS_SHOW_PRODUCTS_FOR_GUESTS','Produkte für nicht eingeloggte Mitglieder sichtbar?','0','boolean',200,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(548,1,'FCS_DEFAULT_NEW_MEMBER_ACTIVE','Neue Mitglieder automatisch aktivieren?','0','boolean',500,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(549,1,'FCS_MINIMAL_CREDIT_BALANCE','Bis zu welchem Guthaben-Betrag sollen Bestellungen möglich sein?','-100','number',1250,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(550,1,'FCS_BANK_ACCOUNT_DATA','Bankverbindung für die Guthaben-Einzahlungen\".','Guthaben-Konto Testbank / IBAN: AT65 5645 4154 8748 8999 / BIC: ABC87878','text',1300,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(552,1,'FCS_DELIVERY_DETAILS_FOR_MANUFACTURERS','Zusätzliche Liefer-Informationen für die Hersteller
wird in den Bestell-Listen nach dem Lieferdatum angezeigt.
',', 15:00 bis 17:00 Uhr','text',1200,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(553,1,'FCS_BACKUP_EMAIL_ADDRESS_BCC','E-Mail-Adresse, an die sämtliche vom System generierten E-Mails als BCC verschickt werden (Backup).
Kann leer gelassen werden.
','','text',1900,'de_DE','2016-10-06 00:00:00','2016-10-06 00:00:00'), +(554,1,'FCS_SHOW_FOODCOOPSHOP_BACKLINK','Auf Homepage Link auf www.foodcoopshop.com anzeigen?
Der Link wird im Footer angezeigt.
','1','boolean',930,'de_DE','2016-11-27 00:00:00','2016-11-27 00:00:00'), +(556,1,'FCS_APP_NAME','Name der Foodcoop','FoodCoop Test','text',50,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(557,1,'FCS_APP_ADDRESS','Adresse der Foodcoop
Wird im Footer von Homepage und E-Mails, Datenschutzerklärung, Nutzungsbedingungen usw. verwendet.
','Demostraße 4
A-4564 Demostadt','textarea',60,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(558,1,'FCS_APP_EMAIL','E-Mail-Adresse der Foodcoop
','demo-foodcoop@maillinator.com','text',900,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(559,1,'FCS_PLATFORM_OWNER','Betreiber der Plattform
Für Datenschutzerklärung und Nutzungsbedingungen, bitte auch Adresse angeben. Kann leer gelassen werden, wenn die Foodcoop selbst die Plattform betreibt.
','','textarea',90,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(564,1,'FCS_ORDER_COMMENT_ENABLED','Kommentarfeld bei Bestell-Abschluss anzeigen?
Wird im Admin-Bereich unter \"Bestellungen\" angezeigt.
','1','boolean',130,'de_DE','2017-07-09 00:00:00','2017-07-09 00:00:00'), +(565,1,'FCS_USE_VARIABLE_MEMBER_FEE','Variablen Mitgliedsbeitrag verwenden?
Den variablen Mitgliedsbeitrag bei den Hersteller-Rechnungen abziehen? Die Produkt-Preise müssen entsprechend höher eingegeben werden.
','0','readonly',400,'de_DE','2017-08-02 00:00:00','2017-08-02 00:00:00'), +(566,1,'FCS_DEFAULT_VARIABLE_MEMBER_FEE_PERCENTAGE','Standardwert für variablen Mitgliedsbeitrag
Der Prozentsatz kann in den Hersteller-Einstellungen auch individuell angepasst werden.
','0','readonly',500,'de_DE','2017-08-02 00:00:00','2017-08-02 00:00:00'), +(567,1,'FCS_NETWORK_PLUGIN_ENABLED','Netzwerk-Modul aktiviert?
Infos zum Netzwerk-Modul
','1','readonly',500,'de_DE','2017-09-14 00:00:00','2017-09-14 00:00:00'), +(574,1,'FCS_SHOW_PRODUCT_PRICE_FOR_GUESTS','Produktpreis für nicht eingeloggte Mitglieder anzeigen?','0','boolean',210,'de_DE','2018-05-28 18:05:57','2018-05-28 18:05:57'), +(575,1,'FCS_CURRENCY_SYMBOL','Währungssymbol','€','readonly',520,'de_DE','2018-06-13 19:53:14','2018-06-13 19:53:14'), +(576,1,'FCS_DEFAULT_LOCALE','Sprache','de_DE','readonly',550,'de_DE','2018-06-26 10:18:55','2018-06-26 10:18:55'), +(577,1,'FCS_FOODCOOPS_MAP_ENABLED','Auf Home Karte mit anderen Foodcoops anzeigen?','1','boolean',1280,'de_DE','2019-02-11 22:22:06','2019-02-11 22:22:06'), +(578,1,'FCS_WEEKLY_PICKUP_DAY','Wöchentlicher Abholtag','5','readonly',600,'de_DE','2019-02-18 12:38:10','2019-02-18 12:38:10'), +(579,1,'FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA','Bestelllisten-Versand: x Tage vor dem Abholtag','2','readonly',650,'de_DE','2019-02-18 12:38:10','2019-02-18 12:38:10'), +(580,1,'FCS_ORDER_POSSIBLE_FOR_STOCK_PRODUCTS_IN_ORDERS_WITH_DELIVERY_RHYTHM','Sollen Lagerprodukte mit der wöchentlichen Bestellung bestellt werden können?','1','boolean',750,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(581,1,'FCS_SHOW_NON_STOCK_PRODUCTS_IN_INSTANT_ORDERS','In der Sofort-Bestellung ausschließlich Lagerprodukte anzeigen?','0','boolean',760,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(582,1,'FCS_INCLUDE_STOCK_PRODUCTS_IN_INVOICES','Lagerprodukte in Rechnungen miteinbeziehen?','1','readonly',600,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(583,1,'FCS_REGISTRATION_NOTIFICATION_EMAILS','Wer soll bei neuen Registrierungen informiert werden?
Mehrere E-Mail-Adressen mit , (ohne Leerzeichen) trennen.
','fcs-demo-superadmin@mailinator.com','text',550,'de_DE','2019-03-05 20:08:00','2019-03-05 20:08:00'), +(584,1,'FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED','Selbstbedienungs-Modus für Lagerprodukte aktiv?
Zur Online-Doku
','0','boolean',3000,'de_DE','2019-04-17 20:01:59','2019-04-17 20:01:59'), +(585,1,'FCS_APP_ADDITIONAL_DATA','Zusätzliche Infos zur Foodcoop
Z.B. ZVR-Zahl
','','textarea',80,'de_DE','2019-08-03 20:07:17','2019-08-03 20:07:17'), +(586,1,'FCS_SELF_SERVICE_MODE_TEST_MODE_ENABLED','Selbstbedienungs-Modus im Test-Modus ausführen?
Keine Verlinkung im Haupt-Menü und bei Lagerprodukten.
','1','boolean',3100,'de_DE','2019-12-09 13:46:41','2019-12-09 13:46:41'), +(587,1,'FCS_CASHLESS_PAYMENT_ADD_TYPE','Art der Eintragung der Guthaben-Aufladungen
Wie gelangen die Guthaben-Aufladungen vom Bankkonto in den FoodCoopShop?
','manual','dropdown',1450,'de_DE','2020-02-11 10:13:10','2020-02-11 10:13:10'), +(589,1,'FCS_FEEDBACK_TO_PRODUCTS_ENABLED','Feedback-Funktion für Produkte aktiviert?
Mitglieder können Feedback zu bestellten Produkte verfassen.
','1','boolean',3200,'de_DE','2020-06-19 09:03:00','2020-06-19 09:03:00'), +(590,1,'FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY','Mitglied kann Abholtag beim Bestellen selbst auswählen.','0','readonly',590,'de_DE','2020-07-06 10:34:48','2020-07-06 10:34:48'), +(592,1,'FCS_SEND_INVOICES_TO_CUSTOMERS','Einzelhandels-Modus aktiviert?
Infos zur Verwendung im Einzelhandel
','0','readonly',580,'de_DE','2020-10-29 10:06:50','2020-10-29 10:06:50'), +(593,1,'FCS_DEPOSIT_TAX_RATE','Umsatzsteuersatz für Pfand','20,00','readonly',581,'de_DE','2020-11-03 15:24:12','2020-11-03 15:24:12'), +(594,1,'FCS_INVOICE_HEADER_TEXT','Header-Text für Rechnungen an Mitglieder','FoodCoop Test
Demostraße 4
A-4564 Demostadt
demo-foodcoop@maillinator.com','readonly',582,'de_DE','2020-11-03 15:24:12','2020-11-03 15:24:12'), +(595,1,'FCS_MEMBER_FEE_PRODUCTS','Welche Produkte werden als Mitgliedsbeitrag verwendet?
Die ausgewählten Produkte sind Datengrundlage der Spalte Mitgliedsbeitrag in der Mitgliederverwaltung und werden nicht in der Umsatzstatistik angezeigt.
','','multiple_dropdown',3300,'de_DE','2020-12-20 19:26:26','2020-12-20 19:26:26'), +(596,1,'FCS_CHECK_CREDIT_BALANCE_LIMIT','Ab welchem Guthaben-Stand soll die Erinnerungsmail versendet werden?','0','number',1450,'de_DE','2021-01-19 11:23:49','2021-01-19 11:23:49'), +(597,1,'FCS_PURCHASE_PRICE_ENABLED','Einkaufspreis für Produkte erfassen?
Der Einkaufspreis ist die Datengrundlage für die Gewinn-Statistik und für Lieferscheine an die Hersteller.
','0','readonly',587,'de_DE','2021-05-12 15:24:17','2021-05-12 15:24:17'), +(598,1,'FCS_HELLO_CASH_API_ENABLED','Schnittstelle (API) zu Registrierkasse HelloCash (hellocash.at) aktivieren?
Alle Rechnungen (bar und unbar) über die Registrierkasse erstellen.
','0','readonly',583,'de_DE','2021-07-07 10:55:14','2021-07-07 10:55:14'), +(599,1,'FCS_SAVE_STORAGE_LOCATION_FOR_PRODUCTS','Lagerort für Produkte erfassen und in Bestelllisten anzeigen?
Lagerorte: Keine Kühlung / Kühlschrank / Tiefkühler. Es erscheint ein zusätzlicher Button neben \"Bestellungen - Bestellungen als PDF generieren\"
','0','boolean',3210,'de_DE','2021-08-02 11:28:40','2021-08-02 11:28:40'), +(600,1,'FCS_INSTAGRAM_URL','Instagram-Url für die Einbindung im Footer','','text',920,'de_DE','2021-09-10 21:23:18','2021-09-10 21:23:18'), +(601,1,'FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY','Bestellungen beim ein- und zweiwöchigen Lieferhythmus sind nur in der Woche vor der Lieferung möglich.','0','boolean',3210,'de_DE','2022-02-01 17:48:46','2022-02-01 17:48:46'), +(602,1,'FCS_INVOICE_NUMBER_PREFIX','Präfix für Rechnungs-Nummernkreis
Max. 6 Zeichen inkl. Trennzeichen.
','','readonly',586,'de_DE','2022-03-21 12:03:07','2022-03-21 12:03:07'), +(603,1,'FCS_TAX_BASED_ON_NET_INVOICE_SUM','Rechnungslegung für pauschalierte Betriebe
Die Berechnung der Umsatzsteuer erfolgt auf Basis der Netto-Rechnungsumme und ist nicht die Summe der Umsatzsteuerbeträge pro Stück.
','0','readonly',585,'de_DE','2022-03-23 09:12:43','2022-03-23 09:12:43'), +(604,1,'FCS_NEWSLETTER_ENABLED','Newsletter-Funktion aktiv?
Mitglieder können sich bei der Registrierung für den Newsletter anmelden. Mehr Infos
','0','boolean',3400,'de_DE','2022-04-12 15:28:47','2022-04-12 15:28:47'), (605,1,'FCS_USER_FEEDBACK_ENABLED','Mitglieder- und Hersteller-Feedback aktiv?
Ermöglicht das Erfassen und Anzeigen von Feedback. Mehr Infos
','0','boolean',3500,'de_DE','2022-07-19 14:39:45','2022-07-19 14:39:45'); /*!40000 ALTER TABLE `fcs_configuration` ENABLE KEYS */; @@ -192,27 +192,27 @@ INSERT INTO `fcs_configuration` VALUES /*!40000 ALTER TABLE `fcs_cronjob_logs` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_cronjobs` DISABLE KEYS */; -INSERT INTO `fcs_cronjobs` VALUES -(1,'TestCronjob','day',NULL,NULL,'22:30:00',1), -(2,'TestCronjob','week',NULL,'Monday','09:00:00',1), +INSERT INTO `fcs_cronjobs` VALUES +(1,'TestCronjob','day',NULL,NULL,'22:30:00',1), +(2,'TestCronjob','week',NULL,'Monday','09:00:00',1), (3,'TestCronjob','month',11,NULL,'07:30:00',1); /*!40000 ALTER TABLE `fcs_cronjobs` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_customer` DISABLE KEYS */; -INSERT INTO `fcs_customer` VALUES -(87,3,0,'Demo','Mitglied','fcs-demo-mitglied@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2014-12-02 12:19:31','2015-12-06 23:37:44',0,0,'SP',1,1,1,1,0), -(88,4,0,'Demo','Admin','fcs-demo-admin@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2014-12-02 12:28:43','2016-09-29 16:25:09',0,0,'SP',1,1,1,1,0), -(89,4,0,'Demo','Gemüse-Hersteller','fcs-demo-gemuese-hersteller@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:37:26','2015-03-11 18:12:10',0,0,'SP',1,1,1,1,0), -(90,4,0,'Demo','Milch-Hersteller','fcs-demo-milch-hersteller@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:37:49','2015-03-11 18:11:54',0,0,'SP',1,1,1,1,0), -(91,4,0,'Demo','Fleisch-Hersteller','fcs-demo-fleisch-hersteller@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:38:12','2015-03-11 18:11:47',0,0,'SP',1,1,1,1,0), -(92,5,0,'Demo','Superadmin','fcs-demo-superadmin@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2016-09-29 16:26:12','2016-09-29 16:26:12',0,0,'SP',1,1,1,1,0), +INSERT INTO `fcs_customer` VALUES +(87,3,0,'Demo','Mitglied','fcs-demo-mitglied@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2014-12-02 12:19:31','2015-12-06 23:37:44',0,0,'SP',1,1,1,1,0), +(88,4,0,'Demo','Admin','fcs-demo-admin@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2014-12-02 12:28:43','2016-09-29 16:25:09',0,0,'SP',1,1,1,1,0), +(89,4,0,'Demo','Gemüse-Hersteller','fcs-demo-gemuese-hersteller@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:37:26','2015-03-11 18:12:10',0,0,'SP',1,1,1,1,0), +(90,4,0,'Demo','Milch-Hersteller','fcs-demo-milch-hersteller@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:37:49','2015-03-11 18:11:54',0,0,'SP',1,1,1,1,0), +(91,4,0,'Demo','Fleisch-Hersteller','fcs-demo-fleisch-hersteller@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:38:12','2015-03-11 18:11:47',0,0,'SP',1,1,1,1,0), +(92,5,0,'Demo','Superadmin','fcs-demo-superadmin@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2016-09-29 16:26:12','2016-09-29 16:26:12',0,0,'SP',1,1,1,1,0), (93,2,0,'Demo','SB-Kunde','fcs-demo-sb-kunde@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,0,'2016-09-29 16:26:12','2016-09-29 16:26:12',0,0,'SP',1,1,1,1,0); /*!40000 ALTER TABLE `fcs_customer` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_deposits` DISABLE KEYS */; -INSERT INTO `fcs_deposits` VALUES -(1,346,0,0.5), -(2,0,9,0.5), +INSERT INTO `fcs_deposits` VALUES +(1,346,0,0.5), +(2,0,9,0.5), (3,0,10,0.5); /*!40000 ALTER TABLE `fcs_deposits` ENABLE KEYS */; @@ -220,9 +220,9 @@ INSERT INTO `fcs_deposits` VALUES /*!40000 ALTER TABLE `fcs_feedbacks` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_images` DISABLE KEYS */; -INSERT INTO `fcs_images` VALUES -(154,60), -(156,340), +INSERT INTO `fcs_images` VALUES +(154,60), +(156,340), (157,338); /*!40000 ALTER TABLE `fcs_images` ENABLE KEYS */; @@ -233,17 +233,17 @@ INSERT INTO `fcs_images` VALUES /*!40000 ALTER TABLE `fcs_invoices` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_manufacturer` DISABLE KEYS */; -INSERT INTO `fcs_manufacturer` VALUES -(4,'Demo Fleisch-Hersteller','

tests

\r\n','','2014-05-14 13:23:02','2015-05-15 13:31:41',1,0,'','','','','','','','','','',NULL,0,1,1,2,NULL,'testfcs1@mailinator.com,testfcs2@mailinator.com',NULL,NULL,NULL,1,NULL,0,0,0,'',1,0), -(5,'Demo Gemüse-Hersteller','

Gemüse-Hersteller Beschreibung lang

','
\r\n

Gemüse-Hersteller Beschreibung kurz

\r\n
','2014-05-14 13:36:44','2016-09-27 09:34:51',1,0,'','','','','','','','','','',88,0,1,1,1,NULL,'',NULL,NULL,NULL,NULL,'1',1,1,1,'',1,0), -(15,'Demo Milch-Hersteller','

Ja, ich bin der Milchhersteller!

','','2014-06-04 21:45:12','2016-03-07 09:02:25',1,0,'','','','','','','','','','',NULL,0,1,1,4,NULL,'test@test.at',NULL,NULL,NULL,NULL,NULL,0,0,0,'',1,1), +INSERT INTO `fcs_manufacturer` VALUES +(4,'Demo Fleisch-Hersteller','

tests

\r\n','','2014-05-14 13:23:02','2015-05-15 13:31:41',1,0,'','','','','','','','','','',NULL,0,1,1,2,NULL,'testfcs1@mailinator.com,testfcs2@mailinator.com',NULL,NULL,NULL,1,NULL,0,0,0,'',1,0), +(5,'Demo Gemüse-Hersteller','

Gemüse-Hersteller Beschreibung lang

','
\r\n

Gemüse-Hersteller Beschreibung kurz

\r\n
','2014-05-14 13:36:44','2016-09-27 09:34:51',1,0,'','','','','','','','','','',88,0,1,1,1,NULL,'',NULL,NULL,NULL,NULL,'1',1,1,1,'',1,0), +(15,'Demo Milch-Hersteller','

Ja, ich bin der Milchhersteller!

','','2014-06-04 21:45:12','2016-03-07 09:02:25',1,0,'','','','','','','','','','',NULL,0,1,1,4,NULL,'test@test.at',NULL,NULL,NULL,NULL,NULL,0,0,0,'',1,1), (16,'Hersteller ohne Customer-Eintrag','','','2014-06-04 21:45:12','2016-03-07 09:02:25',1,0,'','','','','','','','','','',NULL,10,1,1,1,NULL,'',NULL,NULL,NULL,NULL,NULL,0,0,0,'',1,0); /*!40000 ALTER TABLE `fcs_manufacturer` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_order_detail` DISABLE KEYS */; -INSERT INTO `fcs_order_detail` VALUES -(1,346,0,'Artischocke : Stück',1,1.820000,1.650000,0.170000,0.170000,10.000,0.50,92,NULL,1,3,'2018-02-02','SP','2018-02-01 09:17:14','2021-05-04 11:10:14'), -(2,340,0,'Beuschl',1,4.540000,4.540000,0.000000,0.000000,0.000,0.00,92,NULL,2,3,'2018-02-02','SP','2018-02-01 09:17:14','2021-05-04 11:10:14'), +INSERT INTO `fcs_order_detail` VALUES +(1,346,0,'Artischocke : Stück',1,1.820000,1.650000,0.170000,0.170000,10.000,0.50,92,NULL,1,3,'2018-02-02','SP','2018-02-01 09:17:14','2021-05-04 11:10:14'), +(2,340,0,'Beuschl',1,4.540000,4.540000,0.000000,0.000000,0.000,0.00,92,NULL,2,3,'2018-02-02','SP','2018-02-01 09:17:14','2021-05-04 11:10:14'), (3,60,10,'Milch : 0,5l',1,0.620000,0.550000,0.070000,0.070000,13.000,0.50,92,NULL,3,3,'2018-02-02','SP','2018-02-01 09:17:14','2021-05-04 11:10:14'); /*!40000 ALTER TABLE `fcs_order_detail` ENABLE KEYS */; @@ -257,13 +257,13 @@ INSERT INTO `fcs_order_detail` VALUES /*!40000 ALTER TABLE `fcs_order_detail_units` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_pages` DISABLE KEYS */; -INSERT INTO `fcs_pages` VALUES +INSERT INTO `fcs_pages` VALUES (3,'Page','',1,'header',1,'',88,0,'2016-08-29 13:36:43','2016-08-29 13:36:43',0,0,0,0); /*!40000 ALTER TABLE `fcs_pages` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_payments` DISABLE KEYS */; -INSERT INTO `fcs_payments` VALUES -(1,92,0,'product',100.00,'','2018-07-03 20:00:20','2018-07-03 20:00:20',NULL,NULL,0,1,0,'',0,92), +INSERT INTO `fcs_payments` VALUES +(1,92,0,'product',100.00,'','2018-07-03 20:00:20','2018-07-03 20:00:20',NULL,NULL,0,1,0,'',0,92), (2,87,0,'product',100000.00,'','2020-12-09 20:00:20','2020-12-09 20:00:20',NULL,NULL,0,1,0,'',0,87); /*!40000 ALTER TABLE `fcs_payments` ENABLE KEYS */; @@ -271,187 +271,187 @@ INSERT INTO `fcs_payments` VALUES /*!40000 ALTER TABLE `fcs_pickup_days` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_product` DISABLE KEYS */; -INSERT INTO `fcs_product` VALUES -(60,15,3,1,0.909091,'Milch','','1 Liter','',0,0,1,'week',1,NULL,NULL,3,NULL,'2014-06-11 21:20:24','2014-12-14 19:47:33'), -(102,4,2,1,0.000000,'Frankfurter','','

2 Paar

','',0,0,1,'week',1,NULL,NULL,3,NULL,'2016-04-27 21:13:37','2014-09-19 14:32:51'), -(103,4,2,1,3.181819,'Bratwürstel','','2 Paar','',0,0,1,'week',1,NULL,NULL,3,NULL,'2016-05-05 08:28:49','2014-08-16 14:05:58'), -(163,5,0,1,1.363637,'Mangold','','0,25kg','',0,0,1,'week',1,NULL,NULL,3,NULL,'2014-07-12 20:41:43','2017-07-26 13:24:10'), -(339,5,0,1,0.000000,'Kartoffel','','','',0,0,1,'week',1,NULL,NULL,3,NULL,'2015-09-07 12:05:38','2015-02-26 13:54:07'), -(340,4,0,1,4.545455,'Beuschl','','','',0,0,1,'week',1,NULL,NULL,3,NULL,'2016-05-05 08:28:45','2015-06-23 14:52:53'), -(344,5,0,1,0.636364,'Knoblauch','','','100 g',0,0,1,'week',1,NULL,NULL,3,NULL,'2015-10-05 17:22:40','2015-07-06 10:24:44'), -(346,5,2,1,1.652893,'Artischocke','','','Stück',0,0,1,'week',1,NULL,NULL,3,NULL,'2015-08-19 09:35:46','2015-08-19 09:35:45'), -(347,4,2,1,0.000000,'Forelle','','','Stück',0,0,1,'week',1,NULL,NULL,3,NULL,'2018-05-17 16:13:39','2018-05-17 16:15:21'), -(348,4,2,1,0.000000,'Rindfleisch','','','',0,0,1,'week',1,NULL,NULL,3,NULL,'2018-05-17 16:15:33','2018-05-17 16:16:38'), -(349,5,2,1,4.545455,'Lagerprodukt','','','',0,1,1,'week',1,NULL,NULL,3,NULL,'2018-08-16 12:15:48','2018-08-16 12:16:51'), -(350,5,2,1,0.000000,'Lagerprodukt mit Varianten','','','',0,1,1,'week',1,NULL,NULL,3,NULL,'2018-08-16 12:19:06','2018-08-16 12:19:23'), +INSERT INTO `fcs_product` VALUES +(60,15,3,1,0.909091,'Milch','','1 Liter','',0,0,1,'week',1,NULL,NULL,3,NULL,'2014-06-11 21:20:24','2014-12-14 19:47:33'), +(102,4,2,1,0.000000,'Frankfurter','','

2 Paar

','',0,0,1,'week',1,NULL,NULL,3,NULL,'2016-04-27 21:13:37','2014-09-19 14:32:51'), +(103,4,2,1,3.181819,'Bratwürstel','','2 Paar','',0,0,1,'week',1,NULL,NULL,3,NULL,'2016-05-05 08:28:49','2014-08-16 14:05:58'), +(163,5,0,1,1.363637,'Mangold','','0,25kg','',0,0,1,'week',1,NULL,NULL,3,NULL,'2014-07-12 20:41:43','2017-07-26 13:24:10'), +(339,5,0,1,0.000000,'Kartoffel','','','',0,0,1,'week',1,NULL,NULL,3,NULL,'2015-09-07 12:05:38','2015-02-26 13:54:07'), +(340,4,0,1,4.545455,'Beuschl','','','',0,0,1,'week',1,NULL,NULL,3,NULL,'2016-05-05 08:28:45','2015-06-23 14:52:53'), +(344,5,0,1,0.636364,'Knoblauch','','','100 g',0,0,1,'week',1,NULL,NULL,3,NULL,'2015-10-05 17:22:40','2015-07-06 10:24:44'), +(346,5,2,1,1.652893,'Artischocke','','','Stück',0,0,1,'week',1,NULL,NULL,3,NULL,'2015-08-19 09:35:46','2015-08-19 09:35:45'), +(347,4,2,1,0.000000,'Forelle','','','Stück',0,0,1,'week',1,NULL,NULL,3,NULL,'2018-05-17 16:13:39','2018-05-17 16:15:21'), +(348,4,2,1,0.000000,'Rindfleisch','','','',0,0,1,'week',1,NULL,NULL,3,NULL,'2018-05-17 16:15:33','2018-05-17 16:16:38'), +(349,5,2,1,4.545455,'Lagerprodukt','','','',0,1,1,'week',1,NULL,NULL,3,NULL,'2018-08-16 12:15:48','2018-08-16 12:16:51'), +(350,5,2,1,0.000000,'Lagerprodukt mit Varianten','','','',0,1,1,'week',1,NULL,NULL,3,NULL,'2018-08-16 12:19:06','2018-08-16 12:19:23'), (351,5,1,1,0.000000,'Lagerprodukt 2','','','',0,1,1,'week',1,NULL,NULL,3,NULL,'2019-06-05 15:09:53','2019-06-05 15:10:08'); /*!40000 ALTER TABLE `fcs_product` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_product_attribute` DISABLE KEYS */; -INSERT INTO `fcs_product_attribute` VALUES -(10,60,0.545455,0), -(11,348,0.000000,1), -(12,348,0.000000,0), -(13,350,1.818182,1), -(14,350,3.636364,0), +INSERT INTO `fcs_product_attribute` VALUES +(10,60,0.545455,0), +(11,348,0.000000,1), +(12,348,0.000000,0), +(13,350,1.818182,1), +(14,350,3.636364,0), (15,350,0.000000,0); /*!40000 ALTER TABLE `fcs_product_attribute` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_product_attribute_combination` DISABLE KEYS */; -INSERT INTO `fcs_product_attribute_combination` VALUES -(33,10), -(36,11), -(35,12), -(36,13), -(35,14), +INSERT INTO `fcs_product_attribute_combination` VALUES +(33,10), +(36,11), +(35,12), +(36,13), +(35,14), (36,15); /*!40000 ALTER TABLE `fcs_product_attribute_combination` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_purchase_prices` DISABLE KEYS */; -INSERT INTO `fcs_purchase_prices` VALUES -(1,346,0,1,1.200000), -(2,0,13,0,1.400000), -(3,347,0,3,NULL), -(4,348,0,3,NULL), -(5,60,0,2,NULL), -(6,0,10,0,0.250000), +INSERT INTO `fcs_purchase_prices` VALUES +(1,346,0,1,1.200000), +(2,0,13,0,1.400000), +(3,347,0,3,NULL), +(4,348,0,3,NULL), +(5,60,0,2,NULL), +(6,0,10,0,0.250000), (7,163,0,0,1.072727); /*!40000 ALTER TABLE `fcs_purchase_prices` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_sliders` DISABLE KEYS */; -INSERT INTO `fcs_sliders` VALUES -(6,'2be64c60e6126c9085fd9d9717532a14e5a5bb4e_slide4.png',NULL,0,0,1); +INSERT INTO `fcs_sliders` VALUES +(6,'demo-slider.jpg',NULL,0,0,1); /*!40000 ALTER TABLE `fcs_sliders` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_stock_available` DISABLE KEYS */; -INSERT INTO `fcs_stock_available` VALUES -(132,60,0,1015,0,NULL,1,NULL), -(195,102,0,2996,0,NULL,1,NULL), -(196,103,0,990,0,NULL,1,NULL), -(318,163,0,988,0,NULL,1,NULL), -(674,339,0,2959,0,NULL,1,NULL), -(678,340,0,990,0,NULL,1,NULL), -(680,344,0,78,0,NULL,0,NULL), -(686,346,0,97,0,NULL,0,NULL), -(692,60,9,996,0,NULL,1,NULL), -(693,60,10,19,0,NULL,0,NULL), -(704,347,0,999,0,NULL,1,NULL), -(705,348,0,1998,0,NULL,1,NULL), -(706,348,11,999,0,NULL,1,NULL), -(707,348,12,999,0,NULL,1,NULL), -(708,349,0,5,-5,0,0,NULL), -(709,350,0,1004,0,NULL,1,NULL), -(710,350,13,5,-5,0,0,NULL), -(711,350,14,999,0,NULL,1,NULL), -(712,350,15,999,0,NULL,1,NULL), +INSERT INTO `fcs_stock_available` VALUES +(132,60,0,1015,0,NULL,1,NULL), +(195,102,0,2996,0,NULL,1,NULL), +(196,103,0,990,0,NULL,1,NULL), +(318,163,0,988,0,NULL,1,NULL), +(674,339,0,2959,0,NULL,1,NULL), +(678,340,0,990,0,NULL,1,NULL), +(680,344,0,78,0,NULL,0,NULL), +(686,346,0,97,0,NULL,0,NULL), +(692,60,9,996,0,NULL,1,NULL), +(693,60,10,19,0,NULL,0,NULL), +(704,347,0,999,0,NULL,1,NULL), +(705,348,0,1998,0,NULL,1,NULL), +(706,348,11,999,0,NULL,1,NULL), +(707,348,12,999,0,NULL,1,NULL), +(708,349,0,5,-5,0,0,NULL), +(709,350,0,1004,0,NULL,1,NULL), +(710,350,13,5,-5,0,0,NULL), +(711,350,14,999,0,NULL,1,NULL), +(712,350,15,999,0,NULL,1,NULL), (713,351,0,999,0,NULL,1,NULL); /*!40000 ALTER TABLE `fcs_stock_available` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_storage_locations` DISABLE KEYS */; -INSERT INTO `fcs_storage_locations` VALUES -(1,'Keine Kühlung',10), -(2,'Kühlschrank',20), +INSERT INTO `fcs_storage_locations` VALUES +(1,'Keine Kühlung',10), +(2,'Kühlschrank',20), (3,'Tiefkühler',30); /*!40000 ALTER TABLE `fcs_storage_locations` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_sync_domains` DISABLE KEYS */; -INSERT INTO `fcs_sync_domains` VALUES +INSERT INTO `fcs_sync_domains` VALUES (1,'{{serverName}}',1); /*!40000 ALTER TABLE `fcs_sync_domains` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_sync_products` DISABLE KEYS */; -INSERT INTO `fcs_sync_products` VALUES -(1,1,346,346,0,0), -(2,1,350,350,0,0), -(3,1,350,350,14,14), +INSERT INTO `fcs_sync_products` VALUES +(1,1,346,346,0,0), +(2,1,350,350,0,0), +(3,1,350,350,14,14), (4,1,350,350,13,13); /*!40000 ALTER TABLE `fcs_sync_products` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_tax` DISABLE KEYS */; -INSERT INTO `fcs_tax` VALUES -(1,20.000,1,0), -(2,10.000,1,0), +INSERT INTO `fcs_tax` VALUES +(1,20.000,1,0), +(2,10.000,1,0), (3,13.000,1,0); /*!40000 ALTER TABLE `fcs_tax` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_units` DISABLE KEYS */; -INSERT INTO `fcs_units` VALUES -(1,347,0,1.50,0.98,'g',100,1,350.000), -(2,0,11,20.00,NULL,'kg',1,1,0.500), -(3,0,12,20.00,14.00,'g',500,1,300.000), -(4,349,0,0.00,NULL,'kg',1,0,0.000), -(5,0,13,0.00,NULL,'kg',1,0,0.000), -(6,0,14,0.00,NULL,'kg',1,0,0.000), -(7,0,15,10.00,6.00,'kg',1,1,0.500), +INSERT INTO `fcs_units` VALUES +(1,347,0,1.50,0.98,'g',100,1,350.000), +(2,0,11,20.00,NULL,'kg',1,1,0.500), +(3,0,12,20.00,14.00,'g',500,1,300.000), +(4,349,0,0.00,NULL,'kg',1,0,0.000), +(5,0,13,0.00,NULL,'kg',1,0,0.000), +(6,0,14,0.00,NULL,'kg',1,0,0.000), +(7,0,15,10.00,6.00,'kg',1,1,0.500), (8,351,0,15.00,NULL,'kg',1,1,1.000); /*!40000 ALTER TABLE `fcs_units` ENABLE KEYS */; /*!40000 ALTER TABLE `phinxlog` DISABLE KEYS */; -INSERT INTO `phinxlog` VALUES -(20200404145856,'RemoveV2Migrations','2020-04-04 15:01:12','2020-04-04 15:01:12',0), -(20200415073329,'ShowNewProductsOnHome','2020-04-15 07:42:02','2020-04-15 07:42:02',0), -(20200501192722,'EnableCashlessPaymentAddTypeConfiguration','2020-05-01 19:30:17','2020-05-01 19:30:17',0), -(20200618063024,'AddProductFeedback','2020-06-19 07:02:54','2020-06-19 07:02:55',0), -(20200703072605,'CustomerCanSelectPickupDay','2020-07-06 08:34:44','2020-07-06 08:34:44',0), -(20200831142250,'RemoveEmailLogTable','2020-08-31 15:10:29','2020-08-31 15:10:29',0), -(20200910091755,'AddMemberSettingUseCameraForMobileBarcodeScanning','2020-09-10 09:21:00','2020-09-10 09:21:00',0), -(20200925073919,'GermanIbanFix','2020-09-25 08:12:53','2020-09-25 08:12:53',0), -(20201017182431,'AdaptMinimalCreditBalance','2020-10-17 18:38:11','2020-10-17 18:38:11',0), -(20201029084931,'AddRetailMode','2020-10-29 09:06:50','2020-10-29 09:06:50',0), -(20201029084932,'AddRetailMode','2020-11-09 10:31:46','2020-11-09 10:31:47',0), -(20201118084516,'AddRetailMode2','2020-11-18 08:47:48','2020-11-18 08:47:48',0), -(20201213120713,'AddRetailMode3','2020-12-13 12:14:11','2020-12-13 12:14:11',0), -(20201217101514,'SliderWithLink','2020-12-17 10:26:47','2020-12-17 10:26:47',0), -(20201217101515,'SliderWithLink','2020-12-17 18:47:08','2020-12-17 18:47:08',0), -(20201220182015,'ImproveMemberFeeAdministration','2020-12-20 18:26:26','2020-12-20 18:26:26',0), -(20210119101923,'CheckCreditBalanceLimit','2021-01-19 10:23:49','2021-01-19 10:23:49',0), -(20210401071718,'RemoveCustomerGroupSetting','2021-04-01 07:18:55','2021-04-01 07:18:55',0), -(20210401082727,'CustomerActivateEmailCode','2021-04-01 08:29:23','2021-04-01 08:29:23',0), -(20210419084816,'BlogPostShowOnStartPageUntilDate','2021-04-19 09:41:23','2021-04-19 09:41:24',0), -(20210427144234,'RemoveOldMemberFeeSetting','2021-04-27 15:05:04','2021-04-27 15:05:04',0), -(20210504085123,'SaveTaxInOrderDetails','2021-05-04 09:10:14','2021-05-04 09:10:14',0), -(20210510080630,'EnablePurchasePrices','2021-05-12 13:24:17','2021-05-12 13:24:18',0), -(20210707083827,'AddRegistrierkasseApi','2021-07-07 08:55:14','2021-07-07 08:55:14',0), -(20210802090623,'AddStorageLocation','2021-08-02 09:28:40','2021-08-02 09:28:40',0), -(20210910191430,'Instagram','2021-09-10 19:23:18','2021-09-10 19:23:18',0), -(20210914071747,'DifferentPricesForCustomers','2021-09-16 05:50:12','2021-09-16 05:50:12',0), -(20210922154148,'RemoveUnusedQueueTable','2021-09-22 15:43:09','2021-09-22 15:43:09',0), -(20210923073422,'RemoveSettingShowNewProductsOnHome','2021-09-23 07:39:32','2021-09-23 07:39:32',0), -(20210923090820,'AllowNullAsPurchasePrice','2021-09-23 09:09:52','2021-09-23 09:09:52',0), -(20211028083847,'UseExistingBarcode','2021-10-28 08:45:02','2021-10-28 08:45:02',0), -(20211123095227,'DeactivateCheckCreditReminder','2021-11-23 10:01:05','2021-11-23 10:01:05',0), -(20211213081433,'ImproveCustomerNotifications','2021-12-13 09:24:45','2021-12-13 09:24:46',0), -(20211213081434,'ImproveCustomerNotifications','2021-12-13 10:44:55','2021-12-13 10:44:55',0), -(20211215184633,'ManufacturerSettingIncludeStockProductsOnOrderList','2021-12-15 18:51:00','2021-12-15 18:51:00',0), -(20211229194617,'AddIndizesForBetterPerformance','2021-12-29 19:53:31','2021-12-29 19:53:31',0), -(20220129082136,'SendDeliveryNotesEveryMonth','2022-01-29 08:32:01','2022-01-29 08:32:02',0), -(20220201163254,'OptionalDeliveryRhythmSettingOrderInWeekBeforeDelivery','2022-02-01 16:48:46','2022-02-01 16:48:46',0), -(20220321103059,'PrefixForInvoices','2022-03-21 11:03:07','2022-03-21 11:03:07',0), -(20220323075926,'TaxBasedOnNetInvoiceSum','2022-03-23 08:12:43','2022-03-23 08:12:43',0), -(20220407093247,'AddIsCompanyFieldForCustomer','2022-04-07 09:37:45','2022-04-07 09:37:45',0), -(20220412131842,'Newsletter','2022-04-12 13:29:05','2022-04-12 13:29:05',0), -(20220525092822,'BiggerQueuedJobDataField','2022-05-25 09:32:10','2022-05-25 09:32:10',0), -(20220620091755,'RemoveTimebasedCurrencyModule','2022-06-20 09:30:39','2022-06-20 09:30:39',0), +INSERT INTO `phinxlog` VALUES +(20200404145856,'RemoveV2Migrations','2020-04-04 15:01:12','2020-04-04 15:01:12',0), +(20200415073329,'ShowNewProductsOnHome','2020-04-15 07:42:02','2020-04-15 07:42:02',0), +(20200501192722,'EnableCashlessPaymentAddTypeConfiguration','2020-05-01 19:30:17','2020-05-01 19:30:17',0), +(20200618063024,'AddProductFeedback','2020-06-19 07:02:54','2020-06-19 07:02:55',0), +(20200703072605,'CustomerCanSelectPickupDay','2020-07-06 08:34:44','2020-07-06 08:34:44',0), +(20200831142250,'RemoveEmailLogTable','2020-08-31 15:10:29','2020-08-31 15:10:29',0), +(20200910091755,'AddMemberSettingUseCameraForMobileBarcodeScanning','2020-09-10 09:21:00','2020-09-10 09:21:00',0), +(20200925073919,'GermanIbanFix','2020-09-25 08:12:53','2020-09-25 08:12:53',0), +(20201017182431,'AdaptMinimalCreditBalance','2020-10-17 18:38:11','2020-10-17 18:38:11',0), +(20201029084931,'AddRetailMode','2020-10-29 09:06:50','2020-10-29 09:06:50',0), +(20201029084932,'AddRetailMode','2020-11-09 10:31:46','2020-11-09 10:31:47',0), +(20201118084516,'AddRetailMode2','2020-11-18 08:47:48','2020-11-18 08:47:48',0), +(20201213120713,'AddRetailMode3','2020-12-13 12:14:11','2020-12-13 12:14:11',0), +(20201217101514,'SliderWithLink','2020-12-17 10:26:47','2020-12-17 10:26:47',0), +(20201217101515,'SliderWithLink','2020-12-17 18:47:08','2020-12-17 18:47:08',0), +(20201220182015,'ImproveMemberFeeAdministration','2020-12-20 18:26:26','2020-12-20 18:26:26',0), +(20210119101923,'CheckCreditBalanceLimit','2021-01-19 10:23:49','2021-01-19 10:23:49',0), +(20210401071718,'RemoveCustomerGroupSetting','2021-04-01 07:18:55','2021-04-01 07:18:55',0), +(20210401082727,'CustomerActivateEmailCode','2021-04-01 08:29:23','2021-04-01 08:29:23',0), +(20210419084816,'BlogPostShowOnStartPageUntilDate','2021-04-19 09:41:23','2021-04-19 09:41:24',0), +(20210427144234,'RemoveOldMemberFeeSetting','2021-04-27 15:05:04','2021-04-27 15:05:04',0), +(20210504085123,'SaveTaxInOrderDetails','2021-05-04 09:10:14','2021-05-04 09:10:14',0), +(20210510080630,'EnablePurchasePrices','2021-05-12 13:24:17','2021-05-12 13:24:18',0), +(20210707083827,'AddRegistrierkasseApi','2021-07-07 08:55:14','2021-07-07 08:55:14',0), +(20210802090623,'AddStorageLocation','2021-08-02 09:28:40','2021-08-02 09:28:40',0), +(20210910191430,'Instagram','2021-09-10 19:23:18','2021-09-10 19:23:18',0), +(20210914071747,'DifferentPricesForCustomers','2021-09-16 05:50:12','2021-09-16 05:50:12',0), +(20210922154148,'RemoveUnusedQueueTable','2021-09-22 15:43:09','2021-09-22 15:43:09',0), +(20210923073422,'RemoveSettingShowNewProductsOnHome','2021-09-23 07:39:32','2021-09-23 07:39:32',0), +(20210923090820,'AllowNullAsPurchasePrice','2021-09-23 09:09:52','2021-09-23 09:09:52',0), +(20211028083847,'UseExistingBarcode','2021-10-28 08:45:02','2021-10-28 08:45:02',0), +(20211123095227,'DeactivateCheckCreditReminder','2021-11-23 10:01:05','2021-11-23 10:01:05',0), +(20211213081433,'ImproveCustomerNotifications','2021-12-13 09:24:45','2021-12-13 09:24:46',0), +(20211213081434,'ImproveCustomerNotifications','2021-12-13 10:44:55','2021-12-13 10:44:55',0), +(20211215184633,'ManufacturerSettingIncludeStockProductsOnOrderList','2021-12-15 18:51:00','2021-12-15 18:51:00',0), +(20211229194617,'AddIndizesForBetterPerformance','2021-12-29 19:53:31','2021-12-29 19:53:31',0), +(20220129082136,'SendDeliveryNotesEveryMonth','2022-01-29 08:32:01','2022-01-29 08:32:02',0), +(20220201163254,'OptionalDeliveryRhythmSettingOrderInWeekBeforeDelivery','2022-02-01 16:48:46','2022-02-01 16:48:46',0), +(20220321103059,'PrefixForInvoices','2022-03-21 11:03:07','2022-03-21 11:03:07',0), +(20220323075926,'TaxBasedOnNetInvoiceSum','2022-03-23 08:12:43','2022-03-23 08:12:43',0), +(20220407093247,'AddIsCompanyFieldForCustomer','2022-04-07 09:37:45','2022-04-07 09:37:45',0), +(20220412131842,'Newsletter','2022-04-12 13:29:05','2022-04-12 13:29:05',0), +(20220525092822,'BiggerQueuedJobDataField','2022-05-25 09:32:10','2022-05-25 09:32:10',0), +(20220620091755,'RemoveTimebasedCurrencyModule','2022-06-20 09:30:39','2022-06-20 09:30:39',0), (20220717194215,'UserFeedback','2022-07-19 12:39:45','2022-07-19 12:39:45',0); /*!40000 ALTER TABLE `phinxlog` ENABLE KEYS */; /*!40000 ALTER TABLE `queue_phinxlog` DISABLE KEYS */; -INSERT INTO `queue_phinxlog` VALUES -(20150425180802,'Init','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20150511062806,'Fixmissing','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20150911132343,'ImprovementsForMysql','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20161319000000,'IncreaseDataSize','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20161319000001,'Priority','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20161319000002,'Rename','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20161319000003,'Processes','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20171013131845,'AlterQueuedJobs','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20171013133145,'Utf8mb4Fix','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20171019083500,'ColumnLength','2020-09-17 07:23:31','2020-09-17 07:23:32',0), -(20171019083501,'MigrationQueueNull','2020-09-17 07:23:32','2020-09-17 07:23:32',0), -(20171019083502,'MigrationQueueStatus','2020-09-17 07:23:32','2020-09-17 07:23:32',0), -(20171019083503,'MigrationQueueProcesses','2020-09-17 07:23:32','2020-09-17 07:23:32',0), -(20171019083505,'MigrationQueueProcessesIndex','2020-09-17 07:23:32','2020-09-17 07:23:32',0), -(20171019083506,'MigrationQueueProcessesKey','2020-09-17 07:23:32','2020-09-17 07:23:32',0), +INSERT INTO `queue_phinxlog` VALUES +(20150425180802,'Init','2020-09-17 07:23:31','2020-09-17 07:23:31',0), +(20150511062806,'Fixmissing','2020-09-17 07:23:31','2020-09-17 07:23:31',0), +(20150911132343,'ImprovementsForMysql','2020-09-17 07:23:31','2020-09-17 07:23:31',0), +(20161319000000,'IncreaseDataSize','2020-09-17 07:23:31','2020-09-17 07:23:31',0), +(20161319000001,'Priority','2020-09-17 07:23:31','2020-09-17 07:23:31',0), +(20161319000002,'Rename','2020-09-17 07:23:31','2020-09-17 07:23:31',0), +(20161319000003,'Processes','2020-09-17 07:23:31','2020-09-17 07:23:31',0), +(20171013131845,'AlterQueuedJobs','2020-09-17 07:23:31','2020-09-17 07:23:31',0), +(20171013133145,'Utf8mb4Fix','2020-09-17 07:23:31','2020-09-17 07:23:31',0), +(20171019083500,'ColumnLength','2020-09-17 07:23:31','2020-09-17 07:23:32',0), +(20171019083501,'MigrationQueueNull','2020-09-17 07:23:32','2020-09-17 07:23:32',0), +(20171019083502,'MigrationQueueStatus','2020-09-17 07:23:32','2020-09-17 07:23:32',0), +(20171019083503,'MigrationQueueProcesses','2020-09-17 07:23:32','2020-09-17 07:23:32',0), +(20171019083505,'MigrationQueueProcessesIndex','2020-09-17 07:23:32','2020-09-17 07:23:32',0), +(20171019083506,'MigrationQueueProcessesKey','2020-09-17 07:23:32','2020-09-17 07:23:32',0), (20191319000002,'MigrationQueueRename','2021-07-20 11:13:02','2021-07-20 11:13:02',0); /*!40000 ALTER TABLE `queue_phinxlog` ENABLE KEYS */; From bef1288791d5ff6f5a7936de4fe37a440c6f2de8 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 25 Sep 2022 21:05:52 +0200 Subject: [PATCH 087/646] gitpod --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2481c4883b..75af5fda36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,8 +15,7 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe - Die Konfiguration "Freitag Bestellschluss / Samstag Bestelllisten-Versand / Donnerstag Abholtag" ist jetzt möglich. [I#866](https://github.com/foodcoopshop/foodcoopshop/issues/866) / [PR#867](https://github.com/foodcoopshop/foodcoopshop/pull/867) ### For developers -- 🐳 The new [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) makes contributing much easier. Try it out! [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) - +- New 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) and [Gitpod-Integration](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop). [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) / [PR#879](https://github.com/foodcoopshop/foodcoopshop/pull/879) # v3.5.0 From 0cbe34b5d4b5ddfedddbd04623e6c5ad031ce6f1 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 25 Sep 2022 21:11:36 +0200 Subject: [PATCH 088/646] not for production --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 7213a29017..a7fbc6f3f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,5 @@ +#The provided docker should NOT BE USED IN PRODUCTION ENVIRONMENTS! + version: '3' services: From cf0105acf9a4eca1710112f33ecbb4c5f56bef8c Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 25 Sep 2022 21:20:42 +0200 Subject: [PATCH 089/646] vendor updates --- composer.lock | 165 ++++++++++++++++++++------------------ webroot/package-lock.json | 28 +++---- webroot/package.json | 4 +- 3 files changed, 101 insertions(+), 96 deletions(-) diff --git a/composer.lock b/composer.lock index 8f23c156fa..b3e6c79418 100644 --- a/composer.lock +++ b/composer.lock @@ -171,22 +171,22 @@ }, { "name": "cakephp/migrations", - "version": "3.5.2", + "version": "3.5.3", "source": { "type": "git", "url": "https://github.com/cakephp/migrations.git", - "reference": "e1b03bfef53ce41feabbf2120021ad5187e80289" + "reference": "8ba15cc92b9ba938c6f925bbcd3735464b1b1ef7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/migrations/zipball/e1b03bfef53ce41feabbf2120021ad5187e80289", - "reference": "e1b03bfef53ce41feabbf2120021ad5187e80289", + "url": "https://api.github.com/repos/cakephp/migrations/zipball/8ba15cc92b9ba938c6f925bbcd3735464b1b1ef7", + "reference": "8ba15cc92b9ba938c6f925bbcd3735464b1b1ef7", "shasum": "" }, "require": { "cakephp/cache": "^4.3.0", "cakephp/orm": "^4.3.0", - "php": ">=7.2.0", + "php": ">=7.4.0", "robmorgan/phinx": "^0.12" }, "require-dev": { @@ -227,7 +227,7 @@ "issues": "https://github.com/cakephp/migrations/issues", "source": "https://github.com/cakephp/migrations" }, - "time": "2022-05-10T15:01:58+00:00" + "time": "2022-09-25T02:30:10+00:00" }, { "name": "cakephp/plugin-installer", @@ -964,30 +964,30 @@ }, { "name": "laminas/laminas-httphandlerrunner", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-httphandlerrunner.git", - "reference": "4d337cde83e6b901a4443b0ab5c3b97cbaa46413" + "reference": "eb670c5c7167cd218c61a8b4f6ab9ce339200c16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/4d337cde83e6b901a4443b0ab5c3b97cbaa46413", - "reference": "4d337cde83e6b901a4443b0ab5c3b97cbaa46413", + "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/eb670c5c7167cd218c61a8b4f6ab9ce339200c16", + "reference": "eb670c5c7167cd218c61a8b4f6ab9ce339200c16", "shasum": "" }, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0", + "php": "^7.4 || ~8.0.0 || ~8.1.0", "psr/http-message": "^1.0", "psr/http-message-implementation": "^1.0", "psr/http-server-handler": "^1.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.3.0", - "laminas/laminas-diactoros": "^2.8.0", - "phpunit/phpunit": "^9.5.9", - "psalm/plugin-phpunit": "^0.16.1", - "vimeo/psalm": "^4.10.0" + "laminas/laminas-coding-standard": "~2.4.0", + "laminas/laminas-diactoros": "^2.13.0", + "phpunit/phpunit": "^9.5.21", + "psalm/plugin-phpunit": "^0.17.0", + "vimeo/psalm": "^4.24.0" }, "type": "library", "extra": { @@ -1027,7 +1027,7 @@ "type": "community_bridge" } ], - "time": "2021-09-22T09:27:36+00:00" + "time": "2022-09-17T16:24:51+00:00" }, { "name": "league/climate", @@ -1871,16 +1871,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.24.1", + "version": "1.25.2", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "69991111e05fca3ff7398e1e7fca9ebed33efec6" + "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/69991111e05fca3ff7398e1e7fca9ebed33efec6", - "reference": "69991111e05fca3ff7398e1e7fca9ebed33efec6", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a317a09e7def49852400a4b3eca4a4b0790ceeb5", + "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5", "shasum": "" }, "require": { @@ -1897,33 +1897,34 @@ "ext-xmlwriter": "*", "ext-zip": "*", "ext-zlib": "*", - "ezyang/htmlpurifier": "^4.13", + "ezyang/htmlpurifier": "^4.15", "maennchen/zipstream-php": "^2.1", "markbaker/complex": "^3.0", "markbaker/matrix": "^3.0", "php": "^7.3 || ^8.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/simple-cache": "^1.0 || ^2.0" + "psr/simple-cache": "^1.0 || ^2.0 || ^3.0" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "dev-master", "dompdf/dompdf": "^1.0 || ^2.0", "friendsofphp/php-cs-fixer": "^3.2", - "jpgraph/jpgraph": "^4.0", + "mitoteam/jpgraph": "10.2.4", "mpdf/mpdf": "8.1.1", "phpcompatibility/php-compatibility": "^9.3", "phpstan/phpstan": "^1.1", "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^8.5 || ^9.0", "squizlabs/php_codesniffer": "^3.7", - "tecnickcom/tcpdf": "^6.4" + "tecnickcom/tcpdf": "6.5" }, "suggest": { - "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)", - "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", + "dompdf/dompdf": "Option for rendering PDF with PDF Writer", + "ext-intl": "PHP Internationalization Functions", + "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", "mpdf/mpdf": "Option for rendering PDF with PDF Writer", - "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)" + "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer" }, "type": "library", "autoload": { @@ -1969,9 +1970,9 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.24.1" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.25.2" }, - "time": "2022-07-18T19:50:48+00:00" + "time": "2022-09-25T17:21:01+00:00" }, { "name": "psr/container", @@ -3787,16 +3788,16 @@ }, { "name": "composer/composer", - "version": "2.4.1", + "version": "2.4.2", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "777d542e3af65f8e7a66a4d98ce7a697da339414" + "reference": "7d887621e69a0311eb50aed4a16f7044b2b385b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/777d542e3af65f8e7a66a4d98ce7a697da339414", - "reference": "777d542e3af65f8e7a66a4d98ce7a697da339414", + "url": "https://api.github.com/repos/composer/composer/zipball/7d887621e69a0311eb50aed4a16f7044b2b385b9", + "reference": "7d887621e69a0311eb50aed4a16f7044b2b385b9", "shasum": "" }, "require": { @@ -3826,7 +3827,7 @@ "phpstan/phpstan-deprecation-rules": "^1", "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1", - "phpstan/phpstan-symfony": "^1.1", + "phpstan/phpstan-symfony": "^1.2.10", "symfony/phpunit-bridge": "^6.0" }, "suggest": { @@ -3879,7 +3880,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.4.1" + "source": "https://github.com/composer/composer/tree/2.4.2" }, "funding": [ { @@ -3895,7 +3896,7 @@ "type": "tidelift" } ], - "time": "2022-08-20T09:44:50+00:00" + "time": "2022-09-14T14:11:15+00:00" }, { "name": "composer/metadata-minifier", @@ -4761,16 +4762,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "367a8d9d5f7da2a0136422d27ce8840583926955" + "reference": "8dd908dd6156e974b9a0f8bb4cd5ad0707830f04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/367a8d9d5f7da2a0136422d27ce8840583926955", - "reference": "367a8d9d5f7da2a0136422d27ce8840583926955", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/8dd908dd6156e974b9a0f8bb4cd5ad0707830f04", + "reference": "8dd908dd6156e974b9a0f8bb4cd5ad0707830f04", "shasum": "" }, "require": { @@ -4800,22 +4801,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.7.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.8.0" }, - "time": "2022-08-09T12:23:23+00:00" + "time": "2022-09-04T18:59:06+00:00" }, { "name": "phpstan/phpstan", - "version": "1.8.5", + "version": "1.8.6", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20" + "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6598a5ff12ca4499a836815e08b4d77a2ddeb20", - "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c386ab2741e64cc9e21729f891b28b2b10fe6618", + "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618", "shasum": "" }, "require": { @@ -4845,7 +4846,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.8.5" + "source": "https://github.com/phpstan/phpstan/tree/1.8.6" }, "funding": [ { @@ -4861,7 +4862,7 @@ "type": "tidelift" } ], - "time": "2022-09-07T16:05:32+00:00" + "time": "2022-09-23T09:54:39+00:00" }, { "name": "phpunit/php-code-coverage", @@ -5183,16 +5184,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.24", + "version": "9.5.25", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5" + "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", - "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", + "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", "shasum": "" }, "require": { @@ -5214,14 +5215,14 @@ "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", + "sebastian/comparator": "^4.0.8", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", + "sebastian/exporter": "^4.0.5", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.1", + "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" }, "suggest": { @@ -5265,7 +5266,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25" }, "funding": [ { @@ -5275,9 +5276,13 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], - "time": "2022-08-30T07:42:16+00:00" + "time": "2022-09-25T03:44:45+00:00" }, { "name": "psy/psysh", @@ -5600,16 +5605,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.6", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382" + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", "shasum": "" }, "require": { @@ -5662,7 +5667,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" }, "funding": [ { @@ -5670,7 +5675,7 @@ "type": "github" } ], - "time": "2020-10-26T15:49:45+00:00" + "time": "2022-09-14T12:41:17+00:00" }, { "name": "sebastian/complexity", @@ -5860,16 +5865,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9" + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", "shasum": "" }, "require": { @@ -5925,7 +5930,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" }, "funding": [ { @@ -5933,7 +5938,7 @@ "type": "github" } ], - "time": "2021-11-11T14:18:36+00:00" + "time": "2022-09-14T06:03:37+00:00" }, { "name": "sebastian/global-state", @@ -6570,32 +6575,32 @@ }, { "name": "slevomat/coding-standard", - "version": "8.4.0", + "version": "8.5.1", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "02f27326be19633a1b6ba76745390bbf9a4be0b6" + "reference": "971f489404350bf4608b7e59381e603c47700366" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/02f27326be19633a1b6ba76745390bbf9a4be0b6", - "reference": "02f27326be19633a1b6ba76745390bbf9a4be0b6", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/971f489404350bf4608b7e59381e603c47700366", + "reference": "971f489404350bf4608b7e59381e603c47700366", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", "php": "^7.2 || ^8.0", - "phpstan/phpdoc-parser": ">=1.7.0 <1.8.0", + "phpstan/phpdoc-parser": ">=1.7.0 <1.9.0", "squizlabs/php_codesniffer": "^3.7.1" }, "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.10|1.8.2", + "phpstan/phpstan": "1.4.10|1.8.5", "phpstan/phpstan-deprecation-rules": "1.0.0", "phpstan/phpstan-phpunit": "1.0.0|1.1.1", - "phpstan/phpstan-strict-rules": "1.3.0", - "phpunit/phpunit": "7.5.20|8.5.21|9.5.21" + "phpstan/phpstan-strict-rules": "1.4.3", + "phpunit/phpunit": "7.5.20|8.5.21|9.5.24" }, "type": "phpcodesniffer-standard", "extra": { @@ -6615,7 +6620,7 @@ "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.4.0" + "source": "https://github.com/slevomat/coding-standard/tree/8.5.1" }, "funding": [ { @@ -6627,7 +6632,7 @@ "type": "tidelift" } ], - "time": "2022-08-09T19:03:45+00:00" + "time": "2022-09-23T05:34:53+00:00" }, { "name": "squizlabs/php_codesniffer", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index a9b2b51ea5..00d7197a24 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -9,7 +9,7 @@ "license": "AGPL-3.0", "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", - "@ericblade/quagga2": "^1.7.3", + "@ericblade/quagga2": "^1.7.4", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.1", @@ -32,7 +32,7 @@ "svelte": "^3.50.1", "swiper": "8.4.2", "tooltipster": "^4.2.8", - "uglify-js": "^3.17.0", + "uglify-js": "^3.17.2", "webrtc-adapter": "^8.1.2" } }, @@ -53,9 +53,9 @@ } }, "node_modules/@ericblade/quagga2": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.3.tgz", - "integrity": "sha512-c6OEkGXj903K72SKbUviQuvC/i4IHo6TySXVq0w8ywDARrp+K+uaTgOv2QXTgnLS5lTvmpFCCiKTvEF9sBvhKA==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.4.tgz", + "integrity": "sha512-7rBY0mPgV0iAIyrXUrijbitzglculdOizpj2IljvbhRoABvybZCJGXCxmnO7Vwuju7LclwRNZLPu+E0xmOFmSQ==", "dependencies": { "@babel/polyfill": "^7.12.1", "get-pixels": "^3.3.3", @@ -1080,9 +1080,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "node_modules/uglify-js": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.0.tgz", - "integrity": "sha512-aTeNPVmgIMPpm1cxXr2Q/nEbvkmV8yq66F3om7X3P/cvOXQ0TMQ64Wk63iyT1gPlmdmGzjGpyLh1f3y8MZWXGg==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.2.tgz", + "integrity": "sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg==", "bin": { "uglifyjs": "bin/uglifyjs" }, @@ -1156,9 +1156,9 @@ } }, "@ericblade/quagga2": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.3.tgz", - "integrity": "sha512-c6OEkGXj903K72SKbUviQuvC/i4IHo6TySXVq0w8ywDARrp+K+uaTgOv2QXTgnLS5lTvmpFCCiKTvEF9sBvhKA==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.4.tgz", + "integrity": "sha512-7rBY0mPgV0iAIyrXUrijbitzglculdOizpj2IljvbhRoABvybZCJGXCxmnO7Vwuju7LclwRNZLPu+E0xmOFmSQ==", "requires": { "@babel/polyfill": "^7.12.1", "fsevents": "2.3.2", @@ -1939,9 +1939,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "uglify-js": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.0.tgz", - "integrity": "sha512-aTeNPVmgIMPpm1cxXr2Q/nEbvkmV8yq66F3om7X3P/cvOXQ0TMQ64Wk63iyT1gPlmdmGzjGpyLh1f3y8MZWXGg==" + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.2.tgz", + "integrity": "sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg==" }, "uniq": { "version": "1.0.1", diff --git a/webroot/package.json b/webroot/package.json index cc53db9669..0c2ea7ebcb 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", - "@ericblade/quagga2": "^1.7.3", + "@ericblade/quagga2": "^1.7.4", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.1", @@ -38,7 +38,7 @@ "svelte": "^3.50.1", "swiper": "8.4.2", "tooltipster": "^4.2.8", - "uglify-js": "^3.17.0", + "uglify-js": "^3.17.2", "webrtc-adapter": "^8.1.2" } } From 8f018a62db8f406fb1d337b4aecb07f37b86d8ad Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 25 Sep 2022 21:40:59 +0200 Subject: [PATCH 090/646] Revert "vendor updates" This reverts commit cf0105acf9a4eca1710112f33ecbb4c5f56bef8c. --- composer.lock | 165 ++++++++++++++++++-------------------- webroot/package-lock.json | 28 +++---- webroot/package.json | 4 +- 3 files changed, 96 insertions(+), 101 deletions(-) diff --git a/composer.lock b/composer.lock index b3e6c79418..8f23c156fa 100644 --- a/composer.lock +++ b/composer.lock @@ -171,22 +171,22 @@ }, { "name": "cakephp/migrations", - "version": "3.5.3", + "version": "3.5.2", "source": { "type": "git", "url": "https://github.com/cakephp/migrations.git", - "reference": "8ba15cc92b9ba938c6f925bbcd3735464b1b1ef7" + "reference": "e1b03bfef53ce41feabbf2120021ad5187e80289" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/migrations/zipball/8ba15cc92b9ba938c6f925bbcd3735464b1b1ef7", - "reference": "8ba15cc92b9ba938c6f925bbcd3735464b1b1ef7", + "url": "https://api.github.com/repos/cakephp/migrations/zipball/e1b03bfef53ce41feabbf2120021ad5187e80289", + "reference": "e1b03bfef53ce41feabbf2120021ad5187e80289", "shasum": "" }, "require": { "cakephp/cache": "^4.3.0", "cakephp/orm": "^4.3.0", - "php": ">=7.4.0", + "php": ">=7.2.0", "robmorgan/phinx": "^0.12" }, "require-dev": { @@ -227,7 +227,7 @@ "issues": "https://github.com/cakephp/migrations/issues", "source": "https://github.com/cakephp/migrations" }, - "time": "2022-09-25T02:30:10+00:00" + "time": "2022-05-10T15:01:58+00:00" }, { "name": "cakephp/plugin-installer", @@ -964,30 +964,30 @@ }, { "name": "laminas/laminas-httphandlerrunner", - "version": "2.2.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-httphandlerrunner.git", - "reference": "eb670c5c7167cd218c61a8b4f6ab9ce339200c16" + "reference": "4d337cde83e6b901a4443b0ab5c3b97cbaa46413" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/eb670c5c7167cd218c61a8b4f6ab9ce339200c16", - "reference": "eb670c5c7167cd218c61a8b4f6ab9ce339200c16", + "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/4d337cde83e6b901a4443b0ab5c3b97cbaa46413", + "reference": "4d337cde83e6b901a4443b0ab5c3b97cbaa46413", "shasum": "" }, "require": { - "php": "^7.4 || ~8.0.0 || ~8.1.0", + "php": "^7.3 || ~8.0.0 || ~8.1.0", "psr/http-message": "^1.0", "psr/http-message-implementation": "^1.0", "psr/http-server-handler": "^1.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-diactoros": "^2.13.0", - "phpunit/phpunit": "^9.5.21", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.24.0" + "laminas/laminas-coding-standard": "~2.3.0", + "laminas/laminas-diactoros": "^2.8.0", + "phpunit/phpunit": "^9.5.9", + "psalm/plugin-phpunit": "^0.16.1", + "vimeo/psalm": "^4.10.0" }, "type": "library", "extra": { @@ -1027,7 +1027,7 @@ "type": "community_bridge" } ], - "time": "2022-09-17T16:24:51+00:00" + "time": "2021-09-22T09:27:36+00:00" }, { "name": "league/climate", @@ -1871,16 +1871,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.25.2", + "version": "1.24.1", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5" + "reference": "69991111e05fca3ff7398e1e7fca9ebed33efec6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a317a09e7def49852400a4b3eca4a4b0790ceeb5", - "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/69991111e05fca3ff7398e1e7fca9ebed33efec6", + "reference": "69991111e05fca3ff7398e1e7fca9ebed33efec6", "shasum": "" }, "require": { @@ -1897,34 +1897,33 @@ "ext-xmlwriter": "*", "ext-zip": "*", "ext-zlib": "*", - "ezyang/htmlpurifier": "^4.15", + "ezyang/htmlpurifier": "^4.13", "maennchen/zipstream-php": "^2.1", "markbaker/complex": "^3.0", "markbaker/matrix": "^3.0", "php": "^7.3 || ^8.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/simple-cache": "^1.0 || ^2.0 || ^3.0" + "psr/simple-cache": "^1.0 || ^2.0" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "dev-master", "dompdf/dompdf": "^1.0 || ^2.0", "friendsofphp/php-cs-fixer": "^3.2", - "mitoteam/jpgraph": "10.2.4", + "jpgraph/jpgraph": "^4.0", "mpdf/mpdf": "8.1.1", "phpcompatibility/php-compatibility": "^9.3", "phpstan/phpstan": "^1.1", "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^8.5 || ^9.0", "squizlabs/php_codesniffer": "^3.7", - "tecnickcom/tcpdf": "6.5" + "tecnickcom/tcpdf": "^6.4" }, "suggest": { - "dompdf/dompdf": "Option for rendering PDF with PDF Writer", - "ext-intl": "PHP Internationalization Functions", - "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", + "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)", + "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", "mpdf/mpdf": "Option for rendering PDF with PDF Writer", - "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer" + "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)" }, "type": "library", "autoload": { @@ -1970,9 +1969,9 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.25.2" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.24.1" }, - "time": "2022-09-25T17:21:01+00:00" + "time": "2022-07-18T19:50:48+00:00" }, { "name": "psr/container", @@ -3788,16 +3787,16 @@ }, { "name": "composer/composer", - "version": "2.4.2", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "7d887621e69a0311eb50aed4a16f7044b2b385b9" + "reference": "777d542e3af65f8e7a66a4d98ce7a697da339414" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/7d887621e69a0311eb50aed4a16f7044b2b385b9", - "reference": "7d887621e69a0311eb50aed4a16f7044b2b385b9", + "url": "https://api.github.com/repos/composer/composer/zipball/777d542e3af65f8e7a66a4d98ce7a697da339414", + "reference": "777d542e3af65f8e7a66a4d98ce7a697da339414", "shasum": "" }, "require": { @@ -3827,7 +3826,7 @@ "phpstan/phpstan-deprecation-rules": "^1", "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1", - "phpstan/phpstan-symfony": "^1.2.10", + "phpstan/phpstan-symfony": "^1.1", "symfony/phpunit-bridge": "^6.0" }, "suggest": { @@ -3880,7 +3879,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.4.2" + "source": "https://github.com/composer/composer/tree/2.4.1" }, "funding": [ { @@ -3896,7 +3895,7 @@ "type": "tidelift" } ], - "time": "2022-09-14T14:11:15+00:00" + "time": "2022-08-20T09:44:50+00:00" }, { "name": "composer/metadata-minifier", @@ -4762,16 +4761,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.8.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "8dd908dd6156e974b9a0f8bb4cd5ad0707830f04" + "reference": "367a8d9d5f7da2a0136422d27ce8840583926955" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/8dd908dd6156e974b9a0f8bb4cd5ad0707830f04", - "reference": "8dd908dd6156e974b9a0f8bb4cd5ad0707830f04", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/367a8d9d5f7da2a0136422d27ce8840583926955", + "reference": "367a8d9d5f7da2a0136422d27ce8840583926955", "shasum": "" }, "require": { @@ -4801,22 +4800,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.8.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.7.0" }, - "time": "2022-09-04T18:59:06+00:00" + "time": "2022-08-09T12:23:23+00:00" }, { "name": "phpstan/phpstan", - "version": "1.8.6", + "version": "1.8.5", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618" + "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c386ab2741e64cc9e21729f891b28b2b10fe6618", - "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6598a5ff12ca4499a836815e08b4d77a2ddeb20", + "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20", "shasum": "" }, "require": { @@ -4846,7 +4845,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.8.6" + "source": "https://github.com/phpstan/phpstan/tree/1.8.5" }, "funding": [ { @@ -4862,7 +4861,7 @@ "type": "tidelift" } ], - "time": "2022-09-23T09:54:39+00:00" + "time": "2022-09-07T16:05:32+00:00" }, { "name": "phpunit/php-code-coverage", @@ -5184,16 +5183,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.25", + "version": "9.5.24", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d" + "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", - "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", + "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", "shasum": "" }, "require": { @@ -5215,14 +5214,14 @@ "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.8", + "sebastian/comparator": "^4.0.5", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.5", + "sebastian/exporter": "^4.0.3", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.2", + "sebastian/type": "^3.1", "sebastian/version": "^3.0.2" }, "suggest": { @@ -5266,7 +5265,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24" }, "funding": [ { @@ -5276,13 +5275,9 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", - "type": "tidelift" } ], - "time": "2022-09-25T03:44:45+00:00" + "time": "2022-08-30T07:42:16+00:00" }, { "name": "psy/psysh", @@ -5605,16 +5600,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.8", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "fa0f136dd2334583309d32b62544682ee972b51a" + "reference": "55f4261989e546dc112258c7a75935a81a7ce382" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", - "reference": "fa0f136dd2334583309d32b62544682ee972b51a", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", + "reference": "55f4261989e546dc112258c7a75935a81a7ce382", "shasum": "" }, "require": { @@ -5667,7 +5662,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" }, "funding": [ { @@ -5675,7 +5670,7 @@ "type": "github" } ], - "time": "2022-09-14T12:41:17+00:00" + "time": "2020-10-26T15:49:45+00:00" }, { "name": "sebastian/complexity", @@ -5865,16 +5860,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.5", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9", + "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9", "shasum": "" }, "require": { @@ -5930,7 +5925,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4" }, "funding": [ { @@ -5938,7 +5933,7 @@ "type": "github" } ], - "time": "2022-09-14T06:03:37+00:00" + "time": "2021-11-11T14:18:36+00:00" }, { "name": "sebastian/global-state", @@ -6575,32 +6570,32 @@ }, { "name": "slevomat/coding-standard", - "version": "8.5.1", + "version": "8.4.0", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "971f489404350bf4608b7e59381e603c47700366" + "reference": "02f27326be19633a1b6ba76745390bbf9a4be0b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/971f489404350bf4608b7e59381e603c47700366", - "reference": "971f489404350bf4608b7e59381e603c47700366", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/02f27326be19633a1b6ba76745390bbf9a4be0b6", + "reference": "02f27326be19633a1b6ba76745390bbf9a4be0b6", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", "php": "^7.2 || ^8.0", - "phpstan/phpdoc-parser": ">=1.7.0 <1.9.0", + "phpstan/phpdoc-parser": ">=1.7.0 <1.8.0", "squizlabs/php_codesniffer": "^3.7.1" }, "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.10|1.8.5", + "phpstan/phpstan": "1.4.10|1.8.2", "phpstan/phpstan-deprecation-rules": "1.0.0", "phpstan/phpstan-phpunit": "1.0.0|1.1.1", - "phpstan/phpstan-strict-rules": "1.4.3", - "phpunit/phpunit": "7.5.20|8.5.21|9.5.24" + "phpstan/phpstan-strict-rules": "1.3.0", + "phpunit/phpunit": "7.5.20|8.5.21|9.5.21" }, "type": "phpcodesniffer-standard", "extra": { @@ -6620,7 +6615,7 @@ "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.5.1" + "source": "https://github.com/slevomat/coding-standard/tree/8.4.0" }, "funding": [ { @@ -6632,7 +6627,7 @@ "type": "tidelift" } ], - "time": "2022-09-23T05:34:53+00:00" + "time": "2022-08-09T19:03:45+00:00" }, { "name": "squizlabs/php_codesniffer", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index 00d7197a24..a9b2b51ea5 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -9,7 +9,7 @@ "license": "AGPL-3.0", "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", - "@ericblade/quagga2": "^1.7.4", + "@ericblade/quagga2": "^1.7.3", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.1", @@ -32,7 +32,7 @@ "svelte": "^3.50.1", "swiper": "8.4.2", "tooltipster": "^4.2.8", - "uglify-js": "^3.17.2", + "uglify-js": "^3.17.0", "webrtc-adapter": "^8.1.2" } }, @@ -53,9 +53,9 @@ } }, "node_modules/@ericblade/quagga2": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.4.tgz", - "integrity": "sha512-7rBY0mPgV0iAIyrXUrijbitzglculdOizpj2IljvbhRoABvybZCJGXCxmnO7Vwuju7LclwRNZLPu+E0xmOFmSQ==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.3.tgz", + "integrity": "sha512-c6OEkGXj903K72SKbUviQuvC/i4IHo6TySXVq0w8ywDARrp+K+uaTgOv2QXTgnLS5lTvmpFCCiKTvEF9sBvhKA==", "dependencies": { "@babel/polyfill": "^7.12.1", "get-pixels": "^3.3.3", @@ -1080,9 +1080,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "node_modules/uglify-js": { - "version": "3.17.2", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.2.tgz", - "integrity": "sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.0.tgz", + "integrity": "sha512-aTeNPVmgIMPpm1cxXr2Q/nEbvkmV8yq66F3om7X3P/cvOXQ0TMQ64Wk63iyT1gPlmdmGzjGpyLh1f3y8MZWXGg==", "bin": { "uglifyjs": "bin/uglifyjs" }, @@ -1156,9 +1156,9 @@ } }, "@ericblade/quagga2": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.4.tgz", - "integrity": "sha512-7rBY0mPgV0iAIyrXUrijbitzglculdOizpj2IljvbhRoABvybZCJGXCxmnO7Vwuju7LclwRNZLPu+E0xmOFmSQ==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.3.tgz", + "integrity": "sha512-c6OEkGXj903K72SKbUviQuvC/i4IHo6TySXVq0w8ywDARrp+K+uaTgOv2QXTgnLS5lTvmpFCCiKTvEF9sBvhKA==", "requires": { "@babel/polyfill": "^7.12.1", "fsevents": "2.3.2", @@ -1939,9 +1939,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "uglify-js": { - "version": "3.17.2", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.2.tgz", - "integrity": "sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg==" + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.0.tgz", + "integrity": "sha512-aTeNPVmgIMPpm1cxXr2Q/nEbvkmV8yq66F3om7X3P/cvOXQ0TMQ64Wk63iyT1gPlmdmGzjGpyLh1f3y8MZWXGg==" }, "uniq": { "version": "1.0.1", diff --git a/webroot/package.json b/webroot/package.json index 0c2ea7ebcb..cc53db9669 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", - "@ericblade/quagga2": "^1.7.4", + "@ericblade/quagga2": "^1.7.3", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.1", @@ -38,7 +38,7 @@ "svelte": "^3.50.1", "swiper": "8.4.2", "tooltipster": "^4.2.8", - "uglify-js": "^3.17.2", + "uglify-js": "^3.17.0", "webrtc-adapter": "^8.1.2" } } From dcfedd9e332c4eb6dae46385de878338939fd452 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 25 Sep 2022 21:42:52 +0200 Subject: [PATCH 091/646] vendor udpates --- webroot/package-lock.json | 28 ++++++++++++++-------------- webroot/package.json | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/webroot/package-lock.json b/webroot/package-lock.json index a9b2b51ea5..00d7197a24 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -9,7 +9,7 @@ "license": "AGPL-3.0", "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", - "@ericblade/quagga2": "^1.7.3", + "@ericblade/quagga2": "^1.7.4", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.1", @@ -32,7 +32,7 @@ "svelte": "^3.50.1", "swiper": "8.4.2", "tooltipster": "^4.2.8", - "uglify-js": "^3.17.0", + "uglify-js": "^3.17.2", "webrtc-adapter": "^8.1.2" } }, @@ -53,9 +53,9 @@ } }, "node_modules/@ericblade/quagga2": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.3.tgz", - "integrity": "sha512-c6OEkGXj903K72SKbUviQuvC/i4IHo6TySXVq0w8ywDARrp+K+uaTgOv2QXTgnLS5lTvmpFCCiKTvEF9sBvhKA==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.4.tgz", + "integrity": "sha512-7rBY0mPgV0iAIyrXUrijbitzglculdOizpj2IljvbhRoABvybZCJGXCxmnO7Vwuju7LclwRNZLPu+E0xmOFmSQ==", "dependencies": { "@babel/polyfill": "^7.12.1", "get-pixels": "^3.3.3", @@ -1080,9 +1080,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "node_modules/uglify-js": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.0.tgz", - "integrity": "sha512-aTeNPVmgIMPpm1cxXr2Q/nEbvkmV8yq66F3om7X3P/cvOXQ0TMQ64Wk63iyT1gPlmdmGzjGpyLh1f3y8MZWXGg==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.2.tgz", + "integrity": "sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg==", "bin": { "uglifyjs": "bin/uglifyjs" }, @@ -1156,9 +1156,9 @@ } }, "@ericblade/quagga2": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.3.tgz", - "integrity": "sha512-c6OEkGXj903K72SKbUviQuvC/i4IHo6TySXVq0w8ywDARrp+K+uaTgOv2QXTgnLS5lTvmpFCCiKTvEF9sBvhKA==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.4.tgz", + "integrity": "sha512-7rBY0mPgV0iAIyrXUrijbitzglculdOizpj2IljvbhRoABvybZCJGXCxmnO7Vwuju7LclwRNZLPu+E0xmOFmSQ==", "requires": { "@babel/polyfill": "^7.12.1", "fsevents": "2.3.2", @@ -1939,9 +1939,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "uglify-js": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.0.tgz", - "integrity": "sha512-aTeNPVmgIMPpm1cxXr2Q/nEbvkmV8yq66F3om7X3P/cvOXQ0TMQ64Wk63iyT1gPlmdmGzjGpyLh1f3y8MZWXGg==" + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.2.tgz", + "integrity": "sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg==" }, "uniq": { "version": "1.0.1", diff --git a/webroot/package.json b/webroot/package.json index cc53db9669..0c2ea7ebcb 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", - "@ericblade/quagga2": "^1.7.3", + "@ericblade/quagga2": "^1.7.4", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.1", @@ -38,7 +38,7 @@ "svelte": "^3.50.1", "swiper": "8.4.2", "tooltipster": "^4.2.8", - "uglify-js": "^3.17.0", + "uglify-js": "^3.17.2", "webrtc-adapter": "^8.1.2" } } From 1cba81ef68d2ae2000434a5c28dd177d743d33bf Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 26 Sep 2022 07:48:21 +0200 Subject: [PATCH 092/646] better readable --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 824d6a50fc..e7d0b96ae9 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,8 @@ * 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment) / [Installation guide](https://foodcoopshop.github.io/en/installation-guide) [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop) -* Gitpod: When all containers are up and running, open your bash terminal (not: Docker) and run: `bash ./devtools/setup-dev-init.sh` +* Gitpod: When all containers are up and running, open your bash terminal (not: Docker) and run +* `bash ./devtools/setup-dev-init.sh` ## ✨ Features * user-friendly web shop optimized for selling food from different producers From 4aad08a8d56608367a167499538c34d65b64342b Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 26 Sep 2022 07:53:00 +0200 Subject: [PATCH 093/646] disable prebuilds --- .gitpod.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 04f1c914d6..32d2c075e8 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -16,4 +16,11 @@ ports: onOpen: ignore - port: 3311 onOpen: ignore - \ No newline at end of file + +github: + prebuilds: + master: false + branches: false + pullRequests: false + pullRequestsFromForks: false + addCheck: false \ No newline at end of file From 6f1550802af20db76d685751cf8bc9a94734fecc Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 26 Sep 2022 08:11:59 +0200 Subject: [PATCH 094/646] new style for cookie banner --- templates/element/customThemeStyleSheet.php | 3 ++- webroot/css/global.css | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/templates/element/customThemeStyleSheet.php b/templates/element/customThemeStyleSheet.php index d23b01b9c8..9a6e88806f 100644 --- a/templates/element/customThemeStyleSheet.php +++ b/templates/element/customThemeStyleSheet.php @@ -59,7 +59,7 @@ h2.info, #flashMessage.success, .modal-header, - .cookieConsentWrapper, + .cookieConsentWrapper .cookieConsent__Right button, .drop a.upload-button, #footer .bottom { background-color: ; @@ -98,6 +98,7 @@ #flashMessage.success, hr, .pw, .manufacturer-wrapper, + .cookieConsentWrapper, body.manufacturers.detail #inner-content h2, h1.middle-line span.middle { border-color: ; diff --git a/webroot/css/global.css b/webroot/css/global.css index 441bc92628..457e23e561 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -602,18 +602,19 @@ tr.selected > td > div > i.far, table:not(.no-hover) tr:hover > td > div > i.far display: none; } .cookieConsentWrapper { - box-shadow: 0px -3px 3px 0px rgba(0, 0, 0, 0.15); + box-shadow: none; + border-radius: 3px; width: 330px; bottom: 5px ! important; left: 5px ! important; + background-color: #fff ! important; + color: #333 ! important; + border-width: 1px; + border-style: solid; } .cookieConsentWrapper .cookieConsent { flex-direction: column; } -.cookieConsentWrapper .cookieConsent__Left a { - color: #fff ! important; - text-decoration: underline ! important; -} .cookieConsentWrapper .cookieConsent__Right { margin-top: 15px; } @@ -622,6 +623,7 @@ tr.selected > td > div > i.far, table:not(.no-hover) tr:hover > td > div > i.far margin-left: 0; margin-bottom: 0; font-size: 14px; + color: #fff; } .fa-spin { animation:10s infinite, fa-spin 2s infinite linear; From c5e44e99fd2baccb00086946fc64e83619143450 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 26 Sep 2022 17:09:48 +0200 Subject: [PATCH 095/646] npm post install as shell --- devtools/npm-post-install.sh | 20 ++++++ devtools/setup-dev-init.sh | 1 - src/Shell/NpmPostInstallShell.php | 104 ------------------------------ webroot/package.json | 2 +- 4 files changed, 21 insertions(+), 106 deletions(-) create mode 100644 devtools/npm-post-install.sh delete mode 100644 src/Shell/NpmPostInstallShell.php diff --git a/devtools/npm-post-install.sh b/devtools/npm-post-install.sh new file mode 100644 index 0000000000..81a7addadd --- /dev/null +++ b/devtools/npm-post-install.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +rm -Rf ../webroot/node_modules/jquery-backstretch/examples +rm -Rf ../webroot/node_modules/jquery-backstretch/test +rm -Rf ../webroot/node_modules/@fortawesome/fontawesome-free/js +rm ../webroot/node_modules/@fortawesome/fontawesome-free/css/all.min.css +rm ../webroot/node_modules/@fortawesome/fontawesome-free/css/fontawesome.css +rm ../webroot/node_modules/@fortawesome/fontawesome-free/css/fontawesome.min.css +rm ../webroot/node_modules/@fortawesome/fontawesome-free/css/v4-shims.css +rm ../webroot/node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css +rm -Rf ../webroot/node_modules/jquery-ui/external +rm -Rf ../webroot/node_modules/tooltipster/demo +rm -Rf ../webroot/node_modules/tooltipster/doc +rm -Rf ../webroot/node_modules/chart.js/dist/docs + +cp -R ../webroot/node_modules/@fortawesome/fontawesome-free/webfonts ../webroot/webfonts +cp -R ../webroot/node_modules/jquery-ui/dist/themes/smoothness/images ../webroot/cache/images + +cp ../config/elfinder/elfinder.html ../webroot/js/elfinder/elfinder.html +cp ../config/elfinder/php/connector.minimal.php ../webroot/js/elfinder/php/connector.minimal.php diff --git a/devtools/setup-dev-init.sh b/devtools/setup-dev-init.sh index e5befdf0d9..99d606f61d 100644 --- a/devtools/setup-dev-init.sh +++ b/devtools/setup-dev-init.sh @@ -6,4 +6,3 @@ docker compose run --rm composer install bash ./devtools/setup-dev/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh docker compose run -w /var/www/html/webroot --rm node npm install -docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake npm_post_install diff --git a/src/Shell/NpmPostInstallShell.php b/src/Shell/NpmPostInstallShell.php deleted file mode 100644 index e2b5db2bbd..0000000000 --- a/src/Shell/NpmPostInstallShell.php +++ /dev/null @@ -1,104 +0,0 @@ - - * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com - * @link https://www.foodcoopshop.com - */ - -namespace App\Shell; - -use Cake\Filesystem\File; -use Cake\Filesystem\Folder; - -class NpmPostInstallShell extends AppShell -{ - - public $vendorDir; - /** - * do not call parent::main because db connection might not be available - * @see AppShell::main() - */ - public function main() - { - $this->vendorDir = WWW_ROOT . 'node_modules'; - - $this->fontawesomePath = $this->vendorDir . DS . '@fortawesome' . DS . 'fontawesome-free' . DS; - $this->jqueryBackstretchPath = $this->vendorDir . DS . 'jquery-backstretch' . DS; - $this->jqueryUiPath = $this->vendorDir . DS . 'jquery-ui' . DS; - $this->tooltipsterPath = $this->vendorDir . DS . 'tooltipster' . DS; - - $this->cleanOverheadFromDependencies(); - $this->copyAdaptedElfinderFiles(); - $this->copyJqueryUiImages(); - $this->copyFontawesomeFonts(); - } - - private function cleanOverheadFromDependencies() - { - - $folder = new Folder(); - - $folder->delete($this->jqueryBackstretchPath . DS . 'examples'); - $folder->delete($this->jqueryBackstretchPath . DS . 'test'); - - $folder->delete($this->fontawesomePath . 'js'); - - $file = new File($this->fontawesomePath . 'css' . DS . 'all.min.css'); - $file->delete(); - $file = new File($this->fontawesomePath . 'css' . DS . 'fontawesome.css'); - $file->delete(); - $file = new File($this->fontawesomePath . 'css' . DS . 'fontawesome.min.css'); - $file->delete(); - $file = new File($this->fontawesomePath . 'css' . DS . 'v4-shims.css'); - $file->delete(); - $file = new File($this->fontawesomePath . 'css' . DS . 'v4-shims.min.css'); - $file->delete(); - - $folder->delete($this->jqueryUiPath . 'external'); - - $folder->delete($this->tooltipsterPath . 'demo'); - $folder->delete($this->tooltipsterPath . 'doc'); - - } - - private function copyFontawesomeFonts() - { - $folder = new Folder($this->fontawesomePath . 'webfonts' . DS); - $folder->copy(WWW_ROOT . 'webfonts'); - $this->out('Fontawesome fonts copied.'); - } - - /** - * if asset compress is on (debug=0=) - * images linked in css files have to be located in WEBROOT/cache - */ - private function copyJqueryUiImages() - { - $folder = new Folder($this->jqueryUiPath . 'dist' . DS . 'themes' . DS . 'smoothness' . DS . 'images' . DS); - $folder->copy(WWW_ROOT . 'cache' . DS . 'images'); - $this->out('JQueryUI images copied.'); - } - - private function copyAdaptedElfinderFiles() - { - $elfinderConfigDir = ROOT . DS . 'config' . DS . 'elfinder' . DS; - - $adaptedFiles = [ - $elfinderConfigDir . 'elfinder.html', - $elfinderConfigDir . 'php' . DS . 'connector.minimal.php' - ]; - - foreach ($adaptedFiles as $file) { - copy($file, preg_replace('/config/', 'webroot' . DS . 'js', $file, 1)); - $this->out('Elfinder config file ' . $file . ' copied successfully.'); - } - } -} diff --git a/webroot/package.json b/webroot/package.json index 0c2ea7ebcb..a8f68deb21 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -11,7 +11,7 @@ "license": "AGPL-3.0", "homepage": "https://www.foodcoopshop.com", "scripts": { - "install": "bash ../bin/cake npm_post_install" + "install": "bash ../devtools/npm-post-install.sh" }, "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", From 2e7821fc7ba2ae679d1b90cadaaaaeafd934662e Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 26 Sep 2022 17:33:59 +0200 Subject: [PATCH 096/646] additional cleanup --- devtools/npm-post-install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devtools/npm-post-install.sh b/devtools/npm-post-install.sh index 81a7addadd..051a1d56f8 100644 --- a/devtools/npm-post-install.sh +++ b/devtools/npm-post-install.sh @@ -3,6 +3,8 @@ rm -Rf ../webroot/node_modules/jquery-backstretch/examples rm -Rf ../webroot/node_modules/jquery-backstretch/test rm -Rf ../webroot/node_modules/@fortawesome/fontawesome-free/js +rm -Rf ../webroot/node_modules/@fortawesome/fontawesome-free/metadata +rm -Rf ../webroot/node_modules/@fortawesome/fontawesome-free/svgs rm ../webroot/node_modules/@fortawesome/fontawesome-free/css/all.min.css rm ../webroot/node_modules/@fortawesome/fontawesome-free/css/fontawesome.css rm ../webroot/node_modules/@fortawesome/fontawesome-free/css/fontawesome.min.css From 5aa0472746c2ab4557a9c0a90beed13ccd2fae7d Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 26 Sep 2022 20:32:24 +0200 Subject: [PATCH 097/646] set current user for docker containers --- devtools/setup-dev-init.sh | 8 ++++---- docker-compose.yml | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/devtools/setup-dev-init.sh b/devtools/setup-dev-init.sh index 99d606f61d..3a8b28653b 100644 --- a/devtools/setup-dev-init.sh +++ b/devtools/setup-dev-init.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ./config/sql/_installation/clean-db-structure.sql -docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ./tests/config/sql/test-db-data.sql -docker compose run --rm composer install +CURRENT_UID=$(id -u):$(id -g) docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ./config/sql/_installation/clean-db-structure.sql +CURRENT_UID=$(id -u):$(id -g) docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ./tests/config/sql/test-db-data.sql +CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install bash ./devtools/setup-dev/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh -docker compose run -w /var/www/html/webroot --rm node npm install +CURRENT_UID=$(id -u):$(id -g) docker compose run -w /var/www/html/webroot --rm node npm install diff --git a/docker-compose.yml b/docker-compose.yml index a7fbc6f3f0..b360ddb38f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,7 @@ services: build: ./config/docker-dev/php-nginx container_name: fcs-php-nginx restart: always + user: ${CURRENT_UID} environment: - WEB_DOCUMENT_ROOT=/var/www/html/webroot volumes: @@ -92,6 +93,7 @@ services: composer: container_name: fcs-composer image: composer:latest + user: ${CURRENT_UID} entrypoint: ['composer', '--ignore-platform-reqs'] working_dir: /var/www/html volumes: @@ -99,6 +101,7 @@ services: node: container_name: fcs-node + user: ${CURRENT_UID} build: ./config/docker-dev/node working_dir: /var/www/html volumes: From cb1885f562c99081eb3d8e5c6abc485d9f8bc162 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 26 Sep 2022 21:27:56 +0200 Subject: [PATCH 098/646] current user for gitpod --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 32d2c075e8..3e0baa3ea3 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -3,7 +3,7 @@ tasks: - name: Docker init: | docker compose pull - docker compose up + CURRENT_UID=$(id -u):$(id -g) docker compose up ports: - port: 8001 From 76d47e991692d190914f5d966837ee5c9502b5e9 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 26 Sep 2022 22:18:17 +0200 Subject: [PATCH 099/646] fix paths --- devtools/npm-post-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devtools/npm-post-install.sh b/devtools/npm-post-install.sh index 051a1d56f8..0b76af213b 100644 --- a/devtools/npm-post-install.sh +++ b/devtools/npm-post-install.sh @@ -15,8 +15,8 @@ rm -Rf ../webroot/node_modules/tooltipster/demo rm -Rf ../webroot/node_modules/tooltipster/doc rm -Rf ../webroot/node_modules/chart.js/dist/docs -cp -R ../webroot/node_modules/@fortawesome/fontawesome-free/webfonts ../webroot/webfonts -cp -R ../webroot/node_modules/jquery-ui/dist/themes/smoothness/images ../webroot/cache/images +cp -R ../webroot/node_modules/@fortawesome/fontawesome-free/webfonts ../webroot +cp -R ../webroot/node_modules/jquery-ui/dist/themes/smoothness/images ../webroot/cache cp ../config/elfinder/elfinder.html ../webroot/js/elfinder/elfinder.html cp ../config/elfinder/php/connector.minimal.php ../webroot/js/elfinder/php/connector.minimal.php From 20b4d0d4504aef003f9d2ef2de0b7074cd07d712 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 26 Sep 2022 22:38:24 +0200 Subject: [PATCH 100/646] gitpod fix --- devtools/setup-dev-init.sh | 2 +- docker-compose.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/devtools/setup-dev-init.sh b/devtools/setup-dev-init.sh index 3a8b28653b..f433fb9690 100644 --- a/devtools/setup-dev-init.sh +++ b/devtools/setup-dev-init.sh @@ -5,4 +5,4 @@ CURRENT_UID=$(id -u):$(id -g) docker compose exec -T database-dev mysql --port 3 CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install bash ./devtools/setup-dev/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh -CURRENT_UID=$(id -u):$(id -g) docker compose run -w /var/www/html/webroot --rm node npm install +docker compose run -w /var/www/html/webroot --rm node npm install diff --git a/docker-compose.yml b/docker-compose.yml index b360ddb38f..1b1a2b0304 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -101,7 +101,6 @@ services: node: container_name: fcs-node - user: ${CURRENT_UID} build: ./config/docker-dev/node working_dir: /var/www/html volumes: From 864cca4c1ac324c44673fc5bb94c30e4149e7808 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 26 Sep 2022 22:39:57 +0200 Subject: [PATCH 101/646] rename --- README.md | 2 +- devtools/{setup-dev-init.sh => init-dev-setup.sh} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename devtools/{setup-dev-init.sh => init-dev-setup.sh} (100%) diff --git a/README.md b/README.md index e7d0b96ae9..7e0cbc5367 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop) * Gitpod: When all containers are up and running, open your bash terminal (not: Docker) and run -* `bash ./devtools/setup-dev-init.sh` +* `bash ./devtools/init-dev-setup.sh` ## ✨ Features * user-friendly web shop optimized for selling food from different producers diff --git a/devtools/setup-dev-init.sh b/devtools/init-dev-setup.sh similarity index 100% rename from devtools/setup-dev-init.sh rename to devtools/init-dev-setup.sh From c0fddead9d4e66135f9425df07df2f4fe5fcafaf Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 26 Sep 2022 22:55:44 +0200 Subject: [PATCH 102/646] 881 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75af5fda36..f74649d574 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe - Die Konfiguration "Freitag Bestellschluss / Samstag Bestelllisten-Versand / Donnerstag Abholtag" ist jetzt möglich. [I#866](https://github.com/foodcoopshop/foodcoopshop/issues/866) / [PR#867](https://github.com/foodcoopshop/foodcoopshop/pull/867) ### For developers -- New 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) and [Gitpod-Integration](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop). [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) / [PR#879](https://github.com/foodcoopshop/foodcoopshop/pull/879) +- New 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) and [Gitpod-Integration](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop). [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) / [PR#879](https://github.com/foodcoopshop/foodcoopshop/pull/879) / / [PR#881](https://github.com/foodcoopshop/foodcoopshop/pull/881) # v3.5.0 From 7cde9a7e4d03a20798a46c57b96ea503074d91a1 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 27 Sep 2022 11:31:25 +0200 Subject: [PATCH 103/646] better wording --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7e0cbc5367..f4938ace9b 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ * 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment) / [Installation guide](https://foodcoopshop.github.io/en/installation-guide) [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop) -* Gitpod: When all containers are up and running, open your bash terminal (not: Docker) and run +* Gitpod: When all containers are up and running (takes about 1 minute), open your Bash-terminal (not in the Docker-terminal) and run * `bash ./devtools/init-dev-setup.sh` ## ✨ Features From 9c85db629d438183b2e32d7d812e3374d8e22b37 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 27 Sep 2022 15:20:02 +0200 Subject: [PATCH 104/646] remove git hooks --- devtools/composer-post-install.sh | 2 - devtools/git-pre-commit.sh | 111 ---------------------------- devtools/pre-commit | 15 ---- devtools/setup-git.sh | 4 - tmp/.gitignore | 0 tmp/cache/asset_compress/.gitignore | 0 tmp/cache/html_purifier/.gitignore | 0 tmp/cache/models/.gitignore | 0 tmp/cache/persistent/.gitignore | 0 tmp/cache/views/.gitignore | 0 tmp/sessions/.gitignore | 0 tmp/tests/.gitignore | 0 12 files changed, 132 deletions(-) delete mode 100644 devtools/git-pre-commit.sh delete mode 100644 devtools/pre-commit delete mode 100644 devtools/setup-git.sh mode change 100644 => 100755 tmp/.gitignore mode change 100644 => 100755 tmp/cache/asset_compress/.gitignore mode change 100644 => 100755 tmp/cache/html_purifier/.gitignore mode change 100644 => 100755 tmp/cache/models/.gitignore mode change 100644 => 100755 tmp/cache/persistent/.gitignore mode change 100644 => 100755 tmp/cache/views/.gitignore mode change 100644 => 100755 tmp/sessions/.gitignore mode change 100644 => 100755 tmp/tests/.gitignore diff --git a/devtools/composer-post-install.sh b/devtools/composer-post-install.sh index 774902edfa..eb8d616250 100644 --- a/devtools/composer-post-install.sh +++ b/devtools/composer-post-install.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -bash devtools/setup-git.sh - # remove overhead from tcpdf library rm -Rf vendor/tecnickcom/tcpdf/examples diff --git a/devtools/git-pre-commit.sh b/devtools/git-pre-commit.sh deleted file mode 100644 index 65c594f8b6..0000000000 --- a/devtools/git-pre-commit.sh +++ /dev/null @@ -1,111 +0,0 @@ -#!/usr/bin/env bash -# -# - git checkout the staged versions to temp dir -# - run PHP lint on temp dir -# -- checking *.php, *.inc and *.ctp -# -- see fcs-ruleset.xml, too -# -- abort commit on errors -# - run phpcbf on the temp dir () -# -- applying automatic repairs for tests in fcs-rules.xml -# -- don't abort commit -# - run phpcs on the temp dir -# -- must pass all tests in fcs-rules.xml now -# -- abort on errors -# - re-add all changes -# - remove temp dir -# - allow commit - -# CodeSniffer and CodeBeautifierFixer commands -PHPCBF="vendor/bin/phpcbf --standard=devtools/fcs-rules.xml" -PHPCS="vendor/bin/phpcs --standard=devtools/fcs-rules.xml" - -# note the current directory -PWD=`pwd` - -# get the project dir from being in [project]/devtools/ and change to it -DIR=`php -r "echo dirname(dirname(realpath('$0')));"` -cd "$DIR" - -STAGED_FILES=`git diff --cached --name-only --diff-filter=ACMR HEAD` -if [ "x$STAGED_FILES" == "x" ] -then - echo "Nothing to do on pre-commit" - exit 0 -fi - -# the temp directory used, within $DIR -WORK_DIR=`mktemp -d --tmpdir="$DIR" git.XXXXXXXX` - -# check if tmp dir was created -if [[ ! "$WORK_DIR" || ! -d "$WORK_DIR" ]]; then - echo "User `whoami` could not create temp dir in $DIR" - exit 1 -fi -echo "Created temp dir $WORK_DIR" - -# deletes the temp directory -function cleanup { - rm -rf "$WORK_DIR" - echo "Deleted temp working directory $WORK_DIR" - cd "$PWD" -} - -# register the cleanup function to be called on the EXIT signal -trap cleanup EXIT - -# get a temp copy of all staged files -while read -r file <&3 || [[ -n "$file" ]]; -do - if [ "$file" != "" ] - then - `git checkout-index --prefix="$WORK_DIR/" -- "$file"` - phpfile=`echo $file | grep \\\\.php` - phpfile2=`echo $file | grep \\\\.ctp` - phpfile="$phpfile$phpfile2" - phpfile2=`echo $file | grep \\\\.inc` - phpfile="$phpfile$phpfile2" - if [ "$phpfile" != "" ] - then - php -l -d display_errors=0 "$WORK_DIR/$file" - if [ $? != 0 ] - then - echo "Fix the error(s) before commit." - exit 1 - fi - fi - fi -done 3<<< "$STAGED_FILES" - -# do the coding standards tests -$PHPCBF "$WORK_DIR" - -$PHPCS "$WORK_DIR" -if [ $? != 0 ] -then - # there were problems that could not be solved - echo "Fix the error(s) and add the changed files before next commit." - exit 1 -fi - -# add the changed files to staging area -while read -r file <&3 || [[ -n "$file" ]]; -do - if [ "$file" != "" ] - then - # do not overwrite worktree files - if [ -f "$DIR/$file" ] - then - cp -f "$DIR/$file" "$DIR/$file.save" 2> /dev/null - fi - - cp -f "$WORK_DIR/$file" "$DIR/$file" 2> /dev/null - `git add "$file"` - - if [ -f "$DIR/$file.save" ] - then - mv -f "$DIR/$file.save" "$DIR/$file" 2> /dev/null - fi - fi -done 3<<< "$STAGED_FILES" - -exit 0 diff --git a/devtools/pre-commit b/devtools/pre-commit deleted file mode 100644 index 67c8552396..0000000000 --- a/devtools/pre-commit +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -# the version controlled git hook script -SCRIPT="devtools/git-pre-commit.sh" - -# get the project dir from being in [project]/.git/hooks/ and change to it -DIR=`php -r "echo dirname(dirname(dirname(realpath('$0'))));"` - -RESULT=1 -if [ -f "$DIR/$SCRIPT" ] ; then - exec "$DIR/$SCRIPT" - RESULT=$? -fi - -exit $RESULT diff --git a/devtools/setup-git.sh b/devtools/setup-git.sh deleted file mode 100644 index f98e9379c2..0000000000 --- a/devtools/setup-git.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -mkdir -p .git/hooks && cp -f devtools/pre-commit .git/hooks/pre-commit -chmod +x .git/hooks/pre-commit diff --git a/tmp/.gitignore b/tmp/.gitignore old mode 100644 new mode 100755 diff --git a/tmp/cache/asset_compress/.gitignore b/tmp/cache/asset_compress/.gitignore old mode 100644 new mode 100755 diff --git a/tmp/cache/html_purifier/.gitignore b/tmp/cache/html_purifier/.gitignore old mode 100644 new mode 100755 diff --git a/tmp/cache/models/.gitignore b/tmp/cache/models/.gitignore old mode 100644 new mode 100755 diff --git a/tmp/cache/persistent/.gitignore b/tmp/cache/persistent/.gitignore old mode 100644 new mode 100755 diff --git a/tmp/cache/views/.gitignore b/tmp/cache/views/.gitignore old mode 100644 new mode 100755 diff --git a/tmp/sessions/.gitignore b/tmp/sessions/.gitignore old mode 100644 new mode 100755 diff --git a/tmp/tests/.gitignore b/tmp/tests/.gitignore old mode 100644 new mode 100755 From eed0ffd484986738d385a5c6aafb3f400ec3cf87 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 27 Sep 2022 15:21:53 +0200 Subject: [PATCH 105/646] change permissions --- tmp/.gitignore | 0 tmp/cache/asset_compress/.gitignore | 0 tmp/cache/html_purifier/.gitignore | 0 tmp/cache/models/.gitignore | 0 tmp/cache/persistent/.gitignore | 0 tmp/cache/views/.gitignore | 0 tmp/sessions/.gitignore | 0 tmp/tests/.gitignore | 0 8 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 tmp/.gitignore mode change 100755 => 100644 tmp/cache/asset_compress/.gitignore mode change 100755 => 100644 tmp/cache/html_purifier/.gitignore mode change 100755 => 100644 tmp/cache/models/.gitignore mode change 100755 => 100644 tmp/cache/persistent/.gitignore mode change 100755 => 100644 tmp/cache/views/.gitignore mode change 100755 => 100644 tmp/sessions/.gitignore mode change 100755 => 100644 tmp/tests/.gitignore diff --git a/tmp/.gitignore b/tmp/.gitignore old mode 100755 new mode 100644 diff --git a/tmp/cache/asset_compress/.gitignore b/tmp/cache/asset_compress/.gitignore old mode 100755 new mode 100644 diff --git a/tmp/cache/html_purifier/.gitignore b/tmp/cache/html_purifier/.gitignore old mode 100755 new mode 100644 diff --git a/tmp/cache/models/.gitignore b/tmp/cache/models/.gitignore old mode 100755 new mode 100644 diff --git a/tmp/cache/persistent/.gitignore b/tmp/cache/persistent/.gitignore old mode 100755 new mode 100644 diff --git a/tmp/cache/views/.gitignore b/tmp/cache/views/.gitignore old mode 100755 new mode 100644 diff --git a/tmp/sessions/.gitignore b/tmp/sessions/.gitignore old mode 100755 new mode 100644 diff --git a/tmp/tests/.gitignore b/tmp/tests/.gitignore old mode 100755 new mode 100644 From f02aca001c38767ae089dcf39952f0bb6d258610 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 27 Sep 2022 13:26:32 +0000 Subject: [PATCH 106/646] add heding --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f74649d574..1f158d0ae3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwendet [Semantic Versioning](http://semver.org/). +## Unveröffentlichte Version + ### Herzlichen Dank an alle beteiligten Personen * [mrothauer](https://github.com/mrothauer) From 46aa14215be336a4aa751c1c64513691b018b8e0 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 27 Sep 2022 16:19:18 +0200 Subject: [PATCH 107/646] vendor updates (including decimal rounding fixes) --- composer.lock | 165 +++++++++--------- .../src/Controller/PaymentsControllerTest.php | 4 +- .../src/Model/Table/OrderDetailsTableTest.php | 4 + src/Model/Table/InvoicesTable.php | 9 +- 4 files changed, 100 insertions(+), 82 deletions(-) diff --git a/composer.lock b/composer.lock index 8f23c156fa..b3e6c79418 100644 --- a/composer.lock +++ b/composer.lock @@ -171,22 +171,22 @@ }, { "name": "cakephp/migrations", - "version": "3.5.2", + "version": "3.5.3", "source": { "type": "git", "url": "https://github.com/cakephp/migrations.git", - "reference": "e1b03bfef53ce41feabbf2120021ad5187e80289" + "reference": "8ba15cc92b9ba938c6f925bbcd3735464b1b1ef7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/migrations/zipball/e1b03bfef53ce41feabbf2120021ad5187e80289", - "reference": "e1b03bfef53ce41feabbf2120021ad5187e80289", + "url": "https://api.github.com/repos/cakephp/migrations/zipball/8ba15cc92b9ba938c6f925bbcd3735464b1b1ef7", + "reference": "8ba15cc92b9ba938c6f925bbcd3735464b1b1ef7", "shasum": "" }, "require": { "cakephp/cache": "^4.3.0", "cakephp/orm": "^4.3.0", - "php": ">=7.2.0", + "php": ">=7.4.0", "robmorgan/phinx": "^0.12" }, "require-dev": { @@ -227,7 +227,7 @@ "issues": "https://github.com/cakephp/migrations/issues", "source": "https://github.com/cakephp/migrations" }, - "time": "2022-05-10T15:01:58+00:00" + "time": "2022-09-25T02:30:10+00:00" }, { "name": "cakephp/plugin-installer", @@ -964,30 +964,30 @@ }, { "name": "laminas/laminas-httphandlerrunner", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-httphandlerrunner.git", - "reference": "4d337cde83e6b901a4443b0ab5c3b97cbaa46413" + "reference": "eb670c5c7167cd218c61a8b4f6ab9ce339200c16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/4d337cde83e6b901a4443b0ab5c3b97cbaa46413", - "reference": "4d337cde83e6b901a4443b0ab5c3b97cbaa46413", + "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/eb670c5c7167cd218c61a8b4f6ab9ce339200c16", + "reference": "eb670c5c7167cd218c61a8b4f6ab9ce339200c16", "shasum": "" }, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0", + "php": "^7.4 || ~8.0.0 || ~8.1.0", "psr/http-message": "^1.0", "psr/http-message-implementation": "^1.0", "psr/http-server-handler": "^1.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.3.0", - "laminas/laminas-diactoros": "^2.8.0", - "phpunit/phpunit": "^9.5.9", - "psalm/plugin-phpunit": "^0.16.1", - "vimeo/psalm": "^4.10.0" + "laminas/laminas-coding-standard": "~2.4.0", + "laminas/laminas-diactoros": "^2.13.0", + "phpunit/phpunit": "^9.5.21", + "psalm/plugin-phpunit": "^0.17.0", + "vimeo/psalm": "^4.24.0" }, "type": "library", "extra": { @@ -1027,7 +1027,7 @@ "type": "community_bridge" } ], - "time": "2021-09-22T09:27:36+00:00" + "time": "2022-09-17T16:24:51+00:00" }, { "name": "league/climate", @@ -1871,16 +1871,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.24.1", + "version": "1.25.2", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "69991111e05fca3ff7398e1e7fca9ebed33efec6" + "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/69991111e05fca3ff7398e1e7fca9ebed33efec6", - "reference": "69991111e05fca3ff7398e1e7fca9ebed33efec6", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a317a09e7def49852400a4b3eca4a4b0790ceeb5", + "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5", "shasum": "" }, "require": { @@ -1897,33 +1897,34 @@ "ext-xmlwriter": "*", "ext-zip": "*", "ext-zlib": "*", - "ezyang/htmlpurifier": "^4.13", + "ezyang/htmlpurifier": "^4.15", "maennchen/zipstream-php": "^2.1", "markbaker/complex": "^3.0", "markbaker/matrix": "^3.0", "php": "^7.3 || ^8.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/simple-cache": "^1.0 || ^2.0" + "psr/simple-cache": "^1.0 || ^2.0 || ^3.0" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "dev-master", "dompdf/dompdf": "^1.0 || ^2.0", "friendsofphp/php-cs-fixer": "^3.2", - "jpgraph/jpgraph": "^4.0", + "mitoteam/jpgraph": "10.2.4", "mpdf/mpdf": "8.1.1", "phpcompatibility/php-compatibility": "^9.3", "phpstan/phpstan": "^1.1", "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^8.5 || ^9.0", "squizlabs/php_codesniffer": "^3.7", - "tecnickcom/tcpdf": "^6.4" + "tecnickcom/tcpdf": "6.5" }, "suggest": { - "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)", - "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", + "dompdf/dompdf": "Option for rendering PDF with PDF Writer", + "ext-intl": "PHP Internationalization Functions", + "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", "mpdf/mpdf": "Option for rendering PDF with PDF Writer", - "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)" + "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer" }, "type": "library", "autoload": { @@ -1969,9 +1970,9 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.24.1" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.25.2" }, - "time": "2022-07-18T19:50:48+00:00" + "time": "2022-09-25T17:21:01+00:00" }, { "name": "psr/container", @@ -3787,16 +3788,16 @@ }, { "name": "composer/composer", - "version": "2.4.1", + "version": "2.4.2", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "777d542e3af65f8e7a66a4d98ce7a697da339414" + "reference": "7d887621e69a0311eb50aed4a16f7044b2b385b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/777d542e3af65f8e7a66a4d98ce7a697da339414", - "reference": "777d542e3af65f8e7a66a4d98ce7a697da339414", + "url": "https://api.github.com/repos/composer/composer/zipball/7d887621e69a0311eb50aed4a16f7044b2b385b9", + "reference": "7d887621e69a0311eb50aed4a16f7044b2b385b9", "shasum": "" }, "require": { @@ -3826,7 +3827,7 @@ "phpstan/phpstan-deprecation-rules": "^1", "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1", - "phpstan/phpstan-symfony": "^1.1", + "phpstan/phpstan-symfony": "^1.2.10", "symfony/phpunit-bridge": "^6.0" }, "suggest": { @@ -3879,7 +3880,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.4.1" + "source": "https://github.com/composer/composer/tree/2.4.2" }, "funding": [ { @@ -3895,7 +3896,7 @@ "type": "tidelift" } ], - "time": "2022-08-20T09:44:50+00:00" + "time": "2022-09-14T14:11:15+00:00" }, { "name": "composer/metadata-minifier", @@ -4761,16 +4762,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "367a8d9d5f7da2a0136422d27ce8840583926955" + "reference": "8dd908dd6156e974b9a0f8bb4cd5ad0707830f04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/367a8d9d5f7da2a0136422d27ce8840583926955", - "reference": "367a8d9d5f7da2a0136422d27ce8840583926955", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/8dd908dd6156e974b9a0f8bb4cd5ad0707830f04", + "reference": "8dd908dd6156e974b9a0f8bb4cd5ad0707830f04", "shasum": "" }, "require": { @@ -4800,22 +4801,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.7.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.8.0" }, - "time": "2022-08-09T12:23:23+00:00" + "time": "2022-09-04T18:59:06+00:00" }, { "name": "phpstan/phpstan", - "version": "1.8.5", + "version": "1.8.6", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20" + "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6598a5ff12ca4499a836815e08b4d77a2ddeb20", - "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c386ab2741e64cc9e21729f891b28b2b10fe6618", + "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618", "shasum": "" }, "require": { @@ -4845,7 +4846,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.8.5" + "source": "https://github.com/phpstan/phpstan/tree/1.8.6" }, "funding": [ { @@ -4861,7 +4862,7 @@ "type": "tidelift" } ], - "time": "2022-09-07T16:05:32+00:00" + "time": "2022-09-23T09:54:39+00:00" }, { "name": "phpunit/php-code-coverage", @@ -5183,16 +5184,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.24", + "version": "9.5.25", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5" + "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", - "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", + "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", "shasum": "" }, "require": { @@ -5214,14 +5215,14 @@ "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", + "sebastian/comparator": "^4.0.8", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", + "sebastian/exporter": "^4.0.5", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.1", + "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" }, "suggest": { @@ -5265,7 +5266,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25" }, "funding": [ { @@ -5275,9 +5276,13 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], - "time": "2022-08-30T07:42:16+00:00" + "time": "2022-09-25T03:44:45+00:00" }, { "name": "psy/psysh", @@ -5600,16 +5605,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.6", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382" + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", "shasum": "" }, "require": { @@ -5662,7 +5667,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" }, "funding": [ { @@ -5670,7 +5675,7 @@ "type": "github" } ], - "time": "2020-10-26T15:49:45+00:00" + "time": "2022-09-14T12:41:17+00:00" }, { "name": "sebastian/complexity", @@ -5860,16 +5865,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9" + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", "shasum": "" }, "require": { @@ -5925,7 +5930,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" }, "funding": [ { @@ -5933,7 +5938,7 @@ "type": "github" } ], - "time": "2021-11-11T14:18:36+00:00" + "time": "2022-09-14T06:03:37+00:00" }, { "name": "sebastian/global-state", @@ -6570,32 +6575,32 @@ }, { "name": "slevomat/coding-standard", - "version": "8.4.0", + "version": "8.5.1", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "02f27326be19633a1b6ba76745390bbf9a4be0b6" + "reference": "971f489404350bf4608b7e59381e603c47700366" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/02f27326be19633a1b6ba76745390bbf9a4be0b6", - "reference": "02f27326be19633a1b6ba76745390bbf9a4be0b6", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/971f489404350bf4608b7e59381e603c47700366", + "reference": "971f489404350bf4608b7e59381e603c47700366", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", "php": "^7.2 || ^8.0", - "phpstan/phpdoc-parser": ">=1.7.0 <1.8.0", + "phpstan/phpdoc-parser": ">=1.7.0 <1.9.0", "squizlabs/php_codesniffer": "^3.7.1" }, "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.10|1.8.2", + "phpstan/phpstan": "1.4.10|1.8.5", "phpstan/phpstan-deprecation-rules": "1.0.0", "phpstan/phpstan-phpunit": "1.0.0|1.1.1", - "phpstan/phpstan-strict-rules": "1.3.0", - "phpunit/phpunit": "7.5.20|8.5.21|9.5.21" + "phpstan/phpstan-strict-rules": "1.4.3", + "phpunit/phpunit": "7.5.20|8.5.21|9.5.24" }, "type": "phpcodesniffer-standard", "extra": { @@ -6615,7 +6620,7 @@ "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.4.0" + "source": "https://github.com/slevomat/coding-standard/tree/8.5.1" }, "funding": [ { @@ -6627,7 +6632,7 @@ "type": "tidelift" } ], - "time": "2022-08-09T19:03:45+00:00" + "time": "2022-09-23T05:34:53+00:00" }, { "name": "squizlabs/php_codesniffer", diff --git a/plugins/Admin/tests/TestCase/src/Controller/PaymentsControllerTest.php b/plugins/Admin/tests/TestCase/src/Controller/PaymentsControllerTest.php index cc28b30192..c9cb71c65b 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/PaymentsControllerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/PaymentsControllerTest.php @@ -413,7 +413,9 @@ private function addPaymentAndAssertIncreasedCreditBalance($customerId, $amountT $jsonDecodedContent = $this->addPayment($customerId, $amountToAdd, $paymentType); $creditBalanceAfterAdd = $this->Customer->getCreditBalance($customerId); $amountToAddAsDecimal = Configure::read('app.numberHelper')->getStringAsFloat($amountToAdd); - $this->assertEquals($amountToAddAsDecimal, $creditBalanceAfterAdd - $creditBalanceBeforeAdd, 'add payment '.$paymentType.' did not increase credit balance'); + + $result = number_format($creditBalanceAfterAdd - $creditBalanceBeforeAdd, 1); + $this->assertEquals($amountToAddAsDecimal, $result, 'add payment '.$paymentType.' did not increase credit balance'); $this->assertEquals(1, $jsonDecodedContent->status); $this->assertEquals($amountToAdd, Configure::read('app.numberHelper')->formatAsDecimal($jsonDecodedContent->amount, 1)); } diff --git a/plugins/Admin/tests/TestCase/src/Model/Table/OrderDetailsTableTest.php b/plugins/Admin/tests/TestCase/src/Model/Table/OrderDetailsTableTest.php index d7abef8c3b..7bc6a0a1f9 100644 --- a/plugins/Admin/tests/TestCase/src/Model/Table/OrderDetailsTableTest.php +++ b/plugins/Admin/tests/TestCase/src/Model/Table/OrderDetailsTableTest.php @@ -51,12 +51,16 @@ public function testGetDepositNetB() private function assertGetDepositTax($gross, $amount, $expected) { $result = $this->OrderDetail->getDepositTax($gross, $amount); + $result = number_format($result, 2); + $expected = number_format($result, 2); $this->assertEquals($result, $expected); } private function assertGetDepositNet($gross, $amount, $expected) { $result = $this->OrderDetail->getDepositNet($gross, $amount); + $result = number_format($result, 2); + $expected = number_format($result, 2); $this->assertEquals($result, $expected); } diff --git a/src/Model/Table/InvoicesTable.php b/src/Model/Table/InvoicesTable.php index b48cbc7b09..cf7131a184 100644 --- a/src/Model/Table/InvoicesTable.php +++ b/src/Model/Table/InvoicesTable.php @@ -114,8 +114,15 @@ public function getPreparedTaxRatesForSumTable($invoices) $taxRatesSums[$trt]['sum_price_excl'] += $invoiceTax->total_price_tax_excl; $taxRatesSums[$trt]['sum_tax'] += $invoiceTax->total_price_tax; $taxRatesSums[$trt]['sum_price_incl'] += $invoiceTax->total_price_tax_incl; - } + + $taxRates[$trt][$taxRate]['sum_price_excl'] = number_format($taxRates[$trt][$taxRate]['sum_price_excl'], 2); + $taxRates[$trt][$taxRate]['sum_tax'] = number_format($taxRates[$trt][$taxRate]['sum_tax'], 2); + $taxRates[$trt][$taxRate]['sum_price_incl'] = number_format($taxRates[$trt][$taxRate]['sum_price_incl'], 2); + $taxRatesSums[$trt]['sum_price_excl'] = number_format($taxRatesSums[$trt]['sum_price_excl'], 2); + $taxRatesSums[$trt]['sum_tax'] = number_format($taxRatesSums[$trt]['sum_tax'], 2); + $taxRatesSums[$trt]['sum_price_incl'] = number_format($taxRatesSums[$trt]['sum_price_incl'], 2); + } } From 67983e6f4ff217171b45ef81535316c99ab0180e Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 28 Sep 2022 08:00:15 +0200 Subject: [PATCH 108/646] Bugfix/issue 878 multiple orders of same products (#884) * enable debug logging * validate for presence of checkbox fields in posted data * log start and end * only log weekly orders * remove debug logging --- src/Controller/Component/CartComponent.php | 11 +++++++--- src/Model/Table/CartsTable.php | 25 ++++++++++++++++++---- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/Controller/Component/CartComponent.php b/src/Controller/Component/CartComponent.php index 5dbb0b633c..0165682457 100644 --- a/src/Controller/Component/CartComponent.php +++ b/src/Controller/Component/CartComponent.php @@ -104,8 +104,9 @@ public function markAsSaved() $cc = FactoryLocator::get('Table')->get('Carts'); $patchedEntity = $cc->patchEntity( $cc->get($this->getCartId()), [ - 'status' => APP_OFF - ] + 'status' => APP_OFF, + ], + ['validate' => false], ); $cc->save($patchedEntity); return $patchedEntity; @@ -437,6 +438,11 @@ public function finish() $options['validate'] = 'customerCanSelectPickupDay'; } + if ($this->AppAuth->getCartType() == $this->Cart::CART_TYPE_SELF_SERVICE + && $this->AppAuth->isOrderForDifferentCustomerMode()) { + $options['validate'] = 'selfServiceForDifferentCustomer'; + } + $cart['Cart'] = $this->Cart->patchEntity( $cart['Cart'], $this->getController()->getRequest()->getData(), @@ -556,7 +562,6 @@ public function finish() $this->ActionLog = FactoryLocator::get('Table')->get('ActionLogs'); $this->ActionLog->customSave($actionLogType, $userIdForActionLog, $cart['Cart']->id_cart, 'carts', $messageForActionLog); $this->getController()->Flash->success($message); - } return $cart; diff --git a/src/Model/Table/CartsTable.php b/src/Model/Table/CartsTable.php index 73f617d0d6..6faff5eb7b 100644 --- a/src/Model/Table/CartsTable.php +++ b/src/Model/Table/CartsTable.php @@ -55,9 +55,25 @@ public function initialize(array $config): void public function validationDefault(Validator $validator): Validator { - $validator->equals('cancellation_terms_accepted', 1, __('Please_accept_the_information_about_right_of_withdrawal.')); - $validator->equals('general_terms_and_conditions_accepted', 1, __('Please_accept_the_general_terms_and_conditions.')); - $validator->equals('promise_to_pickup_products', 1, __('Please_promise_to_pick_up_the_ordered_products.')); + if (Configure::read('app.generalTermsAndConditionsEnabled')) { + $validator->requirePresence('cancellation_terms_accepted', __('Please_accept_the_information_about_right_of_withdrawal')); + $validator->equals('cancellation_terms_accepted', 1, __('Please_accept_the_information_about_right_of_withdrawal.')); + $validator->requirePresence('general_terms_and_conditions_accepted', 1, __('Please_accept_the_general_terms_and_conditions.')); + $validator->equals('general_terms_and_conditions_accepted', 1, __('Please_accept_the_general_terms_and_conditions.')); + } + if (Configure::read('app.promiseToPickUpProductsCheckboxEnabled')) { + $validator->requirePresence('promise_to_pickup_products', 1, __('Please_promise_to_pick_up_the_ordered_products.')); + $validator->equals('promise_to_pickup_products', 1, __('Please_promise_to_pick_up_the_ordered_products.')); + } + $validator->notEmptyArray('self_service_payment_type', __('Please_select_your_payment_type.')); + return $validator; + } + + /** + * no checkboxes are shown here - do not validate them neither use requirePresence + */ + public function validationSelfServiceForDifferentCustomer(Validator $validator): Validator + { $validator->notEmptyArray('self_service_payment_type', __('Please_select_your_payment_type.')); return $validator; } @@ -110,7 +126,8 @@ public function getCart($appAuth, $cartType): array 'id_customer' => $customerId, 'cart_type' => $cartType, ]; - $cart = $this->save($this->newEntity($cart2save)); + $newCartEntity = $this->newEntity($cart2save, ['validate' => false]); + $cart = $this->save($newCartEntity); } $cartProductsTable = FactoryLocator::get('Table')->get('CartProducts'); From 1377d72e051fbb2d0a426bb534e5adc9a758c924 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 28 Sep 2022 09:25:16 +0200 Subject: [PATCH 109/646] migrations test --- composer.json | 3 +- composer.lock | 384 ++- .../20200404145856_RemoveV2Migrations.php | 12 - .../20200415073329_ShowNewProductsOnHome.php | 28 - ...bleCashlessPaymentAddTypeConfiguration.php | 12 - .../20200618063024_AddProductFeedback.php | 40 - ...00703072605_CustomerCanSelectPickupDay.php | 23 - .../20200831142250_RemoveEmailLogTable.php | 13 - ...ttingUseCameraForMobileBarcodeScanning.php | 12 - .../20200925073919_GermanIbanFix.php | 12 - ...201017182431_AdaptMinimalCreditBalance.php | 44 - .../20201029084931_AddRetailMode.php | 79 - .../20201118084516_AddRetailMode2.php | 21 - .../20201213120713_AddRetailMode3.php | 12 - .../20201217101514_SliderWithLink.php | 13 - ...0182015_ImproveMemberFeeAdministration.php | 23 - ...20210119101923_CheckCreditBalanceLimit.php | 24 - ...10401071718_RemoveCustomerGroupSetting.php | 12 - ...210401082727_CustomerActivateEmailCode.php | 12 - ...84816_BlogPostShowOnStartPageUntilDate.php | 14 - ...210427144234_RemoveOldMemberFeeSetting.php | 14 - .../20210504085123_SaveTaxInOrderDetails.php | 66 - .../20210510080630_EnablePurchasePrices.php | 69 - .../20210707083827_AddRegistrierkasseApi.php | 28 - .../20210802090623_AddStorageLocation.php | 49 - .../Migrations/20210910191430_Instagram.php | 31 - ...0914071747_DifferentPricesForCustomers.php | 13 - .../20210922154148_RemoveUnusedQueueTable.php | 12 - ...422_RemoveSettingShowNewProductsOnHome.php | 12 - ...0210923090820_AllowNullAsPurchasePrice.php | 12 - .../20211028083847_UseExistingBarcode.php | 25 - ...23095227_DeactivateCheckCreditReminder.php | 12 - ...213081433_ImproveCustomerNotifications.php | 16 - ...SettingIncludeStockProductsOnOrderList.php | 12 - ...9194617_AddIndizesForBetterPerformance.php | 16 - ...0129082136_SendDeliveryNotesEveryMonth.php | 15 - ...RhythmSettingOrderInWeekBeforeDelivery.php | 22 - .../20220321103059_PrefixForInvoices.php | 27 - ...20220323075926_TaxBasedOnNetInvoiceSum.php | 31 - ...407093247_AddIsCompanyFieldForCustomer.php | 21 - .../Migrations/20220412131842_Newsletter.php | 25 - ...20091755_RemoveTimebasedCurrencyModule.php | 19 - .../20220717194215_UserFeedback.php | 27 - config/Migrations/20220928063531_Initial.php | 2230 +++++++++++++++++ ...125_AlterDataOnQueuedJobsToMediumtext.php} | 8 +- config/Migrations/schema-dump-default.lock | Bin 98187 -> 98105 bytes config/bootstrap.php | 20 - src/Application.php | 24 +- tests/bootstrap.php | 7 + 49 files changed, 2651 insertions(+), 1005 deletions(-) delete mode 100644 config/Migrations/20200404145856_RemoveV2Migrations.php delete mode 100644 config/Migrations/20200415073329_ShowNewProductsOnHome.php delete mode 100644 config/Migrations/20200501192722_EnableCashlessPaymentAddTypeConfiguration.php delete mode 100644 config/Migrations/20200618063024_AddProductFeedback.php delete mode 100644 config/Migrations/20200703072605_CustomerCanSelectPickupDay.php delete mode 100644 config/Migrations/20200831142250_RemoveEmailLogTable.php delete mode 100644 config/Migrations/20200910091755_AddMemberSettingUseCameraForMobileBarcodeScanning.php delete mode 100644 config/Migrations/20200925073919_GermanIbanFix.php delete mode 100644 config/Migrations/20201017182431_AdaptMinimalCreditBalance.php delete mode 100644 config/Migrations/20201029084931_AddRetailMode.php delete mode 100644 config/Migrations/20201118084516_AddRetailMode2.php delete mode 100644 config/Migrations/20201213120713_AddRetailMode3.php delete mode 100644 config/Migrations/20201217101514_SliderWithLink.php delete mode 100644 config/Migrations/20201220182015_ImproveMemberFeeAdministration.php delete mode 100644 config/Migrations/20210119101923_CheckCreditBalanceLimit.php delete mode 100644 config/Migrations/20210401071718_RemoveCustomerGroupSetting.php delete mode 100644 config/Migrations/20210401082727_CustomerActivateEmailCode.php delete mode 100644 config/Migrations/20210419084816_BlogPostShowOnStartPageUntilDate.php delete mode 100644 config/Migrations/20210427144234_RemoveOldMemberFeeSetting.php delete mode 100644 config/Migrations/20210504085123_SaveTaxInOrderDetails.php delete mode 100644 config/Migrations/20210510080630_EnablePurchasePrices.php delete mode 100644 config/Migrations/20210707083827_AddRegistrierkasseApi.php delete mode 100644 config/Migrations/20210802090623_AddStorageLocation.php delete mode 100644 config/Migrations/20210910191430_Instagram.php delete mode 100644 config/Migrations/20210914071747_DifferentPricesForCustomers.php delete mode 100644 config/Migrations/20210922154148_RemoveUnusedQueueTable.php delete mode 100644 config/Migrations/20210923073422_RemoveSettingShowNewProductsOnHome.php delete mode 100644 config/Migrations/20210923090820_AllowNullAsPurchasePrice.php delete mode 100644 config/Migrations/20211028083847_UseExistingBarcode.php delete mode 100644 config/Migrations/20211123095227_DeactivateCheckCreditReminder.php delete mode 100644 config/Migrations/20211213081433_ImproveCustomerNotifications.php delete mode 100644 config/Migrations/20211215184633_ManufacturerSettingIncludeStockProductsOnOrderList.php delete mode 100644 config/Migrations/20211229194617_AddIndizesForBetterPerformance.php delete mode 100644 config/Migrations/20220129082136_SendDeliveryNotesEveryMonth.php delete mode 100644 config/Migrations/20220201163254_OptionalDeliveryRhythmSettingOrderInWeekBeforeDelivery.php delete mode 100644 config/Migrations/20220321103059_PrefixForInvoices.php delete mode 100644 config/Migrations/20220323075926_TaxBasedOnNetInvoiceSum.php delete mode 100644 config/Migrations/20220407093247_AddIsCompanyFieldForCustomer.php delete mode 100644 config/Migrations/20220412131842_Newsletter.php delete mode 100644 config/Migrations/20220620091755_RemoveTimebasedCurrencyModule.php delete mode 100644 config/Migrations/20220717194215_UserFeedback.php create mode 100644 config/Migrations/20220928063531_Initial.php rename config/Migrations/{20220525092822_BiggerQueuedJobDataField.php => 20220928064125_AlterDataOnQueuedJobsToMediumtext.php} (57%) diff --git a/composer.json b/composer.json index 496a145706..171439398a 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,8 @@ "cakephp/debug_kit": "^4.0", "cakephp/cakephp-codesniffer": "^4.0", "phpunit/phpunit": "^9.0", - "phpstan/phpstan": "^1.0" + "phpstan/phpstan": "^1.0", + "cakephp/bake": "^2.8" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index b3e6c79418..21bc85ecc0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0319c8fa46a664469640bfdf9bd5f376", + "content-hash": "77e5d93adfa8d5058cc4368f8ed9b3e7", "packages": [ { "name": "cakephp/cakephp", @@ -3595,6 +3595,112 @@ } ], "packages-dev": [ + { + "name": "brick/varexporter", + "version": "0.3.7", + "source": { + "type": "git", + "url": "https://github.com/brick/varexporter.git", + "reference": "3e263cd718d242594c52963760fee2059fd5833c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/brick/varexporter/zipball/3e263cd718d242594c52963760fee2059fd5833c", + "reference": "3e263cd718d242594c52963760fee2059fd5833c", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.0", + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.2", + "phpunit/phpunit": "^8.5 || ^9.0", + "vimeo/psalm": "4.23.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Brick\\VarExporter\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A powerful alternative to var_export(), which can export closures and objects without __set_state()", + "keywords": [ + "var_export" + ], + "support": { + "issues": "https://github.com/brick/varexporter/issues", + "source": "https://github.com/brick/varexporter/tree/0.3.7" + }, + "funding": [ + { + "url": "https://github.com/BenMorel", + "type": "github" + } + ], + "time": "2022-06-29T23:37:57+00:00" + }, + { + "name": "cakephp/bake", + "version": "2.8.1", + "source": { + "type": "git", + "url": "https://github.com/cakephp/bake.git", + "reference": "7f7dac1dd9bb0f8c996e705e74cdec01dd600f57" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cakephp/bake/zipball/7f7dac1dd9bb0f8c996e705e74cdec01dd600f57", + "reference": "7f7dac1dd9bb0f8c996e705e74cdec01dd600f57", + "shasum": "" + }, + "require": { + "brick/varexporter": "^0.3.5", + "cakephp/cakephp": "^4.3.0", + "cakephp/twig-view": "^1.0.2", + "nikic/php-parser": "^4.13.2", + "php": ">=7.2" + }, + "require-dev": { + "cakephp/cakephp-codesniffer": "^4.0", + "cakephp/debug_kit": "^4.1", + "cakephp/plugin-installer": "^1.3", + "phpunit/phpunit": "^8.5 || ^9.3" + }, + "type": "cakephp-plugin", + "autoload": { + "psr-4": { + "Bake\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "CakePHP Community", + "homepage": "https://github.com/cakephp/bake/graphs/contributors" + } + ], + "description": "Bake plugin for CakePHP", + "homepage": "https://github.com/cakephp/bake", + "keywords": [ + "bake", + "cakephp" + ], + "support": { + "forum": "https://stackoverflow.com/tags/cakephp", + "irc": "irc://irc.freenode.org/cakephp", + "issues": "https://github.com/cakephp/bake/issues", + "source": "https://github.com/cakephp/bake" + }, + "time": "2022-09-26T06:58:44+00:00" + }, { "name": "cakephp/cakephp-codesniffer", "version": "4.6.0", @@ -3713,6 +3819,69 @@ }, "time": "2022-07-17T11:47:08+00:00" }, + { + "name": "cakephp/twig-view", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://github.com/cakephp/twig-view.git", + "reference": "14df50360b809a171d0688020fbdfe513763f89b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cakephp/twig-view/zipball/14df50360b809a171d0688020fbdfe513763f89b", + "reference": "14df50360b809a171d0688020fbdfe513763f89b", + "shasum": "" + }, + "require": { + "cakephp/cakephp": "^4.0", + "jasny/twig-extensions": "^1.3", + "php": ">=7.2", + "twig/markdown-extra": "^3.0", + "twig/twig": "^3.0" + }, + "conflict": { + "wyrihaximus/twig-view": "*" + }, + "require-dev": { + "cakephp/cakephp-codesniffer": "^4.0", + "cakephp/debug_kit": "^4.0", + "cakephp/plugin-installer": "^1.3", + "michelf/php-markdown": "^1.9", + "mikey179/vfsstream": "^1.6", + "phpunit/phpunit": "^8.5 || ^9.3" + }, + "type": "cakephp-plugin", + "autoload": { + "psr-4": { + "Cake\\TwigView\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "CakePHP Community", + "homepage": "https://github.com/cakephp/cakephp/graphs/contributors" + } + ], + "description": "Twig powered View for CakePHP", + "keywords": [ + "cakephp", + "template", + "twig", + "view" + ], + "support": { + "forum": "https://stackoverflow.com/tags/cakephp", + "irc": "irc://irc.freenode.org/cakephp", + "issues": "https://github.com/cakephp/twig-view/issues", + "source": "https://github.com/cakephp/twig-view" + }, + "time": "2021-09-17T14:07:52+00:00" + }, { "name": "composer/class-map-generator", "version": "1.0.0", @@ -4410,6 +4579,70 @@ ], "time": "2022-03-03T08:28:38+00:00" }, + { + "name": "jasny/twig-extensions", + "version": "v1.3.0", + "source": { + "type": "git", + "url": "https://github.com/jasny/twig-extensions.git", + "reference": "a694eb02f6fc14ff8e2fceb8b80882c0c926102b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jasny/twig-extensions/zipball/a694eb02f6fc14ff8e2fceb8b80882c0c926102b", + "reference": "a694eb02f6fc14ff8e2fceb8b80882c0c926102b", + "shasum": "" + }, + "require": { + "php": ">=7.0.0", + "twig/twig": "^2.0 | ^3.0" + }, + "require-dev": { + "ext-intl": "*", + "ext-pcre": "*", + "jasny/php-code-quality": "^2.5", + "php": ">=7.2.0" + }, + "suggest": { + "ext-intl": "Required for the use of the LocalDate Twig extension", + "ext-pcre": "Required for the use of the PCRE Twig extension" + }, + "type": "library", + "autoload": { + "psr-4": { + "Jasny\\Twig\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Arnold Daniels", + "email": "arnold@jasny.net", + "homepage": "http://www.jasny.net" + } + ], + "description": "A set of useful Twig filters", + "homepage": "http://github.com/jasny/twig-extensions#README", + "keywords": [ + "PCRE", + "array", + "date", + "datetime", + "preg", + "regex", + "templating", + "text", + "time" + ], + "support": { + "issues": "https://github.com/jasny/twig-extensions/issues", + "source": "https://github.com/jasny/twig-extensions" + }, + "time": "2019-12-10T16:04:23+00:00" + }, { "name": "jdorn/sql-formatter", "version": "v1.2.17", @@ -7114,6 +7347,155 @@ } ], "time": "2021-07-28T10:34:58+00:00" + }, + { + "name": "twig/markdown-extra", + "version": "v3.4.0", + "source": { + "type": "git", + "url": "https://github.com/twigphp/markdown-extra.git", + "reference": "25ed505b6ffd3b00f922ca682489dfbaf44eb1f7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twigphp/markdown-extra/zipball/25ed505b6ffd3b00f922ca682489dfbaf44eb1f7", + "reference": "25ed505b6ffd3b00f922ca682489dfbaf44eb1f7", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", + "twig/twig": "^2.7|^3.0" + }, + "require-dev": { + "erusev/parsedown": "^1.7", + "league/commonmark": "^1.0|^2.0", + "league/html-to-markdown": "^4.8|^5.0", + "michelf/php-markdown": "^1.8", + "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "psr-4": { + "Twig\\Extra\\Markdown\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + } + ], + "description": "A Twig extension for Markdown", + "homepage": "https://twig.symfony.com", + "keywords": [ + "html", + "markdown", + "twig" + ], + "support": { + "source": "https://github.com/twigphp/markdown-extra/tree/v3.4.0" + }, + "funding": [ + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/twig/twig", + "type": "tidelift" + } + ], + "time": "2022-01-29T15:34:05+00:00" + }, + { + "name": "twig/twig", + "version": "v3.4.2", + "source": { + "type": "git", + "url": "https://github.com/twigphp/Twig.git", + "reference": "e07cdd3d430cd7e453c31b36eb5ad6c0c5e43077" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/e07cdd3d430cd7e453c31b36eb5ad6c0c5e43077", + "reference": "e07cdd3d430cd7e453c31b36eb5ad6c0c5e43077", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-ctype": "^1.8", + "symfony/polyfill-mbstring": "^1.3" + }, + "require-dev": { + "psr/container": "^1.0", + "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "autoload": { + "psr-4": { + "Twig\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, + { + "name": "Twig Team", + "role": "Contributors" + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" + } + ], + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "https://twig.symfony.com", + "keywords": [ + "templating" + ], + "support": { + "issues": "https://github.com/twigphp/Twig/issues", + "source": "https://github.com/twigphp/Twig/tree/v3.4.2" + }, + "funding": [ + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/twig/twig", + "type": "tidelift" + } + ], + "time": "2022-08-12T06:47:24+00:00" } ], "aliases": [], diff --git a/config/Migrations/20200404145856_RemoveV2Migrations.php b/config/Migrations/20200404145856_RemoveV2Migrations.php deleted file mode 100644 index aed4946f32..0000000000 --- a/config/Migrations/20200404145856_RemoveV2Migrations.php +++ /dev/null @@ -1,12 +0,0 @@ -execute("TRUNCATE TABLE phinxlog;"); - } -} diff --git a/config/Migrations/20200415073329_ShowNewProductsOnHome.php b/config/Migrations/20200415073329_ShowNewProductsOnHome.php deleted file mode 100644 index 14ba84db40..0000000000 --- a/config/Migrations/20200415073329_ShowNewProductsOnHome.php +++ /dev/null @@ -1,28 +0,0 @@ -execute($sql); - } -} diff --git a/config/Migrations/20200501192722_EnableCashlessPaymentAddTypeConfiguration.php b/config/Migrations/20200501192722_EnableCashlessPaymentAddTypeConfiguration.php deleted file mode 100644 index 53f5057e33..0000000000 --- a/config/Migrations/20200501192722_EnableCashlessPaymentAddTypeConfiguration.php +++ /dev/null @@ -1,12 +0,0 @@ -execute("UPDATE fcs_configuration SET type='dropdown' WHERE name = 'FCS_CASHLESS_PAYMENT_ADD_TYPE'"); - } -} diff --git a/config/Migrations/20200618063024_AddProductFeedback.php b/config/Migrations/20200618063024_AddProductFeedback.php deleted file mode 100644 index 4e1bdf4b05..0000000000 --- a/config/Migrations/20200618063024_AddProductFeedback.php +++ /dev/null @@ -1,40 +0,0 @@ -execute(" - CREATE TABLE `fcs_order_detail_feedbacks` ( - `id_order_detail` int(10) UNSIGNED NOT NULL DEFAULT '0', - `text` text CHARACTER SET utf8mb4 NOT NULL, - `customer_id` int(10) UNSIGNED NOT NULL DEFAULT '0' - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - ALTER TABLE `fcs_order_detail_feedbacks` - ADD PRIMARY KEY (`id_order_detail`); - COMMIT; - "); - - switch(I18n::getLocale()) { - case 'de_DE': - $text = 'Feedback-Funktion für Produkte aktiviert?
Mitglieder können Feedback zu bestellten Produkte verfassen.
'; - break; - case 'pl_PL': - case 'en_US': - $text = 'Are members allowed to write feedback to products?'; - break; - } - - $sql = "INSERT INTO `fcs_configuration` ( - `id_configuration`, `active`, `name`, `text`, `value`, `type`, `position`, `locale`, `date_add`, `date_upd` - ) - VALUES ( - NULL, '1', 'FCS_FEEDBACK_TO_PRODUCTS_ENABLED', '".$text."', '1', 'boolean', '320', '".I18n::getLocale()."', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);"; - $this->execute($sql); - - } -} diff --git a/config/Migrations/20200703072605_CustomerCanSelectPickupDay.php b/config/Migrations/20200703072605_CustomerCanSelectPickupDay.php deleted file mode 100644 index 0e3a375a8e..0000000000 --- a/config/Migrations/20200703072605_CustomerCanSelectPickupDay.php +++ /dev/null @@ -1,23 +0,0 @@ -execute($sql); - } -} diff --git a/config/Migrations/20200831142250_RemoveEmailLogTable.php b/config/Migrations/20200831142250_RemoveEmailLogTable.php deleted file mode 100644 index 69658b8da1..0000000000 --- a/config/Migrations/20200831142250_RemoveEmailLogTable.php +++ /dev/null @@ -1,13 +0,0 @@ -execute("DROP TABLE fcs_email_logs;"); - $this->execute("DELETE FROM fcs_configuration WHERE name = 'FCS_EMAIL_LOG_ENABLED';"); - } -} diff --git a/config/Migrations/20200910091755_AddMemberSettingUseCameraForMobileBarcodeScanning.php b/config/Migrations/20200910091755_AddMemberSettingUseCameraForMobileBarcodeScanning.php deleted file mode 100644 index 273dce42a3..0000000000 --- a/config/Migrations/20200910091755_AddMemberSettingUseCameraForMobileBarcodeScanning.php +++ /dev/null @@ -1,12 +0,0 @@ -execute("ALTER TABLE `fcs_customer` ADD `use_camera_for_barcode_scanning` TINYINT(3) UNSIGNED NULL DEFAULT '0' AFTER `timebased_currency_enabled`;"); - } -} diff --git a/config/Migrations/20200925073919_GermanIbanFix.php b/config/Migrations/20200925073919_GermanIbanFix.php deleted file mode 100644 index 06ada68636..0000000000 --- a/config/Migrations/20200925073919_GermanIbanFix.php +++ /dev/null @@ -1,12 +0,0 @@ -execute("ALTER TABLE `fcs_manufacturer` CHANGE `iban` `iban` VARCHAR(22) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '';"); - } -} diff --git a/config/Migrations/20201017182431_AdaptMinimalCreditBalance.php b/config/Migrations/20201017182431_AdaptMinimalCreditBalance.php deleted file mode 100644 index 9a32836663..0000000000 --- a/config/Migrations/20201017182431_AdaptMinimalCreditBalance.php +++ /dev/null @@ -1,44 +0,0 @@ -Configuration = FactoryLocator::get('Table')->get('Configurations'); - $oldValue = $this->Configuration->find('all', [ - 'conditions' => [ - 'Configurations.name' => 'FCS_MINIMAL_CREDIT_BALANCE' - ] - ])->first(); - - $newValue = $oldValue->value * -1; - if($oldValue->value == 1) { - $newValue = 0; - } - if($oldValue->value == 0) { - $newValue = -1000; - } - - $sql = "UPDATE fcs_configuration SET - text = '".$newText."', - value = ".$newValue." - WHERE name = 'FCS_MINIMAL_CREDIT_BALANCE'"; - $this->execute($sql); - - } -} diff --git a/config/Migrations/20201029084931_AddRetailMode.php b/config/Migrations/20201029084931_AddRetailMode.php deleted file mode 100644 index 737cc92671..0000000000 --- a/config/Migrations/20201029084931_AddRetailMode.php +++ /dev/null @@ -1,79 +0,0 @@ -execute($sql); - - switch(I18n::getLocale()) { - case 'de_DE': - $textA = 'Rechnungsversand an Mitglieder aktiviert?
Infos zur Verwendung im Einzelhandel
'; - $textB = 'Umsatzsteuersatz für Pfand'; - $valueB = '20,00'; - $textC = 'Header-Text für Rechnungen an Mitglieder'; - break; - default: - $textA = 'Send invoices to members?'; - $textB = 'VAT for deposit'; - $valueB = '20.00'; - $textC = 'Header text for invoices to members'; - break; - } - - $sql = "INSERT INTO `fcs_configuration` (`id_configuration`, `active`, `name`, `text`, `value`, `type`, `position`, `locale`, `date_add`, `date_upd`) VALUES (NULL, '1', 'FCS_SEND_INVOICES_TO_CUSTOMERS', '".$textA."', '0', 'readonly', '580', '".I18n::getLocale()."', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);"; - $this->execute($sql); - - $sql = "INSERT INTO `fcs_configuration` (`id_configuration`, `active`, `name`, `text`, `value`, `type`, `position`, `locale`, `date_add`, `date_upd`) VALUES (NULL, '1', 'FCS_DEPOSIT_TAX_RATE', '".$textB."', '".$valueB."', 'readonly', '581', '".I18n::getLocale()."', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);"; - $this->execute($sql); - - $sql = "INSERT INTO `fcs_configuration` (`id_configuration`, `active`, `name`, `text`, `value`, `type`, `position`, `locale`, `date_add`, `date_upd`) VALUES (NULL, '1', 'FCS_INVOICE_HEADER_TEXT', '".$textC."', '', 'readonly', '582', '".I18n::getLocale()."', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);"; - $this->execute($sql); - - $sql = "INSERT INTO `fcs_cronjobs` (`id`, `name`, `time_interval`, `day_of_month`, `weekday`, `not_before_time`, `active`) VALUES (NULL, 'SendInvoicesToCustomers', 'week', NULL, 'Saturday', '10:00:00', '0');"; - $this->execute($sql); - - $sql = "UPDATE fcs_cronjobs SET name = 'SendInvoicesToManufacturers' WHERE name = 'SendInvoices';"; - $this->execute($sql); - - $sql = "ALTER TABLE `fcs_payments` ADD `invoice_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `transaction_text`;"; - $this->execute($sql); - - $sql = " - ALTER TABLE `fcs_invoices` CHANGE `send_date` `created` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP; - ALTER TABLE `fcs_invoices` CHANGE `user_id` `id_customer` INT(10) UNSIGNED NOT NULL DEFAULT '0'; - UPDATE `fcs_invoices` SET id_customer = 0; - ALTER TABLE `fcs_invoices` ADD `paid_in_cash` TINYINT(4) UNSIGNED NULL DEFAULT '0' AFTER `id_customer`; - CREATE TABLE `fcs_invoice_taxes` ( - `id` int(11) NOT NULL, - `invoice_id` int(10) UNSIGNED NOT NULL DEFAULT '0', - `tax_rate` double(20,6) NOT NULL DEFAULT '0.000000', - `total_price_excl` double(20,6) NOT NULL DEFAULT '0.000000', - `total_price_tax` double(20,6) NOT NULL DEFAULT '0.000000', - `total_price_tax_incl` double(20,6) NOT NULL DEFAULT '0.000000' - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - ALTER TABLE `fcs_invoice_taxes` - ADD PRIMARY KEY (`id`), - ADD KEY `invoice_id` (`invoice_id`); - ALTER TABLE `fcs_invoice_taxes` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; - "; - $this->execute($sql); - - $sql = " - ALTER TABLE `fcs_invoices` ADD `filename` varchar(512) NOT NULL DEFAULT '' AFTER `paid_in_cash`; - ALTER TABLE `fcs_invoices` ADD `email_status` datetime DEFAULT NULL AFTER `filename`; - "; - $this->execute($sql); - - $sql = "ALTER TABLE `fcs_invoices` CHANGE `invoice_number` `invoice_number` VARCHAR(14) NOT NULL DEFAULT '0';"; - $this->execute($sql); - - } -} diff --git a/config/Migrations/20201118084516_AddRetailMode2.php b/config/Migrations/20201118084516_AddRetailMode2.php deleted file mode 100644 index 2d7a5f231b..0000000000 --- a/config/Migrations/20201118084516_AddRetailMode2.php +++ /dev/null @@ -1,21 +0,0 @@ -execute($sql); - - $sql = "ALTER TABLE `fcs_payments` CHANGE `invoice_id` `invoice_id` INT(10) UNSIGNED NULL DEFAULT NULL;"; - $this->execute($sql); - - $sql = "ALTER TABLE `fcs_invoices` ADD `cancellation_invoice_id` INT(10) UNSIGNED NULL DEFAULT NULL AFTER `email_status`;"; - $this->execute($sql); - - } - -} diff --git a/config/Migrations/20201213120713_AddRetailMode3.php b/config/Migrations/20201213120713_AddRetailMode3.php deleted file mode 100644 index daa8df47b4..0000000000 --- a/config/Migrations/20201213120713_AddRetailMode3.php +++ /dev/null @@ -1,12 +0,0 @@ -execute("ALTER TABLE `fcs_manufacturer` CHANGE `name` `name` VARCHAR(64) NULL DEFAULT NULL, CHANGE `uid_number` `uid_number` VARCHAR(30) NULL DEFAULT NULL, CHANGE `additional_text_for_invoice` `additional_text_for_invoice` MEDIUMTEXT NULL DEFAULT NULL, CHANGE `iban` `iban` VARCHAR(22) NULL DEFAULT NULL, CHANGE `bic` `bic` VARCHAR(11) NULL DEFAULT NULL, CHANGE `bank_name` `bank_name` VARCHAR(255) NULL DEFAULT NULL, CHANGE `firmenbuchnummer` `firmenbuchnummer` VARCHAR(20) NULL DEFAULT NULL, CHANGE `firmengericht` `firmengericht` VARCHAR(150) NULL DEFAULT NULL, CHANGE `aufsichtsbehoerde` `aufsichtsbehoerde` VARCHAR(150) NULL DEFAULT NULL, CHANGE `kammer` `kammer` VARCHAR(150) NULL DEFAULT NULL, CHANGE `homepage` `homepage` VARCHAR(255) NULL DEFAULT NULL;"); - } -} diff --git a/config/Migrations/20201217101514_SliderWithLink.php b/config/Migrations/20201217101514_SliderWithLink.php deleted file mode 100644 index 344ad565ad..0000000000 --- a/config/Migrations/20201217101514_SliderWithLink.php +++ /dev/null @@ -1,13 +0,0 @@ -execute("ALTER TABLE `fcs_sliders` ADD `link` VARCHAR(999) NULL DEFAULT NULL AFTER `image`;"); - $this->execute("ALTER TABLE `fcs_sliders` ADD `is_private` INT(11) unsigned NOT NULL DEFAULT '0' AFTER `link`;"); - } -} diff --git a/config/Migrations/20201220182015_ImproveMemberFeeAdministration.php b/config/Migrations/20201220182015_ImproveMemberFeeAdministration.php deleted file mode 100644 index 98cb432628..0000000000 --- a/config/Migrations/20201220182015_ImproveMemberFeeAdministration.php +++ /dev/null @@ -1,23 +0,0 @@ -Die ausgewählten Produkte sind Datengrundlage der Spalte Mitgliedsbeitrag in der Mitgliederverwaltung und werden nicht in der Umsatzstatistik angezeigt.'; - break; - case 'pl_PL': - case 'en_US': - $text = 'Which products are used as member fee product?
The selected products are the basis for the column Member Fee in the members adminstration and are not shown in the turnover statistics.
'; - break; - } - $sql = "INSERT INTO `fcs_configuration` (`id_configuration`, `active`, `name`, `text`, `value`, `type`, `position`, `locale`, `date_add`, `date_upd`) VALUES (NULL, '1', 'FCS_MEMBER_FEE_PRODUCTS', '".$text."', '', 'multiple_dropdown', '3300', '".I18n::getLocale()."', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);"; - $this->execute($sql); - } -} diff --git a/config/Migrations/20210119101923_CheckCreditBalanceLimit.php b/config/Migrations/20210119101923_CheckCreditBalanceLimit.php deleted file mode 100644 index 520fb6b40e..0000000000 --- a/config/Migrations/20210119101923_CheckCreditBalanceLimit.php +++ /dev/null @@ -1,24 +0,0 @@ -execute($sql); - } - -} diff --git a/config/Migrations/20210401071718_RemoveCustomerGroupSetting.php b/config/Migrations/20210401071718_RemoveCustomerGroupSetting.php deleted file mode 100644 index afee9e00c2..0000000000 --- a/config/Migrations/20210401071718_RemoveCustomerGroupSetting.php +++ /dev/null @@ -1,12 +0,0 @@ -execute("DELETE from fcs_configuration WHERE name = 'FCS_CUSTOMER_GROUP';"); - } -} diff --git a/config/Migrations/20210401082727_CustomerActivateEmailCode.php b/config/Migrations/20210401082727_CustomerActivateEmailCode.php deleted file mode 100644 index 6606a4ce38..0000000000 --- a/config/Migrations/20210401082727_CustomerActivateEmailCode.php +++ /dev/null @@ -1,12 +0,0 @@ -execute("ALTER TABLE `fcs_customer` ADD `activate_email_code` VARCHAR(12) NULL DEFAULT NULL AFTER `terms_of_use_accepted_date`;"); - } -} diff --git a/config/Migrations/20210419084816_BlogPostShowOnStartPageUntilDate.php b/config/Migrations/20210419084816_BlogPostShowOnStartPageUntilDate.php deleted file mode 100644 index 37b291a86f..0000000000 --- a/config/Migrations/20210419084816_BlogPostShowOnStartPageUntilDate.php +++ /dev/null @@ -1,14 +0,0 @@ -execute("ALTER TABLE `fcs_blog_posts` ADD `show_on_start_page_until` DATE NULL DEFAULT NULL AFTER `is_featured`;"); - $this->execute("UPDATE `fcs_blog_posts` SET `show_on_start_page_until` = DATE_ADD(NOW(), INTERVAL 30 DAY) WHERE `active` = 1 AND `is_featured` = 1;"); - $this->execute("ALTER TABLE `fcs_blog_posts` DROP `is_featured`;"); - } -} diff --git a/config/Migrations/20210427144234_RemoveOldMemberFeeSetting.php b/config/Migrations/20210427144234_RemoveOldMemberFeeSetting.php deleted file mode 100644 index b4bcb83282..0000000000 --- a/config/Migrations/20210427144234_RemoveOldMemberFeeSetting.php +++ /dev/null @@ -1,14 +0,0 @@ -execute("DELETE FROM fcs_action_logs WHERE type IN('payment_member_fee_added','payment_member_fee_deleted','payment_member_fee_flexible_added');"); - $this->execute("DELETE FROM fcs_payments WHERE type IN('member_fee','member_fee_flexible');"); - $this->execute("DELETE FROM fcs_configuration WHERE NAME = 'FCS_MEMBER_FEE_BANK_ACCOUNT_DATA';"); - } -} diff --git a/config/Migrations/20210504085123_SaveTaxInOrderDetails.php b/config/Migrations/20210504085123_SaveTaxInOrderDetails.php deleted file mode 100644 index c6669f68c2..0000000000 --- a/config/Migrations/20210504085123_SaveTaxInOrderDetails.php +++ /dev/null @@ -1,66 +0,0 @@ -execute("ALTER TABLE `fcs_order_detail` ADD `tax_unit_amount` DECIMAL(16,6) NOT NULL DEFAULT '0' AFTER `id_tax`, ADD `tax_total_amount` DECIMAL(16,6) NOT NULL DEFAULT '0' AFTER `tax_unit_amount`, ADD `tax_rate` DECIMAL(10,3) NOT NULL DEFAULT '0' AFTER `tax_total_amount`;"); - - $this->OrderDetail = FactoryLocator::get('Table')->get('OrderDetails'); - - $orderDetailCountPerMigrationStep = 1000; - $orderDetails = $this->OrderDetail->find('all'); - $loopsCount = ceil($orderDetails->count() / $orderDetailCountPerMigrationStep); - - $i = 0; - while($i <= $loopsCount) { - - $orderDetails = $this->OrderDetail->find('all', [ - 'limit' => $orderDetailCountPerMigrationStep, - 'offset' => $i * $orderDetailCountPerMigrationStep, - ])->toArray(); - - $j = 0; - foreach($orderDetails as $orderDetail) { - - $sql = "SELECT t.rate FROM fcs_tax t LEFT JOIN fcs_order_detail od ON t.id_tax = od.id_tax WHERE od.id_order_detail = :orderDetailId"; - $statement = $this->OrderDetail->getConnection()->prepare($sql); - $params = ['orderDetailId' => $orderDetail->id_order_detail]; - $statement->execute($params); - $taxes = $statement->fetchAll('assoc'); - - if (!empty($taxes)) { - $orderDetails[$j]->tax_rate = $taxes[0]['rate']; - } - - $sql = "SELECT odt.* FROM fcs_order_detail od LEFT JOIN fcs_order_detail_tax odt ON odt.id_order_detail = od.id_order_detail WHERE od.id_order_detail = :orderDetailId"; - $statement = $this->OrderDetail->getConnection()->prepare($sql); - $params = ['orderDetailId' => $orderDetail->id_order_detail]; - $statement->execute($params); - $orderDetailTaxes = $statement->fetchAll('assoc'); - - if (!empty($orderDetailTaxes)) { - $orderDetails[$j]->tax_unit_amount = $orderDetailTaxes[0]['unit_amount'] ?? 0; - $orderDetails[$j]->tax_total_amount = $orderDetailTaxes[0]['total_amount'] ?? 0; - } - - $j++; - - } - - $this->OrderDetail->saveMany($orderDetails); - - echo "- Tax for " . $orderDetailCountPerMigrationStep . " order details (starting with id " . $i * $orderDetailCountPerMigrationStep. ") migrated successfully.\n"; - $i++; - } - - $this->execute("DROP TABLE `fcs_order_detail_tax`;"); - $this->execute("ALTER TABLE `fcs_order_detail` DROP `id_tax`;"); - - } -} diff --git a/config/Migrations/20210510080630_EnablePurchasePrices.php b/config/Migrations/20210510080630_EnablePurchasePrices.php deleted file mode 100644 index ff397d9b2d..0000000000 --- a/config/Migrations/20210510080630_EnablePurchasePrices.php +++ /dev/null @@ -1,69 +0,0 @@ -execute($sql); - - // add new configuration - switch(I18n::getLocale()) { - case 'de_DE': - $text = 'Einkaufspreis für Produkte erfassen?
Der Einkaufspreis ist die Datengrundlage für die Gewinn-Statistik und für Lieferscheine an die Hersteller.
'; - break; - default: - $text = 'Enable input of purchase price?
The purchase price is the base for profit statistics and bill of delivery to manufacturers.
'; - break; - } - $sql = "INSERT INTO `fcs_configuration` (`id_configuration`, `active`, `name`, `text`, `value`, `type`, `position`, `locale`, `date_add`, `date_upd`) VALUES (NULL, '1', 'FCS_PURCHASE_PRICE_ENABLED', '".$text."', '0', 'readonly', '583', '".I18n::getLocale()."', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);"; - $this->execute($sql); - - $sql = "ALTER TABLE `fcs_units` ADD `purchase_price_incl_per_unit` DECIMAL(10,2) UNSIGNED NULL DEFAULT NULL AFTER `price_incl_per_unit`;"; - $this->execute($sql); - - $sql = "ALTER TABLE `fcs_manufacturer` ADD `default_tax_id_purchase_price` INT(8) UNSIGNED NULL DEFAULT NULL AFTER `default_tax_id`;"; - $this->execute($sql); - - $sql = "DROP TABLE IF EXISTS `fcs_purchase_prices`; - CREATE TABLE `fcs_purchase_prices` ( - `id` int(10) UNSIGNED NOT NULL, - `product_id` int(10) UNSIGNED NOT NULL DEFAULT '0', - `product_attribute_id` int(10) UNSIGNED NOT NULL DEFAULT '0', - `tax_id` int(10) UNSIGNED DEFAULT '0', - `price` decimal(20,6) NOT NULL DEFAULT '0.000000' - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - ALTER TABLE `fcs_purchase_prices` - ADD PRIMARY KEY (`id`), - ADD KEY `product_id` (`product_id`,`product_attribute_id`); - ALTER TABLE `fcs_purchase_prices` - MODIFY `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT; - COMMIT;"; - $this->execute($sql); - - $sql = "DROP TABLE IF EXISTS `fcs_order_detail_purchase_prices`; - CREATE TABLE `fcs_order_detail_purchase_prices` ( - `id_order_detail` int(10) UNSIGNED NOT NULL, - `tax_rate` decimal(10,3) NOT NULL DEFAULT '0.000', - `total_price_tax_incl` decimal(20,6) NOT NULL DEFAULT '0.000000', - `total_price_tax_excl` decimal(20,6) NOT NULL DEFAULT '0.000000', - `tax_unit_amount` decimal(16,6) NOT NULL DEFAULT '0.000000', - `tax_total_amount` decimal(16,6) NOT NULL DEFAULT '0.000000' - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - ALTER TABLE `fcs_order_detail_purchase_prices` - ADD PRIMARY KEY (`id_order_detail`); - COMMIT;"; - $this->execute($sql); - - $sql = "ALTER TABLE `fcs_order_detail_units` ADD `purchase_price_incl_per_unit` DECIMAL(10,2) UNSIGNED NULL DEFAULT NULL AFTER `price_incl_per_unit`;"; - $this->execute($sql); - - - } -} diff --git a/config/Migrations/20210707083827_AddRegistrierkasseApi.php b/config/Migrations/20210707083827_AddRegistrierkasseApi.php deleted file mode 100644 index 986683db64..0000000000 --- a/config/Migrations/20210707083827_AddRegistrierkasseApi.php +++ /dev/null @@ -1,28 +0,0 @@ -Alle Rechnungen (bar und unbar) über die Registrierkasse erstellen.'; - break; - default: - $text = 'Enable API to hellocash.at?
Invoices (cash and cashless) are generated by hellocash.at.
'; - break; - } - $sql = "INSERT INTO `fcs_configuration` (`id_configuration`, `active`, `name`, `text`, `value`, `type`, `position`, `locale`, `date_add`, `date_upd`) VALUES (NULL, '1', 'FCS_HELLO_CASH_API_ENABLED', '".$text."', '0', 'readonly', '583', '".I18n::getLocale()."', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);"; - $this->execute($sql); - - $this->execute("UPDATE fcs_configuration SET position = 584 WHERE name ='FCS_PURCHASE_PRICE_ENABLED';"); - - $this->execute("ALTER TABLE `fcs_customer` ADD `user_id_registrierkasse` INT(10) UNSIGNED NULL DEFAULT 0 AFTER `use_camera_for_barcode_scanning`;"); - - } -} diff --git a/config/Migrations/20210802090623_AddStorageLocation.php b/config/Migrations/20210802090623_AddStorageLocation.php deleted file mode 100644 index 06e8ea1ada..0000000000 --- a/config/Migrations/20210802090623_AddStorageLocation.php +++ /dev/null @@ -1,49 +0,0 @@ -Lagerorte: Keine Kühlung / Kühlschrank / Tiefkühler. Es erscheint ein zusätzlicher Button neben "Bestellungen - Bestellungen als PDF generieren"'; - $storageLocationA = 'Keine Kühlung'; - $storageLocationB = 'Kühlschrank'; - $storageLocationC = 'Tiefkühler'; - break; - default: - $text = 'Save storage location for products?
New button next to "Orders - show order as pdf"
'; - $storageLocationA = 'No cooling'; - $storageLocationB = 'Refrigerator'; - $storageLocationC = 'Freezer'; - break; - } - $sql = "INSERT INTO `fcs_configuration` (`id_configuration`, `active`, `name`, `text`, `value`, `type`, `position`, `locale`, `date_add`, `date_upd`) VALUES (NULL, '1', 'FCS_SAVE_STORAGE_LOCATION_FOR_PRODUCTS', '".$text."', '0', 'boolean', '3210', '".I18n::getLocale()."', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);"; - $this->execute($sql); - - $this->execute(" - CREATE TABLE `fcs_storage_locations` ( - `id` int(11) NOT NULL, - `name` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `rank` tinyint(4) UNSIGNED NOT NULL DEFAULT '0' - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - INSERT INTO `fcs_storage_locations` (`id`, `name`, `rank`) VALUES - (1, '".$storageLocationA."', 10), - (2, '".$storageLocationB."', 20), - (3, '".$storageLocationC."', 30); - ALTER TABLE `fcs_storage_locations` - ADD PRIMARY KEY (`id`); - ALTER TABLE `fcs_storage_locations` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4; - COMMIT; - "); - - $this->execute("ALTER TABLE `fcs_product` ADD `id_storage_location` TINYINT(4) UNSIGNED NOT NULL DEFAULT '1' AFTER `id_tax`;"); - - } -} diff --git a/config/Migrations/20210910191430_Instagram.php b/config/Migrations/20210910191430_Instagram.php deleted file mode 100644 index 46c307d130..0000000000 --- a/config/Migrations/20210910191430_Instagram.php +++ /dev/null @@ -1,31 +0,0 @@ -execute($sql); - - $sql = "UPDATE `fcs_configuration` SET position = 900 WHERE name = 'FCS_APP_EMAIL';"; - $this->execute($sql); - $sql = "UPDATE `fcs_configuration` SET position = 910 WHERE name = 'FCS_FACEBOOK_URL';"; - $this->execute($sql); - $sql = "UPDATE `fcs_configuration` SET position = 920 WHERE name = 'FCS_FOOTER_CMS_TEXT';"; - $this->execute($sql); - $sql = "UPDATE `fcs_configuration` SET position = 930 WHERE name = 'FCS_SHOW_FOODCOOPSHOP_BACKLINK';"; - $this->execute($sql); - } -} diff --git a/config/Migrations/20210914071747_DifferentPricesForCustomers.php b/config/Migrations/20210914071747_DifferentPricesForCustomers.php deleted file mode 100644 index 2e85c099f1..0000000000 --- a/config/Migrations/20210914071747_DifferentPricesForCustomers.php +++ /dev/null @@ -1,13 +0,0 @@ -execute("ALTER TABLE `fcs_customer` ADD `shopping_price` VARCHAR(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'SP' AFTER `user_id_registrierkasse`;"); - $this->execute("ALTER TABLE `fcs_order_detail` ADD `shopping_price` VARCHAR(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'SP' AFTER `pickup_day`;"); - } -} diff --git a/config/Migrations/20210922154148_RemoveUnusedQueueTable.php b/config/Migrations/20210922154148_RemoveUnusedQueueTable.php deleted file mode 100644 index 7ecfb5c21c..0000000000 --- a/config/Migrations/20210922154148_RemoveUnusedQueueTable.php +++ /dev/null @@ -1,12 +0,0 @@ -execute("DROP TABLE IF EXISTS queued_tasks;"); - } -} diff --git a/config/Migrations/20210923073422_RemoveSettingShowNewProductsOnHome.php b/config/Migrations/20210923073422_RemoveSettingShowNewProductsOnHome.php deleted file mode 100644 index 1006d34e84..0000000000 --- a/config/Migrations/20210923073422_RemoveSettingShowNewProductsOnHome.php +++ /dev/null @@ -1,12 +0,0 @@ -execute("DELETE FROM `fcs_configuration` WHERE `name` = 'FCS_SHOW_NEW_PRODUCTS_ON_HOME';"); - } -} diff --git a/config/Migrations/20210923090820_AllowNullAsPurchasePrice.php b/config/Migrations/20210923090820_AllowNullAsPurchasePrice.php deleted file mode 100644 index 43a8aab3df..0000000000 --- a/config/Migrations/20210923090820_AllowNullAsPurchasePrice.php +++ /dev/null @@ -1,12 +0,0 @@ -execute("ALTER TABLE `fcs_purchase_prices` CHANGE `price` `price` DECIMAL(20,6) NULL DEFAULT NULL;"); - } -} diff --git a/config/Migrations/20211028083847_UseExistingBarcode.php b/config/Migrations/20211028083847_UseExistingBarcode.php deleted file mode 100644 index 8425ee3c40..0000000000 --- a/config/Migrations/20211028083847_UseExistingBarcode.php +++ /dev/null @@ -1,25 +0,0 @@ -execute($sql); - } -} diff --git a/config/Migrations/20211123095227_DeactivateCheckCreditReminder.php b/config/Migrations/20211123095227_DeactivateCheckCreditReminder.php deleted file mode 100644 index 501e9a45be..0000000000 --- a/config/Migrations/20211123095227_DeactivateCheckCreditReminder.php +++ /dev/null @@ -1,12 +0,0 @@ -execute("ALTER TABLE `fcs_customer` ADD `check_credit_reminder_enabled` TINYINT UNSIGNED NULL DEFAULT '1' AFTER `shopping_price`;"); - } -} diff --git a/config/Migrations/20211213081433_ImproveCustomerNotifications.php b/config/Migrations/20211213081433_ImproveCustomerNotifications.php deleted file mode 100644 index 0a87a2ed4b..0000000000 --- a/config/Migrations/20211213081433_ImproveCustomerNotifications.php +++ /dev/null @@ -1,16 +0,0 @@ -execute("ALTER TABLE `fcs_customer` ADD `invoices_per_email_enabled` TINYINT UNSIGNED NULL DEFAULT '1' AFTER `check_credit_reminder_enabled`;"); - $this->execute("ALTER TABLE `fcs_customer` ADD `pickup_day_reminder_enabled` TINYINT UNSIGNED NULL DEFAULT '1' AFTER `invoices_per_email_enabled`;"); - $this->execute("ALTER TABLE `fcs_customer` ADD `credit_upload_reminder_enabled` TINYINT UNSIGNED NULL DEFAULT '1' AFTER `pickup_day_reminder_enabled`;"); - $this->execute("ALTER TABLE `fcs_customer` CHANGE `email_order_reminder` `email_order_reminder_enabled` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0';"); - $this->execute("ALTER TABLE `fcs_invoices` CHANGE `email_status` `email_status` VARCHAR(30) NULL DEFAULT NULL;"); - } -} diff --git a/config/Migrations/20211215184633_ManufacturerSettingIncludeStockProductsOnOrderList.php b/config/Migrations/20211215184633_ManufacturerSettingIncludeStockProductsOnOrderList.php deleted file mode 100644 index e83b932fc5..0000000000 --- a/config/Migrations/20211215184633_ManufacturerSettingIncludeStockProductsOnOrderList.php +++ /dev/null @@ -1,12 +0,0 @@ -execute("ALTER TABLE `fcs_manufacturer` ADD `include_stock_products_in_order_lists` TINYINT(3) UNSIGNED NOT NULL DEFAULT '1' AFTER `no_delivery_days`;"); - } -} diff --git a/config/Migrations/20211229194617_AddIndizesForBetterPerformance.php b/config/Migrations/20211229194617_AddIndizesForBetterPerformance.php deleted file mode 100644 index b4fb61657e..0000000000 --- a/config/Migrations/20211229194617_AddIndizesForBetterPerformance.php +++ /dev/null @@ -1,16 +0,0 @@ -execute("ALTER TABLE `fcs_category_product` ADD INDEX(`id_category`);"); - $this->execute("ALTER TABLE `fcs_product` ADD INDEX(`is_stock_product`);"); - $this->execute("ALTER TABLE `fcs_manufacturer` ADD INDEX(`stock_management_enabled`);"); - $this->execute("ALTER TABLE `fcs_category` ADD INDEX(`active`);"); - $this->execute("ALTER TABLE `fcs_barcodes` ADD INDEX(`barcode`);"); - } -} diff --git a/config/Migrations/20220129082136_SendDeliveryNotesEveryMonth.php b/config/Migrations/20220129082136_SendDeliveryNotesEveryMonth.php deleted file mode 100644 index b735141e9c..0000000000 --- a/config/Migrations/20220129082136_SendDeliveryNotesEveryMonth.php +++ /dev/null @@ -1,15 +0,0 @@ -execute($sql); - $sql = "INSERT INTO `fcs_cronjobs` (`id`, `name`, `time_interval`, `day_of_month`, `weekday`, `not_before_time`, `active`) VALUES (NULL, 'SendDeliveryNotes', 'month', '1', null, '18:00:00', '0');"; - $this->execute($sql); - } -} diff --git a/config/Migrations/20220201163254_OptionalDeliveryRhythmSettingOrderInWeekBeforeDelivery.php b/config/Migrations/20220201163254_OptionalDeliveryRhythmSettingOrderInWeekBeforeDelivery.php deleted file mode 100644 index 933938ff0b..0000000000 --- a/config/Migrations/20220201163254_OptionalDeliveryRhythmSettingOrderInWeekBeforeDelivery.php +++ /dev/null @@ -1,22 +0,0 @@ -execute($sql); - } -} diff --git a/config/Migrations/20220321103059_PrefixForInvoices.php b/config/Migrations/20220321103059_PrefixForInvoices.php deleted file mode 100644 index 0572d3c9ae..0000000000 --- a/config/Migrations/20220321103059_PrefixForInvoices.php +++ /dev/null @@ -1,27 +0,0 @@ -
Max. 6 Zeichen inkl. Trennzeichen.
'; - break; - default: - $text = 'Prefix for invoice numbers
Max. 6 chars incl. separator.
'; - break; - } - $sql = "INSERT INTO `fcs_configuration` (`id_configuration`, `active`, `name`, `text`, `value`, `type`, `position`, `locale`, `date_add`, `date_upd`) VALUES (NULL, '1', 'FCS_INVOICE_NUMBER_PREFIX', '".$text."', '', 'readonly', '583', '".I18n::getLocale()."', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);"; - $this->execute($sql); - - $sql = "ALTER TABLE `fcs_invoices` CHANGE `invoice_number` `invoice_number` VARCHAR(17) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '0';"; - $this->execute($sql); - - } -} diff --git a/config/Migrations/20220323075926_TaxBasedOnNetInvoiceSum.php b/config/Migrations/20220323075926_TaxBasedOnNetInvoiceSum.php deleted file mode 100644 index 9c0ee829e2..0000000000 --- a/config/Migrations/20220323075926_TaxBasedOnNetInvoiceSum.php +++ /dev/null @@ -1,31 +0,0 @@ -
Die Berechnung der Umsatzsteuer erfolgt auf Basis der Netto-Rechnungsumme und ist nicht die Summe der Umsatzsteuerbeträge pro Stück.
'; - break; - default: - $text = 'Invoices for companies with fixed tax rate
Vat is calculated based on the sum of net price of the invoice.
'; - break; - } - $sql = "INSERT INTO `fcs_configuration` (`id_configuration`, `active`, `name`, `text`, `value`, `type`, `position`, `locale`, `date_add`, `date_upd`) VALUES (NULL, '1', 'FCS_TAX_BASED_ON_NET_INVOICE_SUM', '".$text."', '0', 'readonly', '584', '".I18n::getLocale()."', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);"; - $this->execute($sql); - - $sql = "UPDATE fcs_configuration SET position = 585 WHERE name = 'FCS_TAX_BASED_ON_NET_INVOICE_SUM'"; - $this->execute($sql); - $sql = "UPDATE fcs_configuration SET position = 586 WHERE name = 'FCS_INVOICE_NUMBER_PREFIX'"; - $this->execute($sql); - $sql = "UPDATE fcs_configuration SET position = 587 WHERE name = 'FCS_PURCHASE_PRICE_ENABLED'"; - $this->execute($sql); - - } -} diff --git a/config/Migrations/20220407093247_AddIsCompanyFieldForCustomer.php b/config/Migrations/20220407093247_AddIsCompanyFieldForCustomer.php deleted file mode 100644 index d158b690b0..0000000000 --- a/config/Migrations/20220407093247_AddIsCompanyFieldForCustomer.php +++ /dev/null @@ -1,21 +0,0 @@ -execute($sql); - - $sql = "ALTER TABLE `fcs_customer` CHANGE `firstname` `firstname` VARCHAR(50) NOT NULL DEFAULT '', CHANGE `lastname` `lastname` VARCHAR(50) NOT NULL DEFAULT '';"; - $this->execute($sql); - - $sql = "ALTER TABLE `fcs_address` CHANGE `lastname` `lastname` VARCHAR(50) NOT NULL DEFAULT '', CHANGE `firstname` `firstname` VARCHAR(50) NOT NULL DEFAULT '';"; - $this->execute($sql); - - } -} diff --git a/config/Migrations/20220412131842_Newsletter.php b/config/Migrations/20220412131842_Newsletter.php deleted file mode 100644 index f7774fe298..0000000000 --- a/config/Migrations/20220412131842_Newsletter.php +++ /dev/null @@ -1,25 +0,0 @@ -
Mitglieder können sich bei der Registrierung für den Newsletter anmelden. Mehr Infos
'; - break; - default: - $text = 'Newsletter enabled?
Shows newsletter checkbox on registration.
'; - break; - } - $sql = "INSERT INTO `fcs_configuration` (`id_configuration`, `active`, `name`, `text`, `value`, `type`, `position`, `locale`, `date_add`, `date_upd`) VALUES (NULL, '1', 'FCS_NEWSLETTER_ENABLED', '".$text."', '0', 'boolean', '3400', '".I18n::getLocale()."', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);"; - $this->execute($sql); - - $this->execute("ALTER TABLE `fcs_customer` ADD `newsletter_enabled` TINYINT UNSIGNED NULL DEFAULT '0' AFTER `credit_upload_reminder_enabled`;"); - } -} diff --git a/config/Migrations/20220620091755_RemoveTimebasedCurrencyModule.php b/config/Migrations/20220620091755_RemoveTimebasedCurrencyModule.php deleted file mode 100644 index 785cd2a19d..0000000000 --- a/config/Migrations/20220620091755_RemoveTimebasedCurrencyModule.php +++ /dev/null @@ -1,19 +0,0 @@ -execute("DROP TABLE IF EXISTS fcs_timebased_currency_order_detail"); - $this->execute("DROP TABLE IF EXISTS fcs_timebased_currency_payments"); - $this->execute("DELETE FROM fcs_configuration WHERE name LIKE '%FCS_TIMEBASED_%'"); - $this->execute("ALTER TABLE fcs_customer DROP timebased_currency_enabled"); - $this->execute("ALTER TABLE fcs_manufacturer DROP timebased_currency_enabled"); - $this->execute("ALTER TABLE fcs_manufacturer DROP timebased_currency_max_percentage"); - $this->execute("ALTER TABLE fcs_manufacturer DROP timebased_currency_max_credit_balance"); - } -} diff --git a/config/Migrations/20220717194215_UserFeedback.php b/config/Migrations/20220717194215_UserFeedback.php deleted file mode 100644 index 8fb443b704..0000000000 --- a/config/Migrations/20220717194215_UserFeedback.php +++ /dev/null @@ -1,27 +0,0 @@ -
Ermöglicht das Erfassen und Anzeigen von Feedback. Mehr Infos
'; - break; - default: - $text = 'Member and manufacturer feedback enabled?
Members and manufacturers can write feedback.
'; - break; - } - $sql = "INSERT INTO `fcs_configuration` (`id_configuration`, `active`, `name`, `text`, `value`, `type`, `position`, `locale`, `date_add`, `date_upd`) VALUES (NULL, '1', 'FCS_USER_FEEDBACK_ENABLED', '".$text."', '0', 'boolean', '3500', '".I18n::getLocale()."', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);"; - $this->execute($sql); - - $sql = "CREATE TABLE fcs_feedbacks ( `id` INT NOT NULL AUTO_INCREMENT , `customer_id` INT NULL DEFAULT NULL , `text` TEXT NULL, `approved` DATETIME NOT NULL DEFAULT '1970-01-01' , `modified` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP , `created` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP , `privacy_type` TINYINT NULL DEFAULT '0' , PRIMARY KEY (`id`)) ENGINE = InnoDB;"; - $this->execute($sql); - - } -} diff --git a/config/Migrations/20220928063531_Initial.php b/config/Migrations/20220928063531_Initial.php new file mode 100644 index 0000000000..2ae9767cfb --- /dev/null +++ b/config/Migrations/20220928063531_Initial.php @@ -0,0 +1,2230 @@ +table('fcs_action_logs') + ->addColumn('id', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addPrimaryKey(['id']) + ->addColumn('type', 'string', [ + 'default' => '', + 'limit' => 255, + 'null' => false, + ]) + ->addColumn('customer_id', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('object_id', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('object_type', 'string', [ + 'default' => '', + 'limit' => 255, + 'null' => false, + ]) + ->addColumn('text', 'text', [ + 'default' => null, + 'limit' => 16777215, + 'null' => false, + ]) + ->addColumn('date', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->create(); + + $this->table('fcs_address') + ->addColumn('id_address', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_address']) + ->addColumn('id_customer', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('id_manufacturer', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('lastname', 'string', [ + 'default' => '', + 'limit' => 50, + 'null' => false, + ]) + ->addColumn('firstname', 'string', [ + 'default' => '', + 'limit' => 50, + 'null' => false, + ]) + ->addColumn('address1', 'string', [ + 'default' => '', + 'limit' => 128, + 'null' => false, + ]) + ->addColumn('address2', 'string', [ + 'default' => null, + 'limit' => 128, + 'null' => true, + ]) + ->addColumn('postcode', 'string', [ + 'default' => null, + 'limit' => 12, + 'null' => true, + ]) + ->addColumn('city', 'string', [ + 'default' => '', + 'limit' => 64, + 'null' => false, + ]) + ->addColumn('comment', 'text', [ + 'default' => null, + 'limit' => 16777215, + 'null' => true, + ]) + ->addColumn('phone', 'string', [ + 'default' => null, + 'limit' => 32, + 'null' => true, + ]) + ->addColumn('phone_mobile', 'string', [ + 'default' => null, + 'limit' => 32, + 'null' => true, + ]) + ->addColumn('email', 'string', [ + 'default' => null, + 'limit' => 255, + 'null' => true, + ]) + ->addColumn('date_add', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('date_upd', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->addIndex( + [ + 'id_customer', + ] + ) + ->addIndex( + [ + 'id_manufacturer', + ] + ) + ->create(); + + $this->table('fcs_attribute') + ->addColumn('id_attribute', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_attribute']) + ->addColumn('name', 'string', [ + 'default' => null, + 'limit' => 128, + 'null' => true, + ]) + ->addColumn('can_be_used_as_unit', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('active', 'integer', [ + 'default' => '1', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('created', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('modified', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->create(); + + $this->table('fcs_barcodes') + ->addColumn('id', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id']) + ->addColumn('product_id', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('product_attribute_id', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('barcode', 'string', [ + 'default' => null, + 'limit' => 13, + 'null' => true, + ]) + ->addIndex( + [ + 'product_id', + 'product_attribute_id', + ] + ) + ->addIndex( + [ + 'barcode', + ] + ) + ->create(); + + $this->table('fcs_blog_posts') + ->addColumn('id_blog_post', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_blog_post']) + ->addColumn('title', 'string', [ + 'default' => null, + 'limit' => 150, + 'null' => false, + ]) + ->addColumn('short_description', 'string', [ + 'default' => null, + 'limit' => 100, + 'null' => false, + ]) + ->addColumn('content', 'text', [ + 'default' => null, + 'limit' => 4294967295, + 'null' => false, + ]) + ->addColumn('id_customer', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('id_manufacturer', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('is_private', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('active', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('created', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('modified', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('show_on_start_page_until', 'date', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->create(); + + $this->table('fcs_cart_product_units') + ->addColumn('id_cart_product', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('ordered_quantity_in_units', 'decimal', [ + 'default' => null, + 'null' => true, + 'precision' => 10, + 'scale' => 3, + 'signed' => false, + ]) + ->create(); + + $this->table('fcs_cart_products') + ->addColumn('id_cart_product', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_cart_product']) + ->addColumn('id_cart', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('id_product', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('id_product_attribute', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('amount', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('created', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('modified', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->create(); + + $this->table('fcs_carts') + ->addColumn('id_cart', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_cart']) + ->addColumn('id_customer', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('cart_type', 'integer', [ + 'default' => '1', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('status', 'tinyinteger', [ + 'default' => '1', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('created', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('modified', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->create(); + + $this->table('fcs_category') + ->addColumn('id_category', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_category']) + ->addColumn('id_parent', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('name', 'string', [ + 'default' => null, + 'limit' => 128, + 'null' => false, + ]) + ->addColumn('description', 'text', [ + 'default' => null, + 'limit' => 16777215, + 'null' => false, + ]) + ->addColumn('nleft', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('nright', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('active', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('created', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('modified', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addIndex( + [ + 'id_parent', + ] + ) + ->addIndex( + [ + 'nleft', + 'nright', + 'active', + ] + ) + ->addIndex( + [ + 'nright', + ] + ) + ->addIndex( + [ + 'active', + 'nleft', + ] + ) + ->addIndex( + [ + 'active', + 'nright', + ] + ) + ->addIndex( + [ + 'active', + ] + ) + ->create(); + + $this->table('fcs_category_product') + ->addColumn('id_category', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('id_product', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_category', 'id_product']) + ->addIndex( + [ + 'id_product', + ] + ) + ->addIndex( + [ + 'id_category', + ] + ) + ->create(); + + $this->table('fcs_configuration') + ->addColumn('id_configuration', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_configuration']) + ->addColumn('active', 'boolean', [ + 'default' => false, + 'limit' => null, + 'null' => false, + ]) + ->addColumn('name', 'string', [ + 'default' => '', + 'limit' => 254, + 'null' => false, + ]) + ->addColumn('text', 'text', [ + 'default' => null, + 'limit' => 16777215, + 'null' => false, + ]) + ->addColumn('value', 'text', [ + 'default' => null, + 'limit' => 16777215, + 'null' => true, + ]) + ->addColumn('type', 'string', [ + 'default' => '', + 'limit' => 20, + 'null' => false, + ]) + ->addColumn('position', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('locale', 'string', [ + 'default' => null, + 'limit' => 5, + 'null' => true, + ]) + ->addColumn('date_add', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('date_upd', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->addIndex( + [ + 'name', + ] + ) + ->create(); + + $this->table('fcs_cronjob_logs') + ->addColumn('id', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addPrimaryKey(['id']) + ->addColumn('cronjob_id', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('created', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('success', 'tinyinteger', [ + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->create(); + + $this->table('fcs_cronjobs') + ->addColumn('id', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addPrimaryKey(['id']) + ->addColumn('name', 'string', [ + 'default' => null, + 'limit' => 255, + 'null' => false, + ]) + ->addColumn('time_interval', 'string', [ + 'default' => null, + 'limit' => 50, + 'null' => false, + ]) + ->addColumn('day_of_month', 'tinyinteger', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('weekday', 'string', [ + 'default' => null, + 'limit' => 50, + 'null' => true, + ]) + ->addColumn('not_before_time', 'time', [ + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addColumn('active', 'tinyinteger', [ + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->create(); + + $this->table('fcs_customer') + ->addColumn('id_customer', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_customer']) + ->addColumn('id_default_group', 'integer', [ + 'default' => '1', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('is_company', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('firstname', 'string', [ + 'default' => '', + 'limit' => 50, + 'null' => false, + ]) + ->addColumn('lastname', 'string', [ + 'default' => '', + 'limit' => 50, + 'null' => false, + ]) + ->addColumn('email', 'string', [ + 'default' => '', + 'limit' => 128, + 'null' => false, + ]) + ->addColumn('passwd', 'char', [ + 'default' => null, + 'limit' => 60, + 'null' => true, + ]) + ->addColumn('tmp_new_passwd', 'char', [ + 'default' => null, + 'limit' => 60, + 'null' => true, + ]) + ->addColumn('activate_new_password_code', 'string', [ + 'default' => null, + 'limit' => 12, + 'null' => true, + ]) + ->addColumn('auto_login_hash', 'string', [ + 'default' => null, + 'limit' => 40, + 'null' => true, + ]) + ->addColumn('email_order_reminder_enabled', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('terms_of_use_accepted_date', 'date', [ + 'default' => '1000-01-01', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('activate_email_code', 'string', [ + 'default' => null, + 'limit' => 12, + 'null' => true, + ]) + ->addColumn('active', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('date_add', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('date_upd', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('use_camera_for_barcode_scanning', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('user_id_registrierkasse', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('shopping_price', 'string', [ + 'default' => 'SP', + 'limit' => 2, + 'null' => true, + ]) + ->addColumn('check_credit_reminder_enabled', 'tinyinteger', [ + 'default' => '1', + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('invoices_per_email_enabled', 'tinyinteger', [ + 'default' => '1', + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('pickup_day_reminder_enabled', 'tinyinteger', [ + 'default' => '1', + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('credit_upload_reminder_enabled', 'tinyinteger', [ + 'default' => '1', + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('newsletter_enabled', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addIndex( + [ + 'email', + ] + ) + ->addIndex( + [ + 'email', + 'passwd', + ] + ) + ->addIndex( + [ + 'id_customer', + 'passwd', + ] + ) + ->create(); + + $this->table('fcs_deposits') + ->addColumn('id', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addPrimaryKey(['id']) + ->addColumn('id_product', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('id_product_attribute', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('deposit', 'float', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + ]) + ->create(); + + $this->table('fcs_feedbacks') + ->addColumn('id', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addPrimaryKey(['id']) + ->addColumn('customer_id', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('text', 'text', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('approved', 'datetime', [ + 'default' => '1970-01-01 00:00:00', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('modified', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('created', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('privacy_type', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => true, + ]) + ->create(); + + $this->table('fcs_images') + ->addColumn('id_image', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_image']) + ->addColumn('id_product', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->create(); + + $this->table('fcs_invoice_taxes') + ->addColumn('id', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addPrimaryKey(['id']) + ->addColumn('invoice_id', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('tax_rate', 'float', [ + 'default' => '0.000000', + 'null' => false, + 'precision' => 20, + 'scale' => 6, + ]) + ->addColumn('total_price_tax_excl', 'float', [ + 'default' => '0.000000', + 'null' => false, + 'precision' => 20, + 'scale' => 6, + ]) + ->addColumn('total_price_tax', 'float', [ + 'default' => '0.000000', + 'null' => false, + 'precision' => 20, + 'scale' => 6, + ]) + ->addColumn('total_price_tax_incl', 'float', [ + 'default' => '0.000000', + 'null' => false, + 'precision' => 20, + 'scale' => 6, + ]) + ->addIndex( + [ + 'invoice_id', + ] + ) + ->create(); + + $this->table('fcs_invoices') + ->addColumn('id', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addPrimaryKey(['id']) + ->addColumn('id_manufacturer', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('invoice_number', 'string', [ + 'default' => '0', + 'limit' => 17, + 'null' => false, + ]) + ->addColumn('created', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('id_customer', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('paid_in_cash', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('filename', 'string', [ + 'default' => '', + 'limit' => 512, + 'null' => false, + ]) + ->addColumn('email_status', 'string', [ + 'default' => null, + 'limit' => 30, + 'null' => true, + ]) + ->addColumn('cancellation_invoice_id', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->create(); + + $this->table('fcs_manufacturer') + ->addColumn('id_manufacturer', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_manufacturer']) + ->addColumn('name', 'string', [ + 'default' => null, + 'limit' => 64, + 'null' => true, + ]) + ->addColumn('description', 'text', [ + 'default' => null, + 'limit' => 4294967295, + 'null' => true, + ]) + ->addColumn('short_description', 'text', [ + 'default' => null, + 'limit' => 16777215, + 'null' => true, + ]) + ->addColumn('created', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('modified', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('active', 'boolean', [ + 'default' => false, + 'limit' => null, + 'null' => false, + ]) + ->addColumn('is_private', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('uid_number', 'string', [ + 'default' => null, + 'limit' => 30, + 'null' => true, + ]) + ->addColumn('additional_text_for_invoice', 'text', [ + 'default' => null, + 'limit' => 16777215, + 'null' => true, + ]) + ->addColumn('iban', 'string', [ + 'default' => null, + 'limit' => 22, + 'null' => true, + ]) + ->addColumn('bic', 'string', [ + 'default' => null, + 'limit' => 11, + 'null' => true, + ]) + ->addColumn('bank_name', 'string', [ + 'default' => null, + 'limit' => 255, + 'null' => true, + ]) + ->addColumn('firmenbuchnummer', 'string', [ + 'default' => null, + 'limit' => 20, + 'null' => true, + ]) + ->addColumn('firmengericht', 'string', [ + 'default' => null, + 'limit' => 150, + 'null' => true, + ]) + ->addColumn('aufsichtsbehoerde', 'string', [ + 'default' => null, + 'limit' => 150, + 'null' => true, + ]) + ->addColumn('kammer', 'string', [ + 'default' => null, + 'limit' => 150, + 'null' => true, + ]) + ->addColumn('homepage', 'string', [ + 'default' => null, + 'limit' => 255, + 'null' => true, + ]) + ->addColumn('id_customer', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('variable_member_fee', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('send_invoice', 'tinyinteger', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('send_order_list', 'tinyinteger', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('default_tax_id', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('default_tax_id_purchase_price', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('send_order_list_cc', 'string', [ + 'default' => null, + 'limit' => 512, + 'null' => true, + ]) + ->addColumn('send_instant_order_notification', 'tinyinteger', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('send_ordered_product_deleted_notification', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('send_ordered_product_price_changed_notification', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('send_ordered_product_amount_changed_notification', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('enabled_sync_domains', 'string', [ + 'default' => null, + 'limit' => 50, + 'null' => true, + ]) + ->addColumn('stock_management_enabled', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('send_product_sold_out_limit_reached_for_manufacturer', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('send_product_sold_out_limit_reached_for_contact_person', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('no_delivery_days', 'text', [ + 'default' => null, + 'limit' => 16777215, + 'null' => true, + ]) + ->addColumn('include_stock_products_in_order_lists', 'tinyinteger', [ + 'default' => '1', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('send_delivery_notes', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addIndex( + [ + 'stock_management_enabled', + ] + ) + ->create(); + + $this->table('fcs_order_detail') + ->addColumn('id_order_detail', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_order_detail']) + ->addColumn('product_id', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('product_attribute_id', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('product_name', 'string', [ + 'default' => '', + 'limit' => 255, + 'null' => false, + ]) + ->addColumn('product_amount', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('total_price_tax_incl', 'decimal', [ + 'default' => '0.000000', + 'null' => false, + 'precision' => 20, + 'scale' => 6, + ]) + ->addColumn('total_price_tax_excl', 'decimal', [ + 'default' => '0.000000', + 'null' => false, + 'precision' => 20, + 'scale' => 6, + ]) + ->addColumn('tax_unit_amount', 'decimal', [ + 'default' => '0.000000', + 'null' => false, + 'precision' => 16, + 'scale' => 6, + ]) + ->addColumn('tax_total_amount', 'decimal', [ + 'default' => '0.000000', + 'null' => false, + 'precision' => 16, + 'scale' => 6, + ]) + ->addColumn('tax_rate', 'decimal', [ + 'default' => '0.000', + 'null' => false, + 'precision' => 10, + 'scale' => 3, + ]) + ->addColumn('deposit', 'decimal', [ + 'default' => '0.00', + 'null' => false, + 'precision' => 10, + 'scale' => 2, + ]) + ->addColumn('id_customer', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('id_invoice', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('id_cart_product', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('order_state', 'tinyinteger', [ + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('pickup_day', 'date', [ + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addColumn('shopping_price', 'string', [ + 'default' => 'SP', + 'limit' => 2, + 'null' => true, + ]) + ->addColumn('created', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addColumn('modified', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addIndex( + [ + 'product_id', + ] + ) + ->addIndex( + [ + 'product_attribute_id', + ] + ) + ->addIndex( + [ + 'id_customer', + ] + ) + ->addIndex( + [ + 'pickup_day', + ] + ) + ->addIndex( + [ + 'created', + ] + ) + ->addIndex( + [ + 'order_state', + ] + ) + ->addIndex( + [ + 'product_name', + ] + ) + ->create(); + + $this->table('fcs_order_detail_feedbacks') + ->addColumn('id_order_detail', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_order_detail']) + ->addColumn('text', 'text', [ + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addColumn('customer_id', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->create(); + + $this->table('fcs_order_detail_purchase_prices') + ->addColumn('id_order_detail', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_order_detail']) + ->addColumn('tax_rate', 'decimal', [ + 'default' => '0.000', + 'null' => false, + 'precision' => 10, + 'scale' => 3, + ]) + ->addColumn('total_price_tax_incl', 'decimal', [ + 'default' => '0.000000', + 'null' => false, + 'precision' => 20, + 'scale' => 6, + ]) + ->addColumn('total_price_tax_excl', 'decimal', [ + 'default' => '0.000000', + 'null' => false, + 'precision' => 20, + 'scale' => 6, + ]) + ->addColumn('tax_unit_amount', 'decimal', [ + 'default' => '0.000000', + 'null' => false, + 'precision' => 16, + 'scale' => 6, + ]) + ->addColumn('tax_total_amount', 'decimal', [ + 'default' => '0.000000', + 'null' => false, + 'precision' => 16, + 'scale' => 6, + ]) + ->create(); + + $this->table('fcs_order_detail_units') + ->addColumn('id_order_detail', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('product_quantity_in_units', 'decimal', [ + 'default' => null, + 'null' => true, + 'precision' => 10, + 'scale' => 3, + 'signed' => false, + ]) + ->addColumn('price_incl_per_unit', 'decimal', [ + 'default' => null, + 'null' => true, + 'precision' => 10, + 'scale' => 2, + 'signed' => false, + ]) + ->addColumn('purchase_price_incl_per_unit', 'decimal', [ + 'default' => null, + 'null' => true, + 'precision' => 10, + 'scale' => 2, + 'signed' => false, + ]) + ->addColumn('quantity_in_units', 'decimal', [ + 'default' => null, + 'null' => true, + 'precision' => 10, + 'scale' => 3, + 'signed' => false, + ]) + ->addColumn('unit_name', 'string', [ + 'default' => '', + 'limit' => 50, + 'null' => false, + ]) + ->addColumn('unit_amount', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('mark_as_saved', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addIndex( + [ + 'id_order_detail', + ], + ['unique' => true] + ) + ->create(); + + $this->table('fcs_pages') + ->addColumn('id_page', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_page']) + ->addColumn('title', 'string', [ + 'default' => null, + 'limit' => 128, + 'null' => false, + ]) + ->addColumn('content', 'text', [ + 'default' => null, + 'limit' => 4294967295, + 'null' => false, + ]) + ->addColumn('position', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('menu_type', 'string', [ + 'default' => 'header', + 'limit' => 255, + 'null' => false, + ]) + ->addColumn('active', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('extern_url', 'string', [ + 'default' => '', + 'limit' => 255, + 'null' => false, + ]) + ->addColumn('id_customer', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('is_private', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('modified', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('created', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('full_width', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('id_parent', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('lft', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('rght', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + ]) + ->create(); + + $this->table('fcs_payments') + ->addColumn('id', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addPrimaryKey(['id']) + ->addColumn('id_customer', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('id_manufacturer', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('type', 'string', [ + 'default' => 'product', + 'limit' => 20, + 'null' => false, + ]) + ->addColumn('amount', 'decimal', [ + 'default' => '0.00', + 'null' => false, + 'precision' => 10, + 'scale' => 2, + ]) + ->addColumn('text', 'string', [ + 'default' => '', + 'limit' => 255, + 'null' => false, + ]) + ->addColumn('date_add', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('date_changed', 'datetime', [ + 'default' => 'CURRENT_TIMESTAMP', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('date_transaction_add', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('transaction_text', 'text', [ + 'default' => null, + 'limit' => 16777215, + 'null' => true, + ]) + ->addColumn('invoice_id', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('status', 'tinyinteger', [ + 'default' => '1', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('approval', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('approval_comment', 'text', [ + 'default' => null, + 'limit' => 16777215, + 'null' => true, + ]) + ->addColumn('changed_by', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('created_by', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->create(); + + $this->table('fcs_pickup_days') + ->addColumn('id', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id']) + ->addColumn('customer_id', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('pickup_day', 'date', [ + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addColumn('comment', 'text', [ + 'default' => null, + 'limit' => 16777215, + 'null' => true, + ]) + ->addColumn('products_picked_up', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addIndex( + [ + 'customer_id', + ] + ) + ->addIndex( + [ + 'pickup_day', + ] + ) + ->create(); + + $this->table('fcs_product') + ->addColumn('id_product', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_product']) + ->addColumn('id_manufacturer', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('id_tax', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('id_storage_location', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('price', 'decimal', [ + 'default' => '0.000000', + 'null' => false, + 'precision' => 20, + 'scale' => 6, + ]) + ->addColumn('name', 'text', [ + 'default' => null, + 'limit' => 16777215, + 'null' => false, + ]) + ->addColumn('description', 'text', [ + 'default' => null, + 'limit' => 4294967295, + 'null' => true, + ]) + ->addColumn('description_short', 'text', [ + 'default' => null, + 'limit' => 16777215, + 'null' => true, + ]) + ->addColumn('unity', 'string', [ + 'default' => null, + 'limit' => 255, + 'null' => true, + ]) + ->addColumn('is_declaration_ok', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('is_stock_product', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('active', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('delivery_rhythm_type', 'string', [ + 'default' => 'week', + 'limit' => 10, + 'null' => false, + ]) + ->addColumn('delivery_rhythm_count', 'tinyinteger', [ + 'default' => '1', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('delivery_rhythm_first_delivery_day', 'date', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('delivery_rhythm_order_possible_until', 'date', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('delivery_rhythm_send_order_list_weekday', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('delivery_rhythm_send_order_list_day', 'date', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('created', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('modified', 'datetime', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addIndex( + [ + 'id_manufacturer', + 'id_product', + ] + ) + ->addIndex( + [ + 'id_manufacturer', + ] + ) + ->addIndex( + [ + 'is_stock_product', + ] + ) + ->create(); + + $this->table('fcs_product_attribute') + ->addColumn('id_product_attribute', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_product_attribute']) + ->addColumn('id_product', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('price', 'decimal', [ + 'default' => '0.000000', + 'null' => false, + 'precision' => 20, + 'scale' => 6, + ]) + ->addColumn('default_on', 'tinyinteger', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addIndex( + [ + 'id_product', + ] + ) + ->addIndex( + [ + 'id_product_attribute', + 'id_product', + ] + ) + ->create(); + + $this->table('fcs_product_attribute_combination') + ->addColumn('id_attribute', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('id_product_attribute', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_attribute', 'id_product_attribute']) + ->addIndex( + [ + 'id_product_attribute', + ] + ) + ->create(); + + $this->table('fcs_purchase_prices') + ->addColumn('id', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id']) + ->addColumn('product_id', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('product_attribute_id', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('tax_id', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('price', 'decimal', [ + 'default' => null, + 'null' => true, + 'precision' => 20, + 'scale' => 6, + ]) + ->addIndex( + [ + 'product_id', + 'product_attribute_id', + ] + ) + ->create(); + + $this->table('fcs_sliders') + ->addColumn('id_slider', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_slider']) + ->addColumn('image', 'string', [ + 'default' => null, + 'limit' => 255, + 'null' => true, + ]) + ->addColumn('link', 'string', [ + 'default' => null, + 'limit' => 999, + 'null' => true, + ]) + ->addColumn('is_private', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('position', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('active', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + ]) + ->create(); + + $this->table('fcs_stock_available') + ->addColumn('id_stock_available', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_stock_available']) + ->addColumn('id_product', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('id_product_attribute', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('quantity', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('quantity_limit', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('sold_out_limit', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + ]) + ->addColumn('always_available', 'tinyinteger', [ + 'default' => '1', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('default_quantity_after_sending_order_lists', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addIndex( + [ + 'id_product', + 'id_product_attribute', + ], + ['unique' => true] + ) + ->addIndex( + [ + 'id_product', + ] + ) + ->addIndex( + [ + 'id_product_attribute', + ] + ) + ->create(); + + $this->table('fcs_storage_locations') + ->addColumn('id', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addPrimaryKey(['id']) + ->addColumn('name', 'string', [ + 'default' => null, + 'limit' => 50, + 'null' => true, + ]) + ->addColumn('rank', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->create(); + + $this->table('fcs_sync_domains') + ->addColumn('id', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addPrimaryKey(['id']) + ->addColumn('domain', 'string', [ + 'default' => '', + 'limit' => 128, + 'null' => false, + ]) + ->addColumn('active', 'tinyinteger', [ + 'default' => '1', + 'limit' => null, + 'null' => false, + ]) + ->create(); + + $this->table('fcs_sync_products') + ->addColumn('id', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addPrimaryKey(['id']) + ->addColumn('sync_domain_id', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('local_product_id', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('remote_product_id', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('local_product_attribute_id', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('remote_product_attribute_id', 'integer', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->create(); + + $this->table('fcs_tax') + ->addColumn('id_tax', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addPrimaryKey(['id_tax']) + ->addColumn('rate', 'decimal', [ + 'default' => '0.000', + 'null' => false, + 'precision' => 10, + 'scale' => 3, + ]) + ->addColumn('active', 'tinyinteger', [ + 'default' => '1', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->addColumn('deleted', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + 'signed' => false, + ]) + ->create(); + + $this->table('fcs_units') + ->addColumn('id', 'integer', [ + 'autoIncrement' => true, + 'default' => null, + 'limit' => null, + 'null' => false, + ]) + ->addPrimaryKey(['id']) + ->addColumn('id_product', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('id_product_attribute', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('price_incl_per_unit', 'decimal', [ + 'default' => null, + 'null' => true, + 'precision' => 10, + 'scale' => 2, + 'signed' => false, + ]) + ->addColumn('purchase_price_incl_per_unit', 'decimal', [ + 'default' => null, + 'null' => true, + 'precision' => 10, + 'scale' => 2, + 'signed' => false, + ]) + ->addColumn('name', 'string', [ + 'default' => '', + 'limit' => 50, + 'null' => false, + ]) + ->addColumn('amount', 'integer', [ + 'default' => null, + 'limit' => null, + 'null' => true, + 'signed' => false, + ]) + ->addColumn('price_per_unit_enabled', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => false, + ]) + ->addColumn('quantity_in_units', 'decimal', [ + 'default' => null, + 'null' => true, + 'precision' => 10, + 'scale' => 3, + 'signed' => false, + ]) + ->addIndex( + [ + 'id_product', + 'id_product_attribute', + ], + ['unique' => true] + ) + ->create(); + } + + /** + * Down Method. + * + * More information on this method is available here: + * https://book.cakephp.org/phinx/0/en/migrations.html#the-down-method + * @return void + */ + public function down() + { + $this->table('fcs_action_logs')->drop()->save(); + $this->table('fcs_address')->drop()->save(); + $this->table('fcs_attribute')->drop()->save(); + $this->table('fcs_barcodes')->drop()->save(); + $this->table('fcs_blog_posts')->drop()->save(); + $this->table('fcs_cart_product_units')->drop()->save(); + $this->table('fcs_cart_products')->drop()->save(); + $this->table('fcs_carts')->drop()->save(); + $this->table('fcs_category')->drop()->save(); + $this->table('fcs_category_product')->drop()->save(); + $this->table('fcs_configuration')->drop()->save(); + $this->table('fcs_cronjob_logs')->drop()->save(); + $this->table('fcs_cronjobs')->drop()->save(); + $this->table('fcs_customer')->drop()->save(); + $this->table('fcs_deposits')->drop()->save(); + $this->table('fcs_feedbacks')->drop()->save(); + $this->table('fcs_images')->drop()->save(); + $this->table('fcs_invoice_taxes')->drop()->save(); + $this->table('fcs_invoices')->drop()->save(); + $this->table('fcs_manufacturer')->drop()->save(); + $this->table('fcs_order_detail')->drop()->save(); + $this->table('fcs_order_detail_feedbacks')->drop()->save(); + $this->table('fcs_order_detail_purchase_prices')->drop()->save(); + $this->table('fcs_order_detail_units')->drop()->save(); + $this->table('fcs_pages')->drop()->save(); + $this->table('fcs_payments')->drop()->save(); + $this->table('fcs_pickup_days')->drop()->save(); + $this->table('fcs_product')->drop()->save(); + $this->table('fcs_product_attribute')->drop()->save(); + $this->table('fcs_product_attribute_combination')->drop()->save(); + $this->table('fcs_purchase_prices')->drop()->save(); + $this->table('fcs_sliders')->drop()->save(); + $this->table('fcs_stock_available')->drop()->save(); + $this->table('fcs_storage_locations')->drop()->save(); + $this->table('fcs_sync_domains')->drop()->save(); + $this->table('fcs_sync_products')->drop()->save(); + $this->table('fcs_tax')->drop()->save(); + $this->table('fcs_units')->drop()->save(); + } +} diff --git a/config/Migrations/20220525092822_BiggerQueuedJobDataField.php b/config/Migrations/20220928064125_AlterDataOnQueuedJobsToMediumtext.php similarity index 57% rename from config/Migrations/20220525092822_BiggerQueuedJobDataField.php rename to config/Migrations/20220928064125_AlterDataOnQueuedJobsToMediumtext.php index 598ea6a4f6..a4c35ce920 100644 --- a/config/Migrations/20220525092822_BiggerQueuedJobDataField.php +++ b/config/Migrations/20220928064125_AlterDataOnQueuedJobsToMediumtext.php @@ -3,7 +3,7 @@ use Migrations\AbstractMigration; -class BiggerQueuedJobDataField extends AbstractMigration +class AlterDataOnQueuedJobsToMediumtext extends AbstractMigration { /** * Change Method. @@ -14,6 +14,10 @@ class BiggerQueuedJobDataField extends AbstractMigration */ public function change() { - $this->execute("ALTER TABLE `queued_jobs` CHANGE `data` `data` MEDIUMTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL;"); + $table = $this->table('queued_jobs'); + $table->changeColumn('data', 'text', [ + 'limit' => 16777215, + ]); + $table->update(); } } diff --git a/config/Migrations/schema-dump-default.lock b/config/Migrations/schema-dump-default.lock index bda2420c4cf096a39ed7654391e542fc5b402458..16b495610732ff493e4407ccfbd76c96bf4234c5 100644 GIT binary patch delta 453 zcmeDF&${y;>jpE?$(z%KHv5XM;-0)g&~Zu#v4sn6k^na$r>Zc7=vWYH$V3JVZ;hFH8pqAJ8__i%9B;<6uHbn0*RS9 zDEj;Aj3@v1W1lQ=-4tXX*Ji$Ye+i&FH@8pM_nS09bMyVDFYTuqG>a2WxW0<<4huy4bf9((###W66PhUi delta 553 zcmdn_kG1jpDXE;B2o#FUhx)Z*gJ)}q_Fr^i<_x=ub&DYn^HF`Nm+mu z98Z(UuRYfB8yW&FNiNAOO9e}U^q5cf^%9)?%2QFm& zlP`F3P8PW?xcNz)y#&mMs+&WmYxu!47?osr<%3Zvt(E>WH7LXd$-!f)1k>57^l4YL<+q z{L{U47&lJ;z|F`teXTB|(d7M+V$%~m87qW=AqUe~T$ls&V{-Q7M0=6x{soNEV2jUZ zFz(-e$BS_nBgi=S?RR|`e}S3c2%7wE0sHi5e@4FTV*ZRKO6 'aa']); -// foodcoopshop -mb_internal_encoding('UTF-8'); - -FactoryLocator::get('Table')->get('Configurations')->loadConfigurations(); -if (in_array(Configure::read('appDb.FCS_DEFAULT_LOCALE'), Configure::read('app.implementedLocales'))) { - ini_set('intl.default_locale', Configure::read('appDb.FCS_DEFAULT_LOCALE')); - locale_set_default(Configure::read('appDb.FCS_DEFAULT_LOCALE')); - I18n::setLocale(Configure::read('appDb.FCS_DEFAULT_LOCALE')); - Configure::load('Locale' . DS . Configure::read('appDb.FCS_DEFAULT_LOCALE') . DS . 'date', 'default'); - setlocale(LC_CTYPE, Configure::read('appDb.FCS_DEFAULT_LOCALE').'.UTF-8'); - setlocale(LC_COLLATE, Configure::read('appDb.FCS_DEFAULT_LOCALE').'.UTF-8'); -} - // Number::config(Configure::read('appDb.FCS_DEFAULT_LOCALE'), NumberFormatter::DECIMAL); // TypeFactory::build('decimal')->useLocaleParser(); -// gettext not available in app_config -Configure::load('localized_config', 'default'); - -if (file_exists(CONFIG.DS.'localized_custom_config.php')) { - Configure::load('localized_custom_config', 'default'); -} - diff --git a/src/Application.php b/src/Application.php index 8af52ae343..cbf2cbba5e 100644 --- a/src/Application.php +++ b/src/Application.php @@ -18,9 +18,11 @@ use Cake\Core\Configure; use Cake\Core\Exception\MissingPluginException; +use Cake\Datasource\FactoryLocator; use Cake\Error\Middleware\ErrorHandlerMiddleware; use Cake\Http\BaseApplication; use Cake\Http\MiddlewareQueue; +use Cake\I18n\I18n; use Cake\Routing\Middleware\AssetMiddleware; use Cake\Routing\Middleware\RoutingMiddleware; @@ -43,6 +45,7 @@ public function bootstrap(): void // Call parent to load bootstrap from files. parent::bootstrap(); if (Configure::read('debug')) { + $this->addPlugin('Bake'); $this->addPlugin('DebugKit', ['bootstrap' => true]); } @@ -63,7 +66,26 @@ public function bootstrap(): void ]); } - // Load more plugins here + mb_internal_encoding('UTF-8'); + try { + FactoryLocator::get('Table')->get('Configurations')->loadConfigurations(); + if (in_array(Configure::read('appDb.FCS_DEFAULT_LOCALE'), Configure::read('app.implementedLocales'))) { + ini_set('intl.default_locale', Configure::read('appDb.FCS_DEFAULT_LOCALE')); + locale_set_default(Configure::read('appDb.FCS_DEFAULT_LOCALE')); + I18n::setLocale(Configure::read('appDb.FCS_DEFAULT_LOCALE')); + Configure::load('Locale' . DS . Configure::read('appDb.FCS_DEFAULT_LOCALE') . DS . 'date', 'default'); + setlocale(LC_CTYPE, Configure::read('appDb.FCS_DEFAULT_LOCALE').'.UTF-8'); + setlocale(LC_COLLATE, Configure::read('appDb.FCS_DEFAULT_LOCALE').'.UTF-8'); + } + } catch (\Exception $e) {} + + // gettext not available in app_config + Configure::load('localized_config', 'default'); + + if (file_exists(CONFIG.DS.'localized_custom_config.php')) { + Configure::load('localized_custom_config', 'default'); + } + } /** diff --git a/tests/bootstrap.php b/tests/bootstrap.php index c60e71d47c..8101a24354 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -7,11 +7,18 @@ */ use Cake\Core\Configure; use Cake\Utility\Security; +use Migrations\TestSuite\Migrator; require dirname(__DIR__) . '/vendor/autoload.php'; require dirname(__DIR__) . '/config/bootstrap.php'; +$migrator = new Migrator(); +$migrator->runMany([ + ['plugin' => 'Queue'], + [], +]); + Security::setSalt(Configure::read('Security.salt_for_unit_tests')); // always set to app.customerMainNamePart to firstname for unit tests even if different in custom_config.php From 694d7e5f4d90746eebb5d921d1e7e77efbb8993e Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 28 Sep 2022 09:53:17 +0200 Subject: [PATCH 110/646] do not use mysqldump any more (#883) * do not use mysqldump any more * cleanup * bzip2 * export keys * Revert "export keys" This reverts commit 486f1c0ac0c2717b308c5383570259566dc13ab0. * enable utf8mb4 --- README.md | 3 +- composer.json | 3 +- composer.lock | 61 ++++++++++++++++++++++++++++++- config/app_config.php | 6 --- src/Shell/BackupDatabaseShell.php | 46 ++++++++--------------- 5 files changed, 79 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index f4938ace9b..a452ff95c6 100644 --- a/README.md +++ b/README.md @@ -57,12 +57,11 @@ * Apache with `mod_rewrite` * PHP >= 8.1 * PHP intl extension INTL_ICU_VERSION >= 50.1 -* PHP ZipArchive class +* PHP bzip2 lib (for automatic database backups) * MySQL >= 8.0 * Node.js and npm >= v7 ([installation](https://www.npmjs.com/get-npm)) developer packages * Composer v2 ([installation](https://getcomposer.org/download/)) developer packages * Basic understanding of Apache Webserver, MySQL Database and Linux Server administration -* PHP needs to be able to call mysqldump with exec() for database backups ## ❗ Legal information Before installing don't forget to read the legal information in [German](https://foodcoopshop.github.io/de/rechtliches) or [English](https://foodcoopshop.github.io/en/legal-information). diff --git a/composer.json b/composer.json index 496a145706..b6746d400c 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,8 @@ "dereuromark/cakephp-queue": "^6.0", "tecnickcom/tcpdf": "^6.4", "hisorange/browser-detect": "^4.4", - "phpoffice/phpspreadsheet": "1.*" + "phpoffice/phpspreadsheet": "1.*", + "ifsnop/mysqldump-php": "^2.9" }, "require-dev": { "psy/psysh": "@stable", diff --git a/composer.lock b/composer.lock index b3e6c79418..18c19cb3aa 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0319c8fa46a664469640bfdf9bd5f376", + "content-hash": "da13f80569f1786698f874787bfcbdb5", "packages": [ { "name": "cakephp/cakephp", @@ -729,6 +729,65 @@ }, "time": "2022-07-12T10:31:47+00:00" }, + { + "name": "ifsnop/mysqldump-php", + "version": "v2.9", + "source": { + "type": "git", + "url": "https://github.com/ifsnop/mysqldump-php.git", + "reference": "fc9c119fe5d70af9a685cad6a8ac612fd7589e25" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ifsnop/mysqldump-php/zipball/fc9c119fe5d70af9a685cad6a8ac612fd7589e25", + "reference": "fc9c119fe5d70af9a685cad6a8ac612fd7589e25", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "4.8.36", + "squizlabs/php_codesniffer": "1.*" + }, + "type": "library", + "autoload": { + "psr-4": { + "Ifsnop\\": "src/Ifsnop/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-3.0-or-later" + ], + "authors": [ + { + "name": "Diego Torres", + "homepage": "https://github.com/ifsnop", + "role": "Developer" + } + ], + "description": "PHP version of mysqldump cli that comes with MySQL", + "homepage": "https://github.com/ifsnop/mysqldump-php", + "keywords": [ + "PHP7", + "database", + "hhvm", + "mariadb", + "mysql", + "mysql-backup", + "mysqldump", + "pdo", + "php", + "php5", + "sql" + ], + "support": { + "issues": "https://github.com/ifsnop/mysqldump-php/issues", + "source": "https://github.com/ifsnop/mysqldump-php/tree/master" + }, + "time": "2020-04-03T14:40:40+00:00" + }, { "name": "intervention/image", "version": "2.7.2", diff --git a/config/app_config.php b/config/app_config.php index 8df912008c..35f943d410 100644 --- a/config/app_config.php +++ b/config/app_config.php @@ -147,12 +147,6 @@ 'countryId' => 2, // austria: 2, germany: 1 - /** - * if you work on windows, change to e.g - * '"C:\\Programme\\xampp\\mysql\\bin\\mysqldump.exe"' - */ - 'mysqlDumpCommand' => 'mysqldump', - /** * date of the last update of terms of use */ diff --git a/src/Shell/BackupDatabaseShell.php b/src/Shell/BackupDatabaseShell.php index 23299ae43c..89f0a4b362 100644 --- a/src/Shell/BackupDatabaseShell.php +++ b/src/Shell/BackupDatabaseShell.php @@ -18,8 +18,8 @@ use Cake\Mailer\Mailer; use Cake\Core\Configure; use Cake\Datasource\ConnectionManager; -use Cake\Filesystem\File; use Cake\I18n\Number; +use Ifsnop\Mysqldump as IMysqldump; class BackupDatabaseShell extends AppShell { @@ -38,7 +38,7 @@ public function main() $dbConfig = ConnectionManager::getConfig('default'); $backupdir = ROOT . DS . 'files_private' . DS . 'db-backups'; - $filename = 'db-backup-' . date('Y-m-d_H-i-s', time()) . '.sql'; + $filename = $backupdir . DS . 'db-backup-' . date('Y-m-d_H-i-s', time()) . '.bz2'; if (! is_dir($backupdir)) { $this->out(' ', 1); @@ -48,36 +48,23 @@ public function main() } } - $configFile = TMP . 'mysql.txt'; - $configFileObject = new File($configFile); - $configFileContent = '[mysqldump] -host=%host% -user=%user% -password="%password%" -'; - $configFileContent = str_replace(['%host%', '%user%', '%password%'], [$dbConfig['host'], $dbConfig['username'], $dbConfig['password']], $configFileContent); + $dsnString = "mysql:host=". $dbConfig['host'].";dbname=".$dbConfig['database']; if (isset($dbConfig['port'])) { - $configFileContent .= 'port=' . $dbConfig['port']; + $dsnString .= ";port=".$dbConfig['port']; } - $configFileObject->write($configFileContent); + $settings = [ + 'default-character-set' => IMysqldump\Mysqldump::UTF8MB4, + 'add-drop-table' => true, + 'compress' => IMysqldump\Mysqldump::BZIP2, + 'exclude-tables' => [ + $dbConfig['database'] . '.queued_jobs', + ], + ]; + $dump = new IMysqldump\Mysqldump($dsnString, $dbConfig['username'], $dbConfig['password'], $settings); + $dump->start($filename); - $cmdString = Configure::read('app.mysqlDumpCommand'); - $cmdString .= " --defaults-file=" . $configFile . " --allow-keywords --add-drop-table --ignore-table=" . $dbConfig['database'] . ".queued_jobs --complete-insert --no-tablespaces --quote-names " . $dbConfig['database'] . " > " . $backupdir . DS . $filename; - exec($cmdString); - - $configFileObject->delete(); - - // START zip and file sql file - $zip = new \ZipArchive(); - $zipFilename = str_replace('.sql', '.zip', $backupdir . DS . $filename); - $zip->open($zipFilename, \ZipArchive::CREATE); - $zip->addFile($backupdir . DS . $filename, $filename); // 2nd param for no folders in zip file - $zip->close(); - unlink($backupdir . DS . $filename); - // END zip and delete sql file - - $message = __('Database_backup_successful') . ' ('.Number::toReadableSize(filesize($zipFilename)).').'; + $message = __('Database_backup_successful') . ' ('.Number::toReadableSize(filesize($filename)).').'; // email zipped file via Mailer (to avoid queue's max 16MB mediumtext limit of AppMailer) $email = new Mailer(false); @@ -85,10 +72,9 @@ public function main() $email->setTo(Configure::read('app.hostingEmail')) ->setSubject($message . ': ' . Configure::read('app.cakeServerName')) ->setAttachments([ - $zipFilename + $filename ]) ->send(); - $this->out($message); $this->stopTimeLogging(); From 61f7fc3c02a74fdecbdae12e49e870a9cded03a8 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 28 Sep 2022 10:31:59 +0200 Subject: [PATCH 111/646] correctly exclude table --- src/Shell/BackupDatabaseShell.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shell/BackupDatabaseShell.php b/src/Shell/BackupDatabaseShell.php index 89f0a4b362..e7d916d2b0 100644 --- a/src/Shell/BackupDatabaseShell.php +++ b/src/Shell/BackupDatabaseShell.php @@ -58,7 +58,7 @@ public function main() 'add-drop-table' => true, 'compress' => IMysqldump\Mysqldump::BZIP2, 'exclude-tables' => [ - $dbConfig['database'] . '.queued_jobs', + 'queued_jobs', ], ]; $dump = new IMysqldump\Mysqldump($dsnString, $dbConfig['username'], $dbConfig['password'], $settings); From d77c92c2f76dad1fff8bd49b853a5aa2c20efc94 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 28 Sep 2022 11:03:03 +0200 Subject: [PATCH 112/646] script can now be called from anywhere --- devtools/npm-post-install.sh | 40 ++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/devtools/npm-post-install.sh b/devtools/npm-post-install.sh index 0b76af213b..b10c471943 100644 --- a/devtools/npm-post-install.sh +++ b/devtools/npm-post-install.sh @@ -1,22 +1,26 @@ #!/usr/bin/env bash -rm -Rf ../webroot/node_modules/jquery-backstretch/examples -rm -Rf ../webroot/node_modules/jquery-backstretch/test -rm -Rf ../webroot/node_modules/@fortawesome/fontawesome-free/js -rm -Rf ../webroot/node_modules/@fortawesome/fontawesome-free/metadata -rm -Rf ../webroot/node_modules/@fortawesome/fontawesome-free/svgs -rm ../webroot/node_modules/@fortawesome/fontawesome-free/css/all.min.css -rm ../webroot/node_modules/@fortawesome/fontawesome-free/css/fontawesome.css -rm ../webroot/node_modules/@fortawesome/fontawesome-free/css/fontawesome.min.css -rm ../webroot/node_modules/@fortawesome/fontawesome-free/css/v4-shims.css -rm ../webroot/node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css -rm -Rf ../webroot/node_modules/jquery-ui/external -rm -Rf ../webroot/node_modules/tooltipster/demo -rm -Rf ../webroot/node_modules/tooltipster/doc -rm -Rf ../webroot/node_modules/chart.js/dist/docs +# allows script to be called from /webroot and root directory +SCRIPT=$(readlink -f "$0") +APP=$(dirname "$SCRIPT")/.. -cp -R ../webroot/node_modules/@fortawesome/fontawesome-free/webfonts ../webroot -cp -R ../webroot/node_modules/jquery-ui/dist/themes/smoothness/images ../webroot/cache +rm -Rf $APP/webroot/node_modules/jquery-backstretch/examples +rm -Rf $APP/webroot/node_modules/jquery-backstretch/test +rm -Rf $APP/webroot/node_modules/@fortawesome/fontawesome-free/js +rm -Rf $APP/webroot/node_modules/@fortawesome/fontawesome-free/metadata +rm -Rf $APP/webroot/node_modules/@fortawesome/fontawesome-free/svgs +rm $APP/webroot/node_modules/@fortawesome/fontawesome-free/css/all.min.css 2> /dev/null +rm $APP/webroot/node_modules/@fortawesome/fontawesome-free/css/fontawesome.css 2> /dev/null +rm $APP/webroot/node_modules/@fortawesome/fontawesome-free/css/fontawesome.min.css 2> /dev/null +rm $APP/webroot/node_modules/@fortawesome/fontawesome-free/css/v4-shims.css 2> /dev/null +rm $APP/webroot/node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css 2> /dev/null +rm -Rf $APP/webroot/node_modules/jquery-ui/external +rm -Rf $APP/webroot/node_modules/tooltipster/demo +rm -Rf $APP/webroot/node_modules/tooltipster/doc +rm -Rf $APP/webroot/node_modules/chart.js/dist/docs -cp ../config/elfinder/elfinder.html ../webroot/js/elfinder/elfinder.html -cp ../config/elfinder/php/connector.minimal.php ../webroot/js/elfinder/php/connector.minimal.php +cp -R $APP/webroot/node_modules/@fortawesome/fontawesome-free/webfonts $APP/webroot +cp -R $APP/webroot/node_modules/jquery-ui/dist/themes/smoothness/images $APP/webroot + +cp $APP/config/elfinder/elfinder.html $APP/webroot/js/elfinder/elfinder.html +cp $APP/config/elfinder/php/connector.minimal.php $APP/webroot/js/elfinder/php/connector.minimal.php From 3934d30ca9bfb589493fc47bb5470cb01372a2bd Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 28 Sep 2022 11:05:29 +0200 Subject: [PATCH 113/646] fix --- devtools/npm-post-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/npm-post-install.sh b/devtools/npm-post-install.sh index b10c471943..531cb806a3 100644 --- a/devtools/npm-post-install.sh +++ b/devtools/npm-post-install.sh @@ -20,7 +20,7 @@ rm -Rf $APP/webroot/node_modules/tooltipster/doc rm -Rf $APP/webroot/node_modules/chart.js/dist/docs cp -R $APP/webroot/node_modules/@fortawesome/fontawesome-free/webfonts $APP/webroot -cp -R $APP/webroot/node_modules/jquery-ui/dist/themes/smoothness/images $APP/webroot +cp -R $APP/webroot/node_modules/jquery-ui/dist/themes/smoothness/images $APP/webroot/cache cp $APP/config/elfinder/elfinder.html $APP/webroot/js/elfinder/elfinder.html cp $APP/config/elfinder/php/connector.minimal.php $APP/webroot/js/elfinder/php/connector.minimal.php From 9a22f44c41e246e7aaeb093822c4bff8019900f8 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 28 Sep 2022 12:08:12 +0200 Subject: [PATCH 114/646] revert --- src/Model/Table/InvoicesTable.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/Model/Table/InvoicesTable.php b/src/Model/Table/InvoicesTable.php index cf7131a184..2f96af62d2 100644 --- a/src/Model/Table/InvoicesTable.php +++ b/src/Model/Table/InvoicesTable.php @@ -116,13 +116,6 @@ public function getPreparedTaxRatesForSumTable($invoices) $taxRatesSums[$trt]['sum_price_incl'] += $invoiceTax->total_price_tax_incl; } - $taxRates[$trt][$taxRate]['sum_price_excl'] = number_format($taxRates[$trt][$taxRate]['sum_price_excl'], 2); - $taxRates[$trt][$taxRate]['sum_tax'] = number_format($taxRates[$trt][$taxRate]['sum_tax'], 2); - $taxRates[$trt][$taxRate]['sum_price_incl'] = number_format($taxRates[$trt][$taxRate]['sum_price_incl'], 2); - $taxRatesSums[$trt]['sum_price_excl'] = number_format($taxRatesSums[$trt]['sum_price_excl'], 2); - $taxRatesSums[$trt]['sum_tax'] = number_format($taxRatesSums[$trt]['sum_tax'], 2); - $taxRatesSums[$trt]['sum_price_incl'] = number_format($taxRatesSums[$trt]['sum_price_incl'], 2); - } } From 06192c881c9d9a8dd6097e5bb723c6c44dbdc1c7 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 28 Sep 2022 14:20:45 +0200 Subject: [PATCH 115/646] fixes rounding problems in unit test --- src/Model/Table/InvoicesTable.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Model/Table/InvoicesTable.php b/src/Model/Table/InvoicesTable.php index 2f96af62d2..8aba2b17ac 100644 --- a/src/Model/Table/InvoicesTable.php +++ b/src/Model/Table/InvoicesTable.php @@ -116,6 +116,13 @@ public function getPreparedTaxRatesForSumTable($invoices) $taxRatesSums[$trt]['sum_price_incl'] += $invoiceTax->total_price_tax_incl; } + $taxRates[$trt][$taxRate]['sum_price_excl'] = round($taxRates[$trt][$taxRate]['sum_price_excl'], 2); + $taxRates[$trt][$taxRate]['sum_tax'] = round($taxRates[$trt][$taxRate]['sum_tax'], 2); + $taxRates[$trt][$taxRate]['sum_price_incl'] = round($taxRates[$trt][$taxRate]['sum_price_incl'], 2); + $taxRatesSums[$trt]['sum_price_excl'] = round($taxRatesSums[$trt]['sum_price_excl'], 2); + $taxRatesSums[$trt]['sum_tax'] = round($taxRatesSums[$trt]['sum_tax'], 2); + $taxRatesSums[$trt]['sum_price_incl'] = round($taxRatesSums[$trt]['sum_price_incl'], 2); + } } From 412b34968c764e53324066130f0a905b80f28052 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 28 Sep 2022 14:30:27 +0200 Subject: [PATCH 116/646] fix rounding error --- tests/TestCase/Traits/PrepareAndTestInvoiceDataTrait.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/TestCase/Traits/PrepareAndTestInvoiceDataTrait.php b/tests/TestCase/Traits/PrepareAndTestInvoiceDataTrait.php index 0175b051dd..ee66a73e43 100644 --- a/tests/TestCase/Traits/PrepareAndTestInvoiceDataTrait.php +++ b/tests/TestCase/Traits/PrepareAndTestInvoiceDataTrait.php @@ -51,9 +51,9 @@ public function prepareOrdersAndPaymentsForInvoice($customerId) public function doAssertInvoiceTaxes($data, $taxRate, $excl, $tax, $incl) { $this->assertEquals($data->tax_rate, $taxRate); - $this->assertEquals($data->total_price_tax_excl, $excl); - $this->assertEquals($data->total_price_tax, $tax); - $this->assertEquals($data->total_price_tax_incl, $incl); + $this->assertEquals(round($data->total_price_tax_excl, 2), $excl); + $this->assertEquals(round($data->total_price_tax, 2), $tax); + $this->assertEquals(round($data->total_price_tax_incl, 2), $incl); } public function getAndAssertOrderDetailsAfterCancellation($orderDetailIds) From 2d7daa583b4ca6713225211da17be8f8463707a4 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 28 Sep 2022 16:23:58 +0200 Subject: [PATCH 117/646] create structure and data of test database when running the first test --- config/Seeds/tests/InitTestDataSeed.php | 26 +++++++++++++++++ config/bootstrap.php | 2 -- config/bootstrap_locale.php | 38 +++++++++++++++++++++++++ devtools/init-dev-setup.sh | 1 + docker-compose.yml | 3 -- src/Application.php | 23 ++------------- tests/TestCase/AppCakeTestCase.php | 23 +++++++++------ tests/bootstrap.php | 9 ++++++ 8 files changed, 90 insertions(+), 35 deletions(-) create mode 100644 config/Seeds/tests/InitTestDataSeed.php create mode 100644 config/bootstrap_locale.php diff --git a/config/Seeds/tests/InitTestDataSeed.php b/config/Seeds/tests/InitTestDataSeed.php new file mode 100644 index 0000000000..7407d8e553 --- /dev/null +++ b/config/Seeds/tests/InitTestDataSeed.php @@ -0,0 +1,26 @@ +execute($query); + } +} diff --git a/config/bootstrap.php b/config/bootstrap.php index a5b94badfb..c0702305f1 100644 --- a/config/bootstrap.php +++ b/config/bootstrap.php @@ -35,11 +35,9 @@ use Cake\Core\Configure; use Cake\Core\Configure\Engine\PhpConfig; use Cake\Datasource\ConnectionManager; -use Cake\Datasource\FactoryLocator; use Cake\Error\ErrorTrap; use Cake\Error\ExceptionTrap; use Cake\Http\ServerRequest; -use Cake\I18n\I18n; use Cake\Log\Log; use Cake\Mailer\Mailer; use Cake\Mailer\TransportFactory; diff --git a/config/bootstrap_locale.php b/config/bootstrap_locale.php new file mode 100644 index 0000000000..c90977971b --- /dev/null +++ b/config/bootstrap_locale.php @@ -0,0 +1,38 @@ + + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ + +use Cake\Core\Configure; +use Cake\Datasource\FactoryLocator; +use Cake\I18n\I18n; + +mb_internal_encoding('UTF-8'); +FactoryLocator::get('Table')->get('Configurations')->loadConfigurations(); +if (in_array(Configure::read('appDb.FCS_DEFAULT_LOCALE'), Configure::read('app.implementedLocales'))) { + ini_set('intl.default_locale', Configure::read('appDb.FCS_DEFAULT_LOCALE')); + locale_set_default(Configure::read('appDb.FCS_DEFAULT_LOCALE')); + I18n::setLocale(Configure::read('appDb.FCS_DEFAULT_LOCALE')); + Configure::load('Locale' . DS . Configure::read('appDb.FCS_DEFAULT_LOCALE') . DS . 'date', 'default'); + setlocale(LC_CTYPE, Configure::read('appDb.FCS_DEFAULT_LOCALE').'.UTF-8'); + setlocale(LC_COLLATE, Configure::read('appDb.FCS_DEFAULT_LOCALE').'.UTF-8'); +} + +// gettext not available in app_config +Configure::load('localized_config', 'default'); + +if (file_exists(CONFIG.DS.'localized_custom_config.php')) { + Configure::load('localized_custom_config', 'default'); +} + +?> \ No newline at end of file diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index f433fb9690..c90a9fa921 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -6,3 +6,4 @@ CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install bash ./devtools/setup-dev/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh docker compose run -w /var/www/html/webroot --rm node npm install +CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate diff --git a/docker-compose.yml b/docker-compose.yml index 1b1a2b0304..e5eaf1235b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,9 +52,6 @@ services: MYSQL_DATABASE: foodcoopshop-test MYSQL_ALLOW_EMPTY_PASSWORD: true MYSQL_TCP_PORT: 3311 - volumes: - - ./config/sql/_installation/clean-db-structure.sql:/docker-entrypoint-initdb.d/1.sql - - ./tests/config/sql/test-db-data.sql:/docker-entrypoint-initdb.d/2.sql networks: - fcs diff --git a/src/Application.php b/src/Application.php index cbf2cbba5e..0157249978 100644 --- a/src/Application.php +++ b/src/Application.php @@ -18,11 +18,9 @@ use Cake\Core\Configure; use Cake\Core\Exception\MissingPluginException; -use Cake\Datasource\FactoryLocator; use Cake\Error\Middleware\ErrorHandlerMiddleware; use Cake\Http\BaseApplication; use Cake\Http\MiddlewareQueue; -use Cake\I18n\I18n; use Cake\Routing\Middleware\AssetMiddleware; use Cake\Routing\Middleware\RoutingMiddleware; @@ -44,6 +42,7 @@ public function bootstrap(): void { // Call parent to load bootstrap from files. parent::bootstrap(); + if (Configure::read('debug')) { $this->addPlugin('Bake'); $this->addPlugin('DebugKit', ['bootstrap' => true]); @@ -66,25 +65,7 @@ public function bootstrap(): void ]); } - mb_internal_encoding('UTF-8'); - try { - FactoryLocator::get('Table')->get('Configurations')->loadConfigurations(); - if (in_array(Configure::read('appDb.FCS_DEFAULT_LOCALE'), Configure::read('app.implementedLocales'))) { - ini_set('intl.default_locale', Configure::read('appDb.FCS_DEFAULT_LOCALE')); - locale_set_default(Configure::read('appDb.FCS_DEFAULT_LOCALE')); - I18n::setLocale(Configure::read('appDb.FCS_DEFAULT_LOCALE')); - Configure::load('Locale' . DS . Configure::read('appDb.FCS_DEFAULT_LOCALE') . DS . 'date', 'default'); - setlocale(LC_CTYPE, Configure::read('appDb.FCS_DEFAULT_LOCALE').'.UTF-8'); - setlocale(LC_COLLATE, Configure::read('appDb.FCS_DEFAULT_LOCALE').'.UTF-8'); - } - } catch (\Exception $e) {} - - // gettext not available in app_config - Configure::load('localized_config', 'default'); - - if (file_exists(CONFIG.DS.'localized_custom_config.php')) { - Configure::load('localized_custom_config', 'default'); - } + require_once $this->configDir . 'bootstrap_locale.php'; } diff --git a/tests/TestCase/AppCakeTestCase.php b/tests/TestCase/AppCakeTestCase.php index 23a2575ddf..8ed0512a73 100644 --- a/tests/TestCase/AppCakeTestCase.php +++ b/tests/TestCase/AppCakeTestCase.php @@ -12,10 +12,11 @@ use Cake\Filesystem\Folder; use Cake\Filesystem\File; use Cake\View\View; -use Network\View\Helper\NetworkHelper; use Cake\TestSuite\ConsoleIntegrationTestTrait; use Cake\TestSuite\TestCase; use Cake\TestSuite\TestEmailTransport; +use Migrations\Migrations; +use Network\View\Helper\NetworkHelper; require_once ROOT . DS . 'tests' . DS . 'config' . DS . 'test.config.php'; @@ -62,19 +63,21 @@ public function setUp(): void { parent::setUp(); + $this->dbConnection = ConnectionManager::get('test'); + $this->seedTestDatabase(); + $this->resetLogs(); + $this->Configuration = $this->getTableLocator()->get('Configurations'); + $this->Configuration->loadConfigurations(); + $View = new View(); $this->Slug = new SlugHelper($View); $this->Html = new MyHtmlHelper($View); $this->Time = new MyTimeHelper($View); $this->Network = new NetworkHelper($View); $this->PricePerUnit = new PricePerUnitHelper($View); - $this->Configuration = $this->getTableLocator()->get('Configurations'); $this->Customer = $this->getTableLocator()->get('Customers'); $this->Manufacturer = $this->getTableLocator()->get('Manufacturers'); - $this->resetTestDatabaseData(); - $this->resetLogs(); - $this->Configuration->loadConfigurations(); // enable security token only for IntegrationTests if (method_exists($this, 'enableSecurityToken')) { @@ -115,11 +118,13 @@ protected function assertLogFilesForErrors() $this->assertDoesNotMatchRegularExpression('/(Warning|Notice)/', $log); } - protected function resetTestDatabaseData() + protected function seedTestDatabase() { - $this->dbConnection = ConnectionManager::get('test'); - $this->testDumpDir = TESTS . 'config' . DS . 'sql' . DS; - $this->dbConnection->query(file_get_contents($this->testDumpDir . 'test-db-data.sql')); + $migrations = new Migrations(); + $migrations->seed([ + 'connection' => 'test', + 'source' => 'Seeds' . DS . 'tests', // needs to be a subfolder of config + ]); } protected function getJsonDecodedContent() diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 8101a24354..0ae1f6fda2 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -7,6 +7,7 @@ */ use Cake\Core\Configure; use Cake\Utility\Security; +use Migrations\Migrations; use Migrations\TestSuite\Migrator; require dirname(__DIR__) . '/vendor/autoload.php'; @@ -19,6 +20,14 @@ [], ]); +$migrations = new Migrations(); +$migrations->seed([ + 'connection' => 'test', + 'source' => 'Seeds' . DS . 'tests', // needs to be a subfolder of config +]); + +require dirname(__DIR__) . '/config/bootstrap_locale.php'; + Security::setSalt(Configure::read('Security.salt_for_unit_tests')); // always set to app.customerMainNamePart to firstname for unit tests even if different in custom_config.php From f95a8207560cfde0ce5c4b091890010d0ff04767 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 28 Sep 2022 16:32:27 +0200 Subject: [PATCH 118/646] seed --- devtools/init-dev-setup.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index c90a9fa921..d5fb782622 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -1,9 +1,8 @@ #!/usr/bin/env bash -CURRENT_UID=$(id -u):$(id -g) docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ./config/sql/_installation/clean-db-structure.sql -CURRENT_UID=$(id -u):$(id -g) docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ./tests/config/sql/test-db-data.sql CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install bash ./devtools/setup-dev/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh docker compose run -w /var/www/html/webroot --rm node npm install CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate +CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations seed --source Seeds/tests \ No newline at end of file From 1351fedf966a3a50065fe2d87b4d2e256961d159 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 28 Sep 2022 16:42:05 +0200 Subject: [PATCH 119/646] fixes --- config/bootstrap_locale.php | 5 ++++- devtools/init-dev-setup.sh | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config/bootstrap_locale.php b/config/bootstrap_locale.php index c90977971b..844f9ad893 100644 --- a/config/bootstrap_locale.php +++ b/config/bootstrap_locale.php @@ -18,7 +18,10 @@ use Cake\I18n\I18n; mb_internal_encoding('UTF-8'); -FactoryLocator::get('Table')->get('Configurations')->loadConfigurations(); +try { + // on fresh installations there is no configurations table yet when first migrations run + FactoryLocator::get('Table')->get('Configurations')->loadConfigurations(); +} catch(\Exception $e) {} if (in_array(Configure::read('appDb.FCS_DEFAULT_LOCALE'), Configure::read('app.implementedLocales'))) { ini_set('intl.default_locale', Configure::read('appDb.FCS_DEFAULT_LOCALE')); locale_set_default(Configure::read('appDb.FCS_DEFAULT_LOCALE')); diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index d5fb782622..d870ad84e6 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -3,6 +3,7 @@ CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install bash ./devtools/setup-dev/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh -docker compose run -w /var/www/html/webroot --rm node npm install +CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate -P queue CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate -CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations seed --source Seeds/tests \ No newline at end of file +CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations seed --source Seeds/tests +docker compose run -w /var/www/html/webroot --rm node npm install From f8185bf6bd7b2352d5ad998f66c24c501ba424b3 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 28 Sep 2022 16:54:51 +0200 Subject: [PATCH 120/646] fix --- devtools/init-dev-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index d870ad84e6..4cb959f71b 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -3,7 +3,7 @@ CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install bash ./devtools/setup-dev/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh -CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate -P queue +CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate -p Queue CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations seed --source Seeds/tests docker compose run -w /var/www/html/webroot --rm node npm install From 396f0fb910aa611a20fcf12112b14554000f007f Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 29 Sep 2022 08:19:01 +0200 Subject: [PATCH 121/646] never log empty titles --- src/Log/Engine/FileAndEmailLog.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Log/Engine/FileAndEmailLog.php b/src/Log/Engine/FileAndEmailLog.php index a21839a592..b8ac248c4d 100644 --- a/src/Log/Engine/FileAndEmailLog.php +++ b/src/Log/Engine/FileAndEmailLog.php @@ -67,6 +67,7 @@ private function sendEmailWithErrorInformation($message) '{"id_customer":{"numeric":', '{"id_customer":{"greaterThan":', '{"name":{"_empty":"Bitte gib einen Namen ein."', + '{"title":{"_empty":"Bitte gib einen Titel ein."}}', '{"quantity":{"_empty":"Bitte gib eine Zahl zwischen -5.000', '{"quantity_limit":{"_empty":', '{"quantity_limit":{"lessThanOrEqual":', From e283527541513e7da4f7fd1a830926716fe04041 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 29 Sep 2022 10:20:32 +0200 Subject: [PATCH 122/646] db migrtions and seeds are executedd on phpunit start --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8d74e52c89..8d0b27effb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,12 +48,6 @@ jobs: sed -i 's/HELLO_CASH_USERNAME/${{secrets.HELLO_CASH_USERNAME}}/' ./.github/workflows/custom_config.php sed -i 's/HELLO_CASH_PASSWORD/${{secrets.HELLO_CASH_PASSWORD}}/' ./.github/workflows/custom_config.php sed -i 's/HELLO_CASH_CASHIER_ID/${{secrets.HELLO_CASH_CASHIER_ID}}/' ./.github/workflows/custom_config.php - - - name: Setup DB - run: | - mysql --version - mysql -h 127.0.0.1 --port 8888 -u root -ppassword foodcoopshop_test < ./config/sql/_installation/clean-db-structure.sql - mysql -h 127.0.0.1 --port 8888 -u root -ppassword foodcoopshop_test < ./tests/config/sql/test-db-data.sql - name: Install vendors run: | From d4b7ea6e4087ee16519f062f8fe6934f4033d5b9 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 29 Sep 2022 11:23:08 +0200 Subject: [PATCH 123/646] bootstrap not needed for static code analysis --- phpstan.neon | 2 -- 1 file changed, 2 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index ce1c64faa3..d6700425b8 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -6,5 +6,3 @@ parameters: - src - plugins/Admin/src - plugins/Network/src - bootstrapFiles: - - tests/bootstrap.php From 49edd8ebfd8fefa39fe60d77c0483b3284339d14 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 29 Sep 2022 16:15:14 +0200 Subject: [PATCH 124/646] fix if rightOfWithdrawalEnabled = false --- src/Model/Table/CartsTable.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Model/Table/CartsTable.php b/src/Model/Table/CartsTable.php index 6faff5eb7b..48ef16e126 100644 --- a/src/Model/Table/CartsTable.php +++ b/src/Model/Table/CartsTable.php @@ -55,9 +55,11 @@ public function initialize(array $config): void public function validationDefault(Validator $validator): Validator { - if (Configure::read('app.generalTermsAndConditionsEnabled')) { + if (Configure::read('app.rightOfWithdrawalEnabled')) { $validator->requirePresence('cancellation_terms_accepted', __('Please_accept_the_information_about_right_of_withdrawal')); $validator->equals('cancellation_terms_accepted', 1, __('Please_accept_the_information_about_right_of_withdrawal.')); + } + if (Configure::read('app.generalTermsAndConditionsEnabled')) { $validator->requirePresence('general_terms_and_conditions_accepted', 1, __('Please_accept_the_general_terms_and_conditions.')); $validator->equals('general_terms_and_conditions_accepted', 1, __('Please_accept_the_general_terms_and_conditions.')); } From 96980344f6c91fb04d06e14b3b9528f650d7cddb Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 29 Sep 2022 23:11:23 +0200 Subject: [PATCH 125/646] no more read_file --- config/Seeds/tests/InitTestDataSeed.php | 405 +++++++++++++++++++- tests/config/sql/test-db-data.sql | 472 ------------------------ 2 files changed, 404 insertions(+), 473 deletions(-) delete mode 100644 tests/config/sql/test-db-data.sql diff --git a/config/Seeds/tests/InitTestDataSeed.php b/config/Seeds/tests/InitTestDataSeed.php index 7407d8e553..dc4e9186b3 100644 --- a/config/Seeds/tests/InitTestDataSeed.php +++ b/config/Seeds/tests/InitTestDataSeed.php @@ -20,7 +20,410 @@ class InitTestDataSeed extends AbstractSeed */ public function run() { - $query = file_get_contents(TESTS . 'config' . DS . 'sql' . DS . 'test-db-data.sql'); + $query = " +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!50503 SET NAMES utf8mb4 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- Truncate tables before insertion +TRUNCATE TABLE `fcs_action_logs`; +TRUNCATE TABLE `fcs_address`; +TRUNCATE TABLE `fcs_attribute`; +TRUNCATE TABLE `fcs_barcodes`; +TRUNCATE TABLE `fcs_blog_posts`; +TRUNCATE TABLE `fcs_cart_product_units`; +TRUNCATE TABLE `fcs_cart_products`; +TRUNCATE TABLE `fcs_carts`; +TRUNCATE TABLE `fcs_category`; +TRUNCATE TABLE `fcs_category_product`; +TRUNCATE TABLE `fcs_configuration`; +TRUNCATE TABLE `fcs_cronjob_logs`; +TRUNCATE TABLE `fcs_cronjobs`; +TRUNCATE TABLE `fcs_customer`; +TRUNCATE TABLE `fcs_deposits`; +TRUNCATE TABLE `fcs_feedbacks`; +TRUNCATE TABLE `fcs_images`; +TRUNCATE TABLE `fcs_invoice_taxes`; +TRUNCATE TABLE `fcs_invoices`; +TRUNCATE TABLE `fcs_manufacturer`; +TRUNCATE TABLE `fcs_order_detail`; +TRUNCATE TABLE `fcs_order_detail_feedbacks`; +TRUNCATE TABLE `fcs_order_detail_purchase_prices`; +TRUNCATE TABLE `fcs_order_detail_units`; +TRUNCATE TABLE `fcs_pages`; +TRUNCATE TABLE `fcs_payments`; +TRUNCATE TABLE `fcs_pickup_days`; +TRUNCATE TABLE `fcs_product`; +TRUNCATE TABLE `fcs_product_attribute`; +TRUNCATE TABLE `fcs_product_attribute_combination`; +TRUNCATE TABLE `fcs_purchase_prices`; +TRUNCATE TABLE `fcs_sliders`; +TRUNCATE TABLE `fcs_stock_available`; +TRUNCATE TABLE `fcs_storage_locations`; +TRUNCATE TABLE `fcs_sync_domains`; +TRUNCATE TABLE `fcs_sync_products`; +TRUNCATE TABLE `fcs_tax`; +TRUNCATE TABLE `fcs_units`; +TRUNCATE TABLE `phinxlog`; +TRUNCATE TABLE `queue_phinxlog`; +TRUNCATE TABLE `queue_processes`; +TRUNCATE TABLE `queued_jobs`; + +/*!40000 ALTER TABLE `fcs_action_logs` DISABLE KEYS */; +/*!40000 ALTER TABLE `fcs_action_logs` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_address` DISABLE KEYS */; +INSERT INTO `fcs_address` VALUES +(153,87,0,'Mitglied','Demo','Demostrasse 4','','4644','Scharnstein','','','0664/000000000','fcs-demo-mitglied@mailinator.com','2014-12-02 12:19:31','2014-12-02 12:19:31'), +(154,88,0,'Admin','Demo','Demostrasse 4','','4644','Scharnstein','test','','0600/000000','fcs-demo-admin@mailinator.com','2014-12-02 12:28:44','2014-12-02 12:28:44'), +(173,0,4,'Fleisch-Hersteller','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-demo-fleisch-hersteller@mailinator.com','2014-05-27 22:20:18','2015-04-07 16:18:28'), +(177,0,15,'Milch-Hersteller','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-demo-milch-hersteller@mailinator.com','2014-06-04 21:46:38','2015-10-16 10:06:52'), +(180,0,5,'Gemüse-Hersteller','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-demo-gemuese-hersteller@mailinator.com','2014-05-14 21:20:05','2015-12-30 00:54:35'), +(181,0,16,'Hersteller ohne Customer-Eintrag','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-hersteller-ohne-customer-eintrag@mailinator.com','2014-05-14 21:20:05','2015-12-30 00:54:35'), +(182,92,0,'Superadmin','Demo','Demostrasse 4','','4644','Demostadt',NULL,'','0600/000000','fcs-demo-superadmin@mailinator.com','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(183,93,0,'SB-Kunde','Demo','Demostrasse 4','','4644','Demostadt',NULL,'','0600/000000','fcs-demo-sb-kunde@mailinator.com','2017-07-26 13:19:19','2017-07-26 13:19:19'); +/*!40000 ALTER TABLE `fcs_address` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_attribute` DISABLE KEYS */; +INSERT INTO `fcs_attribute` VALUES +(33,'0,5l',0,1,NULL,NULL), +(35,'1 kg',1,1,NULL,NULL), +(36,'0,5 kg',1,1,NULL,NULL); +/*!40000 ALTER TABLE `fcs_attribute` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_barcodes` DISABLE KEYS */; +INSERT INTO `fcs_barcodes` VALUES +(1,349,0,'1234567890123'), +(2,0,13,'2345678901234'); +/*!40000 ALTER TABLE `fcs_barcodes` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_blog_posts` DISABLE KEYS */; +INSERT INTO `fcs_blog_posts` VALUES +(2,'Demo Blog Artikel','Lorem ipsum dolor sit amet, consetetur sadipscing','

Lorem ipsum dolor sit amet.

',88,0,0,1,'2014-12-18 10:37:26','2015-03-16 12:41:46','2021-05-19'); +/*!40000 ALTER TABLE `fcs_blog_posts` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_cart_product_units` DISABLE KEYS */; +/*!40000 ALTER TABLE `fcs_cart_product_units` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_cart_products` DISABLE KEYS */; +INSERT INTO `fcs_cart_products` VALUES +(1,1,346,0,1,'2018-03-01 10:17:14','2018-03-01 10:17:14'), +(2,1,340,0,1,'2018-03-01 10:17:14','2018-03-01 10:17:14'), +(3,1,60,10,1,'2018-03-01 10:17:14','2018-03-01 10:17:14'); +/*!40000 ALTER TABLE `fcs_cart_products` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_carts` DISABLE KEYS */; +INSERT INTO `fcs_carts` VALUES +(1,92,1,0,'2018-03-01 10:17:14','2018-03-01 10:17:14'); +/*!40000 ALTER TABLE `fcs_carts` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_category` DISABLE KEYS */; +INSERT INTO `fcs_category` VALUES +(16,0,'Fleischprodukte','',11,12,1,'2014-05-14 21:40:51','2014-05-14 21:48:48'), +(20,0,'Alle Produkte','',3,4,1,'2014-05-14 21:53:52','2014-05-17 13:14:22'); +/*!40000 ALTER TABLE `fcs_category` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_category_product` DISABLE KEYS */; +INSERT INTO `fcs_category_product` VALUES +(20,60), +(16,102), +(20,102), +(16,103), +(20,103), +(20,163), +(20,339), +(16,340), +(20,340), +(20,344), +(20,346), +(16,347), +(20,347), +(16,348), +(20,348), +(20,349), +(20,350), +(20,351); +/*!40000 ALTER TABLE `fcs_category_product` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_configuration` DISABLE KEYS */; +INSERT INTO `fcs_configuration` VALUES +(11,1,'FCS_PRODUCT_AVAILABILITY_LOW','Geringe Verfügbarkeit
Ab welcher verfügbaren Produkt-Anzahl soll beim Bestellen der Hinweis \"(x verfügbar\") angezeigt werden?
','10','number',600,'de_DE','2017-07-26 13:19:19','2014-06-01 01:40:34'), +(31,1,'FCS_DAYS_SHOW_PRODUCT_AS_NEW','Wie viele Tage sollen Produkte \"als neu markiert\" bleiben?','7','number',700,'de_DE','2017-07-26 13:19:19','2014-05-14 21:15:45'), +(456,1,'FCS_FOOTER_CMS_TEXT','Zusätzlicher Text für den Footer',NULL,'textarea_big',920,'de_DE','2014-06-11 17:50:55','2016-07-01 21:47:47'), +(508,1,'FCS_FACEBOOK_URL','Facebook-Url für die Einbindung im Footer','https://www.facebook.com/FoodCoopShop/','text',910,'de_DE','2015-07-08 13:23:54','2015-07-08 13:23:54'), +(538,1,'FCS_REGISTRATION_EMAIL_TEXT','Zusätzlicher Text, der in der Bestätigungsmail nach einer Registrierung versendet wird.
E-Mail-Vorschau anzeigen','','textarea_big',1700,'de_DE','2016-06-26 00:00:00','2016-06-26 00:00:00'), +(543,1,'FCS_RIGHT_INFO_BOX_HTML','Inhalt der Box in der rechten Spalte unterhalb des Warenkorbes.
Um eine Zeile grün zu hinterlegen (Überschrift) bitte als \"Überschrift 3\" formatieren.
','

Abholzeiten

\r\n\r\n

Der Abholtag steht jetzt immer in der Produktbeschreibung, du kannst deine Produkte am Freitag abholen.

\r\n\r\n

Du kannst jede Woche bis spätestens Dienstag Mitternacht bestellen und sie am darauffolgenden Freitag abholen.

\r\n','textarea_big',1500,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(544,1,'FCS_NO_DELIVERY_DAYS_GLOBAL','Lieferpause für alle Hersteller?
Hier können lieferfreie Tage (z.B. Feiertage) für die gesamte Foodcoop festgelegt werden.
','','multiple_dropdown',100,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(545,1,'FCS_ACCOUNTING_EMAIL','E-Mail-Adresse des Finanzverantwortlichen
Wer bekommt die Benachrichtigung über den erfolgten Rechnungsversand?
','fcs-demo-superadmin@mailinator.com','text',1100,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(546,1,'FCS_REGISTRATION_INFO_TEXT','Info-Text beim Registrierungsformular
Beim Registrierungsformlar wird unterhalb der E-Mail-Adresse dieser Text angezeigt.
','Um bei uns zu bestellen musst du Vereinsmitglied sein.','textarea_big',1600,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(547,1,'FCS_SHOW_PRODUCTS_FOR_GUESTS','Produkte für nicht eingeloggte Mitglieder sichtbar?','0','boolean',200,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(548,1,'FCS_DEFAULT_NEW_MEMBER_ACTIVE','Neue Mitglieder automatisch aktivieren?','0','boolean',500,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(549,1,'FCS_MINIMAL_CREDIT_BALANCE','Bis zu welchem Guthaben-Betrag sollen Bestellungen möglich sein?','-100','number',1250,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(550,1,'FCS_BANK_ACCOUNT_DATA','Bankverbindung für die Guthaben-Einzahlungen\".','Guthaben-Konto Testbank / IBAN: AT65 5645 4154 8748 8999 / BIC: ABC87878','text',1300,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(552,1,'FCS_DELIVERY_DETAILS_FOR_MANUFACTURERS','Zusätzliche Liefer-Informationen für die Hersteller
wird in den Bestell-Listen nach dem Lieferdatum angezeigt.
',', 15:00 bis 17:00 Uhr','text',1200,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), +(553,1,'FCS_BACKUP_EMAIL_ADDRESS_BCC','E-Mail-Adresse, an die sämtliche vom System generierten E-Mails als BCC verschickt werden (Backup).
Kann leer gelassen werden.
','','text',1900,'de_DE','2016-10-06 00:00:00','2016-10-06 00:00:00'), +(554,1,'FCS_SHOW_FOODCOOPSHOP_BACKLINK','Auf Homepage Link auf www.foodcoopshop.com anzeigen?
Der Link wird im Footer angezeigt.
','1','boolean',930,'de_DE','2016-11-27 00:00:00','2016-11-27 00:00:00'), +(556,1,'FCS_APP_NAME','Name der Foodcoop','FoodCoop Test','text',50,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(557,1,'FCS_APP_ADDRESS','Adresse der Foodcoop
Wird im Footer von Homepage und E-Mails, Datenschutzerklärung, Nutzungsbedingungen usw. verwendet.
','Demostraße 4
A-4564 Demostadt','textarea',60,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(558,1,'FCS_APP_EMAIL','E-Mail-Adresse der Foodcoop
','demo-foodcoop@maillinator.com','text',900,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(559,1,'FCS_PLATFORM_OWNER','Betreiber der Plattform
Für Datenschutzerklärung und Nutzungsbedingungen, bitte auch Adresse angeben. Kann leer gelassen werden, wenn die Foodcoop selbst die Plattform betreibt.
','','textarea',90,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(564,1,'FCS_ORDER_COMMENT_ENABLED','Kommentarfeld bei Bestell-Abschluss anzeigen?
Wird im Admin-Bereich unter \"Bestellungen\" angezeigt.
','1','boolean',130,'de_DE','2017-07-09 00:00:00','2017-07-09 00:00:00'), +(565,1,'FCS_USE_VARIABLE_MEMBER_FEE','Variablen Mitgliedsbeitrag verwenden?
Den variablen Mitgliedsbeitrag bei den Hersteller-Rechnungen abziehen? Die Produkt-Preise müssen entsprechend höher eingegeben werden.
','0','readonly',400,'de_DE','2017-08-02 00:00:00','2017-08-02 00:00:00'), +(566,1,'FCS_DEFAULT_VARIABLE_MEMBER_FEE_PERCENTAGE','Standardwert für variablen Mitgliedsbeitrag
Der Prozentsatz kann in den Hersteller-Einstellungen auch individuell angepasst werden.
','0','readonly',500,'de_DE','2017-08-02 00:00:00','2017-08-02 00:00:00'), +(567,1,'FCS_NETWORK_PLUGIN_ENABLED','Netzwerk-Modul aktiviert?
Infos zum Netzwerk-Modul
','1','readonly',500,'de_DE','2017-09-14 00:00:00','2017-09-14 00:00:00'), +(574,1,'FCS_SHOW_PRODUCT_PRICE_FOR_GUESTS','Produktpreis für nicht eingeloggte Mitglieder anzeigen?','0','boolean',210,'de_DE','2018-05-28 18:05:57','2018-05-28 18:05:57'), +(575,1,'FCS_CURRENCY_SYMBOL','Währungssymbol','€','readonly',520,'de_DE','2018-06-13 19:53:14','2018-06-13 19:53:14'), +(576,1,'FCS_DEFAULT_LOCALE','Sprache','de_DE','readonly',550,'de_DE','2018-06-26 10:18:55','2018-06-26 10:18:55'), +(577,1,'FCS_FOODCOOPS_MAP_ENABLED','Auf Home Karte mit anderen Foodcoops anzeigen?','1','boolean',1280,'de_DE','2019-02-11 22:22:06','2019-02-11 22:22:06'), +(578,1,'FCS_WEEKLY_PICKUP_DAY','Wöchentlicher Abholtag','5','readonly',600,'de_DE','2019-02-18 12:38:10','2019-02-18 12:38:10'), +(579,1,'FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA','Bestelllisten-Versand: x Tage vor dem Abholtag','2','readonly',650,'de_DE','2019-02-18 12:38:10','2019-02-18 12:38:10'), +(580,1,'FCS_ORDER_POSSIBLE_FOR_STOCK_PRODUCTS_IN_ORDERS_WITH_DELIVERY_RHYTHM','Sollen Lagerprodukte mit der wöchentlichen Bestellung bestellt werden können?','1','boolean',750,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(581,1,'FCS_SHOW_NON_STOCK_PRODUCTS_IN_INSTANT_ORDERS','In der Sofort-Bestellung ausschließlich Lagerprodukte anzeigen?','0','boolean',760,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(582,1,'FCS_INCLUDE_STOCK_PRODUCTS_IN_INVOICES','Lagerprodukte in Rechnungen miteinbeziehen?','1','readonly',600,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(583,1,'FCS_REGISTRATION_NOTIFICATION_EMAILS','Wer soll bei neuen Registrierungen informiert werden?
Mehrere E-Mail-Adressen mit , (ohne Leerzeichen) trennen.
','fcs-demo-superadmin@mailinator.com','text',550,'de_DE','2019-03-05 20:08:00','2019-03-05 20:08:00'), +(584,1,'FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED','Selbstbedienungs-Modus für Lagerprodukte aktiv?
Zur Online-Doku
','0','boolean',3000,'de_DE','2019-04-17 20:01:59','2019-04-17 20:01:59'), +(585,1,'FCS_APP_ADDITIONAL_DATA','Zusätzliche Infos zur Foodcoop
Z.B. ZVR-Zahl
','','textarea',80,'de_DE','2019-08-03 20:07:17','2019-08-03 20:07:17'), +(586,1,'FCS_SELF_SERVICE_MODE_TEST_MODE_ENABLED','Selbstbedienungs-Modus im Test-Modus ausführen?
Keine Verlinkung im Haupt-Menü und bei Lagerprodukten.
','1','boolean',3100,'de_DE','2019-12-09 13:46:41','2019-12-09 13:46:41'), +(587,1,'FCS_CASHLESS_PAYMENT_ADD_TYPE','Art der Eintragung der Guthaben-Aufladungen
Wie gelangen die Guthaben-Aufladungen vom Bankkonto in den FoodCoopShop?
','manual','dropdown',1450,'de_DE','2020-02-11 10:13:10','2020-02-11 10:13:10'), +(589,1,'FCS_FEEDBACK_TO_PRODUCTS_ENABLED','Feedback-Funktion für Produkte aktiviert?
Mitglieder können Feedback zu bestellten Produkte verfassen.
','1','boolean',3200,'de_DE','2020-06-19 09:03:00','2020-06-19 09:03:00'), +(590,1,'FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY','Mitglied kann Abholtag beim Bestellen selbst auswählen.','0','readonly',590,'de_DE','2020-07-06 10:34:48','2020-07-06 10:34:48'), +(592,1,'FCS_SEND_INVOICES_TO_CUSTOMERS','Einzelhandels-Modus aktiviert?
Infos zur Verwendung im Einzelhandel
','0','readonly',580,'de_DE','2020-10-29 10:06:50','2020-10-29 10:06:50'), +(593,1,'FCS_DEPOSIT_TAX_RATE','Umsatzsteuersatz für Pfand','20,00','readonly',581,'de_DE','2020-11-03 15:24:12','2020-11-03 15:24:12'), +(594,1,'FCS_INVOICE_HEADER_TEXT','Header-Text für Rechnungen an Mitglieder','FoodCoop Test
Demostraße 4
A-4564 Demostadt
demo-foodcoop@maillinator.com','readonly',582,'de_DE','2020-11-03 15:24:12','2020-11-03 15:24:12'), +(595,1,'FCS_MEMBER_FEE_PRODUCTS','Welche Produkte werden als Mitgliedsbeitrag verwendet?
Die ausgewählten Produkte sind Datengrundlage der Spalte Mitgliedsbeitrag in der Mitgliederverwaltung und werden nicht in der Umsatzstatistik angezeigt.
','','multiple_dropdown',3300,'de_DE','2020-12-20 19:26:26','2020-12-20 19:26:26'), +(596,1,'FCS_CHECK_CREDIT_BALANCE_LIMIT','Ab welchem Guthaben-Stand soll die Erinnerungsmail versendet werden?','0','number',1450,'de_DE','2021-01-19 11:23:49','2021-01-19 11:23:49'), +(597,1,'FCS_PURCHASE_PRICE_ENABLED','Einkaufspreis für Produkte erfassen?
Der Einkaufspreis ist die Datengrundlage für die Gewinn-Statistik und für Lieferscheine an die Hersteller.
','0','readonly',587,'de_DE','2021-05-12 15:24:17','2021-05-12 15:24:17'), +(598,1,'FCS_HELLO_CASH_API_ENABLED','Schnittstelle (API) zu Registrierkasse HelloCash (hellocash.at) aktivieren?
Alle Rechnungen (bar und unbar) über die Registrierkasse erstellen.
','0','readonly',583,'de_DE','2021-07-07 10:55:14','2021-07-07 10:55:14'), +(599,1,'FCS_SAVE_STORAGE_LOCATION_FOR_PRODUCTS','Lagerort für Produkte erfassen und in Bestelllisten anzeigen?
Lagerorte: Keine Kühlung / Kühlschrank / Tiefkühler. Es erscheint ein zusätzlicher Button neben \"Bestellungen - Bestellungen als PDF generieren\"
','0','boolean',3210,'de_DE','2021-08-02 11:28:40','2021-08-02 11:28:40'), +(600,1,'FCS_INSTAGRAM_URL','Instagram-Url für die Einbindung im Footer','','text',920,'de_DE','2021-09-10 21:23:18','2021-09-10 21:23:18'), +(601,1,'FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY','Bestellungen beim ein- und zweiwöchigen Lieferhythmus sind nur in der Woche vor der Lieferung möglich.','0','boolean',3210,'de_DE','2022-02-01 17:48:46','2022-02-01 17:48:46'), +(602,1,'FCS_INVOICE_NUMBER_PREFIX','Präfix für Rechnungs-Nummernkreis
Max. 6 Zeichen inkl. Trennzeichen.
','','readonly',586,'de_DE','2022-03-21 12:03:07','2022-03-21 12:03:07'), +(603,1,'FCS_TAX_BASED_ON_NET_INVOICE_SUM','Rechnungslegung für pauschalierte Betriebe
Die Berechnung der Umsatzsteuer erfolgt auf Basis der Netto-Rechnungsumme und ist nicht die Summe der Umsatzsteuerbeträge pro Stück.
','0','readonly',585,'de_DE','2022-03-23 09:12:43','2022-03-23 09:12:43'), +(604,1,'FCS_NEWSLETTER_ENABLED','Newsletter-Funktion aktiv?
Mitglieder können sich bei der Registrierung für den Newsletter anmelden. Mehr Infos
','0','boolean',3400,'de_DE','2022-04-12 15:28:47','2022-04-12 15:28:47'), +(605,1,'FCS_USER_FEEDBACK_ENABLED','Mitglieder- und Hersteller-Feedback aktiv?
Ermöglicht das Erfassen und Anzeigen von Feedback. Mehr Infos
','0','boolean',3500,'de_DE','2022-07-19 14:39:45','2022-07-19 14:39:45'); +/*!40000 ALTER TABLE `fcs_configuration` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_cronjob_logs` DISABLE KEYS */; +/*!40000 ALTER TABLE `fcs_cronjob_logs` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_cronjobs` DISABLE KEYS */; +INSERT INTO `fcs_cronjobs` VALUES +(1,'TestCronjob','day',NULL,NULL,'22:30:00',1), +(2,'TestCronjob','week',NULL,'Monday','09:00:00',1), +(3,'TestCronjob','month',11,NULL,'07:30:00',1); +/*!40000 ALTER TABLE `fcs_cronjobs` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_customer` DISABLE KEYS */; +INSERT INTO `fcs_customer` VALUES +(87,3,0,'Demo','Mitglied','fcs-demo-mitglied@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2014-12-02 12:19:31','2015-12-06 23:37:44',0,0,'SP',1,1,1,1,0), +(88,4,0,'Demo','Admin','fcs-demo-admin@mailinator.com','$2y$10\\\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2014-12-02 12:28:43','2016-09-29 16:25:09',0,0,'SP',1,1,1,1,0), +(89,4,0,'Demo','Gemüse-Hersteller','fcs-demo-gemuese-hersteller@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:37:26','2015-03-11 18:12:10',0,0,'SP',1,1,1,1,0), +(90,4,0,'Demo','Milch-Hersteller','fcs-demo-milch-hersteller@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:37:49','2015-03-11 18:11:54',0,0,'SP',1,1,1,1,0), +(91,4,0,'Demo','Fleisch-Hersteller','fcs-demo-fleisch-hersteller@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:38:12','2015-03-11 18:11:47',0,0,'SP',1,1,1,1,0), +(92,5,0,'Demo','Superadmin','fcs-demo-superadmin@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2016-09-29 16:26:12','2016-09-29 16:26:12',0,0,'SP',1,1,1,1,0), +(93,2,0,'Demo','SB-Kunde','fcs-demo-sb-kunde@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,0,'2016-09-29 16:26:12','2016-09-29 16:26:12',0,0,'SP',1,1,1,1,0); +/*!40000 ALTER TABLE `fcs_customer` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_deposits` DISABLE KEYS */; +INSERT INTO `fcs_deposits` VALUES +(1,346,0,0.5), +(2,0,9,0.5), +(3,0,10,0.5); +/*!40000 ALTER TABLE `fcs_deposits` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_feedbacks` DISABLE KEYS */; +/*!40000 ALTER TABLE `fcs_feedbacks` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_images` DISABLE KEYS */; +INSERT INTO `fcs_images` VALUES +(154,60), +(156,340), +(157,338); +/*!40000 ALTER TABLE `fcs_images` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_invoice_taxes` DISABLE KEYS */; +/*!40000 ALTER TABLE `fcs_invoice_taxes` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_invoices` DISABLE KEYS */; +/*!40000 ALTER TABLE `fcs_invoices` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_manufacturer` DISABLE KEYS */; +INSERT INTO `fcs_manufacturer` VALUES +(4,'Demo Fleisch-Hersteller','

tests

\r\n','','2014-05-14 13:23:02','2015-05-15 13:31:41',1,0,'','','','','','','','','','',NULL,0,1,1,2,NULL,'testfcs1@mailinator.com,testfcs2@mailinator.com',NULL,NULL,NULL,1,NULL,0,0,0,'',1,0), +(5,'Demo Gemüse-Hersteller','

Gemüse-Hersteller Beschreibung lang

','
\r\n

Gemüse-Hersteller Beschreibung kurz

\r\n
','2014-05-14 13:36:44','2016-09-27 09:34:51',1,0,'','','','','','','','','','',88,0,1,1,1,NULL,'',NULL,NULL,NULL,NULL,'1',1,1,1,'',1,0), +(15,'Demo Milch-Hersteller','

Ja, ich bin der Milchhersteller!

','','2014-06-04 21:45:12','2016-03-07 09:02:25',1,0,'','','','','','','','','','',NULL,0,1,1,4,NULL,'test@test.at',NULL,NULL,NULL,NULL,NULL,0,0,0,'',1,1), +(16,'Hersteller ohne Customer-Eintrag','','','2014-06-04 21:45:12','2016-03-07 09:02:25',1,0,'','','','','','','','','','',NULL,10,1,1,1,NULL,'',NULL,NULL,NULL,NULL,NULL,0,0,0,'',1,0); +/*!40000 ALTER TABLE `fcs_manufacturer` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_order_detail` DISABLE KEYS */; +INSERT INTO `fcs_order_detail` VALUES +(1,346,0,'Artischocke : Stück',1,1.820000,1.650000,0.170000,0.170000,10.000,0.50,92,NULL,1,3,'2018-02-02','SP','2018-02-01 09:17:14','2021-05-04 11:10:14'), +(2,340,0,'Beuschl',1,4.540000,4.540000,0.000000,0.000000,0.000,0.00,92,NULL,2,3,'2018-02-02','SP','2018-02-01 09:17:14','2021-05-04 11:10:14'), +(3,60,10,'Milch : 0,5l',1,0.620000,0.550000,0.070000,0.070000,13.000,0.50,92,NULL,3,3,'2018-02-02','SP','2018-02-01 09:17:14','2021-05-04 11:10:14'); +/*!40000 ALTER TABLE `fcs_order_detail` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_order_detail_feedbacks` DISABLE KEYS */; +/*!40000 ALTER TABLE `fcs_order_detail_feedbacks` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_order_detail_purchase_prices` DISABLE KEYS */; +/*!40000 ALTER TABLE `fcs_order_detail_purchase_prices` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_order_detail_units` DISABLE KEYS */; +/*!40000 ALTER TABLE `fcs_order_detail_units` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_pages` DISABLE KEYS */; +INSERT INTO `fcs_pages` VALUES +(3,'Page','',1,'header',1,'',88,0,'2016-08-29 13:36:43','2016-08-29 13:36:43',0,0,0,0); +/*!40000 ALTER TABLE `fcs_pages` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_payments` DISABLE KEYS */; +INSERT INTO `fcs_payments` VALUES +(1,92,0,'product',100.00,'','2018-07-03 20:00:20','2018-07-03 20:00:20',NULL,NULL,0,1,0,'',0,92), +(2,87,0,'product',100000.00,'','2020-12-09 20:00:20','2020-12-09 20:00:20',NULL,NULL,0,1,0,'',0,87); +/*!40000 ALTER TABLE `fcs_payments` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_pickup_days` DISABLE KEYS */; +/*!40000 ALTER TABLE `fcs_pickup_days` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_product` DISABLE KEYS */; +INSERT INTO `fcs_product` VALUES +(60,15,3,1,0.909091,'Milch','','1 Liter','',0,0,1,'week',1,NULL,NULL,3,NULL,'2014-06-11 21:20:24','2014-12-14 19:47:33'), +(102,4,2,1,0.000000,'Frankfurter','','

2 Paar

','',0,0,1,'week',1,NULL,NULL,3,NULL,'2016-04-27 21:13:37','2014-09-19 14:32:51'), +(103,4,2,1,3.181819,'Bratwürstel','','2 Paar','',0,0,1,'week',1,NULL,NULL,3,NULL,'2016-05-05 08:28:49','2014-08-16 14:05:58'), +(163,5,0,1,1.363637,'Mangold','','0,25kg','',0,0,1,'week',1,NULL,NULL,3,NULL,'2014-07-12 20:41:43','2017-07-26 13:24:10'), +(339,5,0,1,0.000000,'Kartoffel','','','',0,0,1,'week',1,NULL,NULL,3,NULL,'2015-09-07 12:05:38','2015-02-26 13:54:07'), +(340,4,0,1,4.545455,'Beuschl','','','',0,0,1,'week',1,NULL,NULL,3,NULL,'2016-05-05 08:28:45','2015-06-23 14:52:53'), +(344,5,0,1,0.636364,'Knoblauch','','','100 g',0,0,1,'week',1,NULL,NULL,3,NULL,'2015-10-05 17:22:40','2015-07-06 10:24:44'), +(346,5,2,1,1.652893,'Artischocke','','','Stück',0,0,1,'week',1,NULL,NULL,3,NULL,'2015-08-19 09:35:46','2015-08-19 09:35:45'), +(347,4,2,1,0.000000,'Forelle','','','Stück',0,0,1,'week',1,NULL,NULL,3,NULL,'2018-05-17 16:13:39','2018-05-17 16:15:21'), +(348,4,2,1,0.000000,'Rindfleisch','','','',0,0,1,'week',1,NULL,NULL,3,NULL,'2018-05-17 16:15:33','2018-05-17 16:16:38'), +(349,5,2,1,4.545455,'Lagerprodukt','','','',0,1,1,'week',1,NULL,NULL,3,NULL,'2018-08-16 12:15:48','2018-08-16 12:16:51'), +(350,5,2,1,0.000000,'Lagerprodukt mit Varianten','','','',0,1,1,'week',1,NULL,NULL,3,NULL,'2018-08-16 12:19:06','2018-08-16 12:19:23'), +(351,5,1,1,0.000000,'Lagerprodukt 2','','','',0,1,1,'week',1,NULL,NULL,3,NULL,'2019-06-05 15:09:53','2019-06-05 15:10:08'); +/*!40000 ALTER TABLE `fcs_product` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_product_attribute` DISABLE KEYS */; +INSERT INTO `fcs_product_attribute` VALUES +(10,60,0.545455,0), +(11,348,0.000000,1), +(12,348,0.000000,0), +(13,350,1.818182,1), +(14,350,3.636364,0), +(15,350,0.000000,0); +/*!40000 ALTER TABLE `fcs_product_attribute` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_product_attribute_combination` DISABLE KEYS */; +INSERT INTO `fcs_product_attribute_combination` VALUES +(33,10), +(36,11), +(35,12), +(36,13), +(35,14), +(36,15); +/*!40000 ALTER TABLE `fcs_product_attribute_combination` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_purchase_prices` DISABLE KEYS */; +INSERT INTO `fcs_purchase_prices` VALUES +(1,346,0,1,1.200000), +(2,0,13,0,1.400000), +(3,347,0,3,NULL), +(4,348,0,3,NULL), +(5,60,0,2,NULL), +(6,0,10,0,0.250000), +(7,163,0,0,1.072727); +/*!40000 ALTER TABLE `fcs_purchase_prices` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_sliders` DISABLE KEYS */; +INSERT INTO `fcs_sliders` VALUES +(6,'demo-slider.jpg',NULL,0,0,1); +/*!40000 ALTER TABLE `fcs_sliders` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_stock_available` DISABLE KEYS */; +INSERT INTO `fcs_stock_available` VALUES +(132,60,0,1015,0,NULL,1,NULL), +(195,102,0,2996,0,NULL,1,NULL), +(196,103,0,990,0,NULL,1,NULL), +(318,163,0,988,0,NULL,1,NULL), +(674,339,0,2959,0,NULL,1,NULL), +(678,340,0,990,0,NULL,1,NULL), +(680,344,0,78,0,NULL,0,NULL), +(686,346,0,97,0,NULL,0,NULL), +(692,60,9,996,0,NULL,1,NULL), +(693,60,10,19,0,NULL,0,NULL), +(704,347,0,999,0,NULL,1,NULL), +(705,348,0,1998,0,NULL,1,NULL), +(706,348,11,999,0,NULL,1,NULL), +(707,348,12,999,0,NULL,1,NULL), +(708,349,0,5,-5,0,0,NULL), +(709,350,0,1004,0,NULL,1,NULL), +(710,350,13,5,-5,0,0,NULL), +(711,350,14,999,0,NULL,1,NULL), +(712,350,15,999,0,NULL,1,NULL), +(713,351,0,999,0,NULL,1,NULL); +/*!40000 ALTER TABLE `fcs_stock_available` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_storage_locations` DISABLE KEYS */; +INSERT INTO `fcs_storage_locations` VALUES +(1,'Keine Kühlung',10), +(2,'Kühlschrank',20), +(3,'Tiefkühler',30); +/*!40000 ALTER TABLE `fcs_storage_locations` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_sync_domains` DISABLE KEYS */; +INSERT INTO `fcs_sync_domains` VALUES +(1,'{{serverName}}',1); +/*!40000 ALTER TABLE `fcs_sync_domains` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_sync_products` DISABLE KEYS */; +INSERT INTO `fcs_sync_products` VALUES +(1,1,346,346,0,0), +(2,1,350,350,0,0), +(3,1,350,350,14,14), +(4,1,350,350,13,13); +/*!40000 ALTER TABLE `fcs_sync_products` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_tax` DISABLE KEYS */; +INSERT INTO `fcs_tax` VALUES +(1,20.000,1,0), +(2,10.000,1,0), +(3,13.000,1,0); +/*!40000 ALTER TABLE `fcs_tax` ENABLE KEYS */; + +/*!40000 ALTER TABLE `fcs_units` DISABLE KEYS */; +INSERT INTO `fcs_units` VALUES +(1,347,0,1.50,0.98,'g',100,1,350.000), +(2,0,11,20.00,NULL,'kg',1,1,0.500), +(3,0,12,20.00,14.00,'g',500,1,300.000), +(4,349,0,0.00,NULL,'kg',1,0,0.000), +(5,0,13,0.00,NULL,'kg',1,0,0.000), +(6,0,14,0.00,NULL,'kg',1,0,0.000), +(7,0,15,10.00,6.00,'kg',1,1,0.500), +(8,351,0,15.00,NULL,'kg',1,1,1.000); +/*!40000 ALTER TABLE `fcs_units` ENABLE KEYS */; + +/*!40000 ALTER TABLE `queue_processes` DISABLE KEYS */; +/*!40000 ALTER TABLE `queue_processes` ENABLE KEYS */; + +/*!40000 ALTER TABLE `queued_jobs` DISABLE KEYS */; +/*!40000 ALTER TABLE `queued_jobs` ENABLE KEYS */; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +"; $this->execute($query); } } diff --git a/tests/config/sql/test-db-data.sql b/tests/config/sql/test-db-data.sql deleted file mode 100644 index da01dfdc3a..0000000000 --- a/tests/config/sql/test-db-data.sql +++ /dev/null @@ -1,472 +0,0 @@ - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!50503 SET NAMES utf8mb4 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- Truncate tables before insertion -TRUNCATE TABLE `fcs_action_logs`; -TRUNCATE TABLE `fcs_address`; -TRUNCATE TABLE `fcs_attribute`; -TRUNCATE TABLE `fcs_barcodes`; -TRUNCATE TABLE `fcs_blog_posts`; -TRUNCATE TABLE `fcs_cart_product_units`; -TRUNCATE TABLE `fcs_cart_products`; -TRUNCATE TABLE `fcs_carts`; -TRUNCATE TABLE `fcs_category`; -TRUNCATE TABLE `fcs_category_product`; -TRUNCATE TABLE `fcs_configuration`; -TRUNCATE TABLE `fcs_cronjob_logs`; -TRUNCATE TABLE `fcs_cronjobs`; -TRUNCATE TABLE `fcs_customer`; -TRUNCATE TABLE `fcs_deposits`; -TRUNCATE TABLE `fcs_feedbacks`; -TRUNCATE TABLE `fcs_images`; -TRUNCATE TABLE `fcs_invoice_taxes`; -TRUNCATE TABLE `fcs_invoices`; -TRUNCATE TABLE `fcs_manufacturer`; -TRUNCATE TABLE `fcs_order_detail`; -TRUNCATE TABLE `fcs_order_detail_feedbacks`; -TRUNCATE TABLE `fcs_order_detail_purchase_prices`; -TRUNCATE TABLE `fcs_order_detail_units`; -TRUNCATE TABLE `fcs_pages`; -TRUNCATE TABLE `fcs_payments`; -TRUNCATE TABLE `fcs_pickup_days`; -TRUNCATE TABLE `fcs_product`; -TRUNCATE TABLE `fcs_product_attribute`; -TRUNCATE TABLE `fcs_product_attribute_combination`; -TRUNCATE TABLE `fcs_purchase_prices`; -TRUNCATE TABLE `fcs_sliders`; -TRUNCATE TABLE `fcs_stock_available`; -TRUNCATE TABLE `fcs_storage_locations`; -TRUNCATE TABLE `fcs_sync_domains`; -TRUNCATE TABLE `fcs_sync_products`; -TRUNCATE TABLE `fcs_tax`; -TRUNCATE TABLE `fcs_units`; -TRUNCATE TABLE `phinxlog`; -TRUNCATE TABLE `queue_phinxlog`; -TRUNCATE TABLE `queue_processes`; -TRUNCATE TABLE `queued_jobs`; - -/*!40000 ALTER TABLE `fcs_action_logs` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_action_logs` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_address` DISABLE KEYS */; -INSERT INTO `fcs_address` VALUES -(153,87,0,'Mitglied','Demo','Demostrasse 4','','4644','Scharnstein','','','0664/000000000','fcs-demo-mitglied@mailinator.com','2014-12-02 12:19:31','2014-12-02 12:19:31'), -(154,88,0,'Admin','Demo','Demostrasse 4','','4644','Scharnstein','test','','0600/000000','fcs-demo-admin@mailinator.com','2014-12-02 12:28:44','2014-12-02 12:28:44'), -(173,0,4,'Fleisch-Hersteller','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-demo-fleisch-hersteller@mailinator.com','2014-05-27 22:20:18','2015-04-07 16:18:28'), -(177,0,15,'Milch-Hersteller','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-demo-milch-hersteller@mailinator.com','2014-06-04 21:46:38','2015-10-16 10:06:52'), -(180,0,5,'Gemüse-Hersteller','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-demo-gemuese-hersteller@mailinator.com','2014-05-14 21:20:05','2015-12-30 00:54:35'), -(181,0,16,'Hersteller ohne Customer-Eintrag','Demo','Demostrasse 4','','4644','Scharnstein','','','','fcs-hersteller-ohne-customer-eintrag@mailinator.com','2014-05-14 21:20:05','2015-12-30 00:54:35'), -(182,92,0,'Superadmin','Demo','Demostrasse 4','','4644','Demostadt',NULL,'','0600/000000','fcs-demo-superadmin@mailinator.com','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(183,93,0,'SB-Kunde','Demo','Demostrasse 4','','4644','Demostadt',NULL,'','0600/000000','fcs-demo-sb-kunde@mailinator.com','2017-07-26 13:19:19','2017-07-26 13:19:19'); -/*!40000 ALTER TABLE `fcs_address` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_attribute` DISABLE KEYS */; -INSERT INTO `fcs_attribute` VALUES -(33,'0,5l',0,1,NULL,NULL), -(35,'1 kg',1,1,NULL,NULL), -(36,'0,5 kg',1,1,NULL,NULL); -/*!40000 ALTER TABLE `fcs_attribute` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_barcodes` DISABLE KEYS */; -INSERT INTO `fcs_barcodes` VALUES -(1,349,0,'1234567890123'), -(2,0,13,'2345678901234'); -/*!40000 ALTER TABLE `fcs_barcodes` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_blog_posts` DISABLE KEYS */; -INSERT INTO `fcs_blog_posts` VALUES -(2,'Demo Blog Artikel','Lorem ipsum dolor sit amet, consetetur sadipscing','

Lorem ipsum dolor sit amet.

',88,0,0,1,'2014-12-18 10:37:26','2015-03-16 12:41:46','2021-05-19'); -/*!40000 ALTER TABLE `fcs_blog_posts` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_cart_product_units` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_cart_product_units` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_cart_products` DISABLE KEYS */; -INSERT INTO `fcs_cart_products` VALUES -(1,1,346,0,1,'2018-03-01 10:17:14','2018-03-01 10:17:14'), -(2,1,340,0,1,'2018-03-01 10:17:14','2018-03-01 10:17:14'), -(3,1,60,10,1,'2018-03-01 10:17:14','2018-03-01 10:17:14'); -/*!40000 ALTER TABLE `fcs_cart_products` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_carts` DISABLE KEYS */; -INSERT INTO `fcs_carts` VALUES -(1,92,1,0,'2018-03-01 10:17:14','2018-03-01 10:17:14'); -/*!40000 ALTER TABLE `fcs_carts` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_category` DISABLE KEYS */; -INSERT INTO `fcs_category` VALUES -(16,0,'Fleischprodukte','',11,12,1,'2014-05-14 21:40:51','2014-05-14 21:48:48'), -(20,0,'Alle Produkte','',3,4,1,'2014-05-14 21:53:52','2014-05-17 13:14:22'); -/*!40000 ALTER TABLE `fcs_category` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_category_product` DISABLE KEYS */; -INSERT INTO `fcs_category_product` VALUES -(20,60), -(16,102), -(20,102), -(16,103), -(20,103), -(20,163), -(20,339), -(16,340), -(20,340), -(20,344), -(20,346), -(16,347), -(20,347), -(16,348), -(20,348), -(20,349), -(20,350), -(20,351); -/*!40000 ALTER TABLE `fcs_category_product` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_configuration` DISABLE KEYS */; -INSERT INTO `fcs_configuration` VALUES -(11,1,'FCS_PRODUCT_AVAILABILITY_LOW','Geringe Verfügbarkeit
Ab welcher verfügbaren Produkt-Anzahl soll beim Bestellen der Hinweis \"(x verfügbar\") angezeigt werden?
','10','number',600,'de_DE','2017-07-26 13:19:19','2014-06-01 01:40:34'), -(31,1,'FCS_DAYS_SHOW_PRODUCT_AS_NEW','Wie viele Tage sollen Produkte \"als neu markiert\" bleiben?','7','number',700,'de_DE','2017-07-26 13:19:19','2014-05-14 21:15:45'), -(456,1,'FCS_FOOTER_CMS_TEXT','Zusätzlicher Text für den Footer',NULL,'textarea_big',920,'de_DE','2014-06-11 17:50:55','2016-07-01 21:47:47'), -(508,1,'FCS_FACEBOOK_URL','Facebook-Url für die Einbindung im Footer','https://www.facebook.com/FoodCoopShop/','text',910,'de_DE','2015-07-08 13:23:54','2015-07-08 13:23:54'), -(538,1,'FCS_REGISTRATION_EMAIL_TEXT','Zusätzlicher Text, der in der Bestätigungsmail nach einer Registrierung versendet wird.
E-Mail-Vorschau anzeigen','','textarea_big',1700,'de_DE','2016-06-26 00:00:00','2016-06-26 00:00:00'), -(543,1,'FCS_RIGHT_INFO_BOX_HTML','Inhalt der Box in der rechten Spalte unterhalb des Warenkorbes.
Um eine Zeile grün zu hinterlegen (Überschrift) bitte als \"Überschrift 3\" formatieren.
','

Abholzeiten

\r\n\r\n

Der Abholtag steht jetzt immer in der Produktbeschreibung, du kannst deine Produkte am Freitag abholen.

\r\n\r\n

Du kannst jede Woche bis spätestens Dienstag Mitternacht bestellen und sie am darauffolgenden Freitag abholen.

\r\n','textarea_big',1500,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(544,1,'FCS_NO_DELIVERY_DAYS_GLOBAL','Lieferpause für alle Hersteller?
Hier können lieferfreie Tage (z.B. Feiertage) für die gesamte Foodcoop festgelegt werden.
','','multiple_dropdown',100,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(545,1,'FCS_ACCOUNTING_EMAIL','E-Mail-Adresse des Finanzverantwortlichen
Wer bekommt die Benachrichtigung über den erfolgten Rechnungsversand?
','fcs-demo-superadmin@mailinator.com','text',1100,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(546,1,'FCS_REGISTRATION_INFO_TEXT','Info-Text beim Registrierungsformular
Beim Registrierungsformlar wird unterhalb der E-Mail-Adresse dieser Text angezeigt.
','Um bei uns zu bestellen musst du Vereinsmitglied sein.','textarea_big',1600,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(547,1,'FCS_SHOW_PRODUCTS_FOR_GUESTS','Produkte für nicht eingeloggte Mitglieder sichtbar?','0','boolean',200,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(548,1,'FCS_DEFAULT_NEW_MEMBER_ACTIVE','Neue Mitglieder automatisch aktivieren?','0','boolean',500,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(549,1,'FCS_MINIMAL_CREDIT_BALANCE','Bis zu welchem Guthaben-Betrag sollen Bestellungen möglich sein?','-100','number',1250,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(550,1,'FCS_BANK_ACCOUNT_DATA','Bankverbindung für die Guthaben-Einzahlungen\".','Guthaben-Konto Testbank / IBAN: AT65 5645 4154 8748 8999 / BIC: ABC87878','text',1300,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(552,1,'FCS_DELIVERY_DETAILS_FOR_MANUFACTURERS','Zusätzliche Liefer-Informationen für die Hersteller
wird in den Bestell-Listen nach dem Lieferdatum angezeigt.
',', 15:00 bis 17:00 Uhr','text',1200,'de_DE','2017-07-26 13:19:19','2017-07-26 13:19:19'), -(553,1,'FCS_BACKUP_EMAIL_ADDRESS_BCC','E-Mail-Adresse, an die sämtliche vom System generierten E-Mails als BCC verschickt werden (Backup).
Kann leer gelassen werden.
','','text',1900,'de_DE','2016-10-06 00:00:00','2016-10-06 00:00:00'), -(554,1,'FCS_SHOW_FOODCOOPSHOP_BACKLINK','Auf Homepage Link auf www.foodcoopshop.com anzeigen?
Der Link wird im Footer angezeigt.
','1','boolean',930,'de_DE','2016-11-27 00:00:00','2016-11-27 00:00:00'), -(556,1,'FCS_APP_NAME','Name der Foodcoop','FoodCoop Test','text',50,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(557,1,'FCS_APP_ADDRESS','Adresse der Foodcoop
Wird im Footer von Homepage und E-Mails, Datenschutzerklärung, Nutzungsbedingungen usw. verwendet.
','Demostraße 4
A-4564 Demostadt','textarea',60,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(558,1,'FCS_APP_EMAIL','E-Mail-Adresse der Foodcoop
','demo-foodcoop@maillinator.com','text',900,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(559,1,'FCS_PLATFORM_OWNER','Betreiber der Plattform
Für Datenschutzerklärung und Nutzungsbedingungen, bitte auch Adresse angeben. Kann leer gelassen werden, wenn die Foodcoop selbst die Plattform betreibt.
','','textarea',90,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(564,1,'FCS_ORDER_COMMENT_ENABLED','Kommentarfeld bei Bestell-Abschluss anzeigen?
Wird im Admin-Bereich unter \"Bestellungen\" angezeigt.
','1','boolean',130,'de_DE','2017-07-09 00:00:00','2017-07-09 00:00:00'), -(565,1,'FCS_USE_VARIABLE_MEMBER_FEE','Variablen Mitgliedsbeitrag verwenden?
Den variablen Mitgliedsbeitrag bei den Hersteller-Rechnungen abziehen? Die Produkt-Preise müssen entsprechend höher eingegeben werden.
','0','readonly',400,'de_DE','2017-08-02 00:00:00','2017-08-02 00:00:00'), -(566,1,'FCS_DEFAULT_VARIABLE_MEMBER_FEE_PERCENTAGE','Standardwert für variablen Mitgliedsbeitrag
Der Prozentsatz kann in den Hersteller-Einstellungen auch individuell angepasst werden.
','0','readonly',500,'de_DE','2017-08-02 00:00:00','2017-08-02 00:00:00'), -(567,1,'FCS_NETWORK_PLUGIN_ENABLED','Netzwerk-Modul aktiviert?
Infos zum Netzwerk-Modul
','1','readonly',500,'de_DE','2017-09-14 00:00:00','2017-09-14 00:00:00'), -(574,1,'FCS_SHOW_PRODUCT_PRICE_FOR_GUESTS','Produktpreis für nicht eingeloggte Mitglieder anzeigen?','0','boolean',210,'de_DE','2018-05-28 18:05:57','2018-05-28 18:05:57'), -(575,1,'FCS_CURRENCY_SYMBOL','Währungssymbol','€','readonly',520,'de_DE','2018-06-13 19:53:14','2018-06-13 19:53:14'), -(576,1,'FCS_DEFAULT_LOCALE','Sprache','de_DE','readonly',550,'de_DE','2018-06-26 10:18:55','2018-06-26 10:18:55'), -(577,1,'FCS_FOODCOOPS_MAP_ENABLED','Auf Home Karte mit anderen Foodcoops anzeigen?','1','boolean',1280,'de_DE','2019-02-11 22:22:06','2019-02-11 22:22:06'), -(578,1,'FCS_WEEKLY_PICKUP_DAY','Wöchentlicher Abholtag','5','readonly',600,'de_DE','2019-02-18 12:38:10','2019-02-18 12:38:10'), -(579,1,'FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA','Bestelllisten-Versand: x Tage vor dem Abholtag','2','readonly',650,'de_DE','2019-02-18 12:38:10','2019-02-18 12:38:10'), -(580,1,'FCS_ORDER_POSSIBLE_FOR_STOCK_PRODUCTS_IN_ORDERS_WITH_DELIVERY_RHYTHM','Sollen Lagerprodukte mit der wöchentlichen Bestellung bestellt werden können?','1','boolean',750,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(581,1,'FCS_SHOW_NON_STOCK_PRODUCTS_IN_INSTANT_ORDERS','In der Sofort-Bestellung ausschließlich Lagerprodukte anzeigen?','0','boolean',760,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(582,1,'FCS_INCLUDE_STOCK_PRODUCTS_IN_INVOICES','Lagerprodukte in Rechnungen miteinbeziehen?','1','readonly',600,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(583,1,'FCS_REGISTRATION_NOTIFICATION_EMAILS','Wer soll bei neuen Registrierungen informiert werden?
Mehrere E-Mail-Adressen mit , (ohne Leerzeichen) trennen.
','fcs-demo-superadmin@mailinator.com','text',550,'de_DE','2019-03-05 20:08:00','2019-03-05 20:08:00'), -(584,1,'FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED','Selbstbedienungs-Modus für Lagerprodukte aktiv?
Zur Online-Doku
','0','boolean',3000,'de_DE','2019-04-17 20:01:59','2019-04-17 20:01:59'), -(585,1,'FCS_APP_ADDITIONAL_DATA','Zusätzliche Infos zur Foodcoop
Z.B. ZVR-Zahl
','','textarea',80,'de_DE','2019-08-03 20:07:17','2019-08-03 20:07:17'), -(586,1,'FCS_SELF_SERVICE_MODE_TEST_MODE_ENABLED','Selbstbedienungs-Modus im Test-Modus ausführen?
Keine Verlinkung im Haupt-Menü und bei Lagerprodukten.
','1','boolean',3100,'de_DE','2019-12-09 13:46:41','2019-12-09 13:46:41'), -(587,1,'FCS_CASHLESS_PAYMENT_ADD_TYPE','Art der Eintragung der Guthaben-Aufladungen
Wie gelangen die Guthaben-Aufladungen vom Bankkonto in den FoodCoopShop?
','manual','dropdown',1450,'de_DE','2020-02-11 10:13:10','2020-02-11 10:13:10'), -(589,1,'FCS_FEEDBACK_TO_PRODUCTS_ENABLED','Feedback-Funktion für Produkte aktiviert?
Mitglieder können Feedback zu bestellten Produkte verfassen.
','1','boolean',3200,'de_DE','2020-06-19 09:03:00','2020-06-19 09:03:00'), -(590,1,'FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY','Mitglied kann Abholtag beim Bestellen selbst auswählen.','0','readonly',590,'de_DE','2020-07-06 10:34:48','2020-07-06 10:34:48'), -(592,1,'FCS_SEND_INVOICES_TO_CUSTOMERS','Einzelhandels-Modus aktiviert?
Infos zur Verwendung im Einzelhandel
','0','readonly',580,'de_DE','2020-10-29 10:06:50','2020-10-29 10:06:50'), -(593,1,'FCS_DEPOSIT_TAX_RATE','Umsatzsteuersatz für Pfand','20,00','readonly',581,'de_DE','2020-11-03 15:24:12','2020-11-03 15:24:12'), -(594,1,'FCS_INVOICE_HEADER_TEXT','Header-Text für Rechnungen an Mitglieder','FoodCoop Test
Demostraße 4
A-4564 Demostadt
demo-foodcoop@maillinator.com','readonly',582,'de_DE','2020-11-03 15:24:12','2020-11-03 15:24:12'), -(595,1,'FCS_MEMBER_FEE_PRODUCTS','Welche Produkte werden als Mitgliedsbeitrag verwendet?
Die ausgewählten Produkte sind Datengrundlage der Spalte Mitgliedsbeitrag in der Mitgliederverwaltung und werden nicht in der Umsatzstatistik angezeigt.
','','multiple_dropdown',3300,'de_DE','2020-12-20 19:26:26','2020-12-20 19:26:26'), -(596,1,'FCS_CHECK_CREDIT_BALANCE_LIMIT','Ab welchem Guthaben-Stand soll die Erinnerungsmail versendet werden?','0','number',1450,'de_DE','2021-01-19 11:23:49','2021-01-19 11:23:49'), -(597,1,'FCS_PURCHASE_PRICE_ENABLED','Einkaufspreis für Produkte erfassen?
Der Einkaufspreis ist die Datengrundlage für die Gewinn-Statistik und für Lieferscheine an die Hersteller.
','0','readonly',587,'de_DE','2021-05-12 15:24:17','2021-05-12 15:24:17'), -(598,1,'FCS_HELLO_CASH_API_ENABLED','Schnittstelle (API) zu Registrierkasse HelloCash (hellocash.at) aktivieren?
Alle Rechnungen (bar und unbar) über die Registrierkasse erstellen.
','0','readonly',583,'de_DE','2021-07-07 10:55:14','2021-07-07 10:55:14'), -(599,1,'FCS_SAVE_STORAGE_LOCATION_FOR_PRODUCTS','Lagerort für Produkte erfassen und in Bestelllisten anzeigen?
Lagerorte: Keine Kühlung / Kühlschrank / Tiefkühler. Es erscheint ein zusätzlicher Button neben \"Bestellungen - Bestellungen als PDF generieren\"
','0','boolean',3210,'de_DE','2021-08-02 11:28:40','2021-08-02 11:28:40'), -(600,1,'FCS_INSTAGRAM_URL','Instagram-Url für die Einbindung im Footer','','text',920,'de_DE','2021-09-10 21:23:18','2021-09-10 21:23:18'), -(601,1,'FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY','Bestellungen beim ein- und zweiwöchigen Lieferhythmus sind nur in der Woche vor der Lieferung möglich.','0','boolean',3210,'de_DE','2022-02-01 17:48:46','2022-02-01 17:48:46'), -(602,1,'FCS_INVOICE_NUMBER_PREFIX','Präfix für Rechnungs-Nummernkreis
Max. 6 Zeichen inkl. Trennzeichen.
','','readonly',586,'de_DE','2022-03-21 12:03:07','2022-03-21 12:03:07'), -(603,1,'FCS_TAX_BASED_ON_NET_INVOICE_SUM','Rechnungslegung für pauschalierte Betriebe
Die Berechnung der Umsatzsteuer erfolgt auf Basis der Netto-Rechnungsumme und ist nicht die Summe der Umsatzsteuerbeträge pro Stück.
','0','readonly',585,'de_DE','2022-03-23 09:12:43','2022-03-23 09:12:43'), -(604,1,'FCS_NEWSLETTER_ENABLED','Newsletter-Funktion aktiv?
Mitglieder können sich bei der Registrierung für den Newsletter anmelden. Mehr Infos
','0','boolean',3400,'de_DE','2022-04-12 15:28:47','2022-04-12 15:28:47'), -(605,1,'FCS_USER_FEEDBACK_ENABLED','Mitglieder- und Hersteller-Feedback aktiv?
Ermöglicht das Erfassen und Anzeigen von Feedback. Mehr Infos
','0','boolean',3500,'de_DE','2022-07-19 14:39:45','2022-07-19 14:39:45'); -/*!40000 ALTER TABLE `fcs_configuration` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_cronjob_logs` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_cronjob_logs` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_cronjobs` DISABLE KEYS */; -INSERT INTO `fcs_cronjobs` VALUES -(1,'TestCronjob','day',NULL,NULL,'22:30:00',1), -(2,'TestCronjob','week',NULL,'Monday','09:00:00',1), -(3,'TestCronjob','month',11,NULL,'07:30:00',1); -/*!40000 ALTER TABLE `fcs_cronjobs` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_customer` DISABLE KEYS */; -INSERT INTO `fcs_customer` VALUES -(87,3,0,'Demo','Mitglied','fcs-demo-mitglied@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2014-12-02 12:19:31','2015-12-06 23:37:44',0,0,'SP',1,1,1,1,0), -(88,4,0,'Demo','Admin','fcs-demo-admin@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2014-12-02 12:28:43','2016-09-29 16:25:09',0,0,'SP',1,1,1,1,0), -(89,4,0,'Demo','Gemüse-Hersteller','fcs-demo-gemuese-hersteller@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:37:26','2015-03-11 18:12:10',0,0,'SP',1,1,1,1,0), -(90,4,0,'Demo','Milch-Hersteller','fcs-demo-milch-hersteller@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:37:49','2015-03-11 18:11:54',0,0,'SP',1,1,1,1,0), -(91,4,0,'Demo','Fleisch-Hersteller','fcs-demo-fleisch-hersteller@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:38:12','2015-03-11 18:11:47',0,0,'SP',1,1,1,1,0), -(92,5,0,'Demo','Superadmin','fcs-demo-superadmin@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2016-09-29 16:26:12','2016-09-29 16:26:12',0,0,'SP',1,1,1,1,0), -(93,2,0,'Demo','SB-Kunde','fcs-demo-sb-kunde@mailinator.com','$2y$10$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,0,'2016-09-29 16:26:12','2016-09-29 16:26:12',0,0,'SP',1,1,1,1,0); -/*!40000 ALTER TABLE `fcs_customer` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_deposits` DISABLE KEYS */; -INSERT INTO `fcs_deposits` VALUES -(1,346,0,0.5), -(2,0,9,0.5), -(3,0,10,0.5); -/*!40000 ALTER TABLE `fcs_deposits` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_feedbacks` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_feedbacks` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_images` DISABLE KEYS */; -INSERT INTO `fcs_images` VALUES -(154,60), -(156,340), -(157,338); -/*!40000 ALTER TABLE `fcs_images` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_invoice_taxes` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_invoice_taxes` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_invoices` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_invoices` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_manufacturer` DISABLE KEYS */; -INSERT INTO `fcs_manufacturer` VALUES -(4,'Demo Fleisch-Hersteller','

tests

\r\n','','2014-05-14 13:23:02','2015-05-15 13:31:41',1,0,'','','','','','','','','','',NULL,0,1,1,2,NULL,'testfcs1@mailinator.com,testfcs2@mailinator.com',NULL,NULL,NULL,1,NULL,0,0,0,'',1,0), -(5,'Demo Gemüse-Hersteller','

Gemüse-Hersteller Beschreibung lang

','
\r\n

Gemüse-Hersteller Beschreibung kurz

\r\n
','2014-05-14 13:36:44','2016-09-27 09:34:51',1,0,'','','','','','','','','','',88,0,1,1,1,NULL,'',NULL,NULL,NULL,NULL,'1',1,1,1,'',1,0), -(15,'Demo Milch-Hersteller','

Ja, ich bin der Milchhersteller!

','','2014-06-04 21:45:12','2016-03-07 09:02:25',1,0,'','','','','','','','','','',NULL,0,1,1,4,NULL,'test@test.at',NULL,NULL,NULL,NULL,NULL,0,0,0,'',1,1), -(16,'Hersteller ohne Customer-Eintrag','','','2014-06-04 21:45:12','2016-03-07 09:02:25',1,0,'','','','','','','','','','',NULL,10,1,1,1,NULL,'',NULL,NULL,NULL,NULL,NULL,0,0,0,'',1,0); -/*!40000 ALTER TABLE `fcs_manufacturer` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_order_detail` DISABLE KEYS */; -INSERT INTO `fcs_order_detail` VALUES -(1,346,0,'Artischocke : Stück',1,1.820000,1.650000,0.170000,0.170000,10.000,0.50,92,NULL,1,3,'2018-02-02','SP','2018-02-01 09:17:14','2021-05-04 11:10:14'), -(2,340,0,'Beuschl',1,4.540000,4.540000,0.000000,0.000000,0.000,0.00,92,NULL,2,3,'2018-02-02','SP','2018-02-01 09:17:14','2021-05-04 11:10:14'), -(3,60,10,'Milch : 0,5l',1,0.620000,0.550000,0.070000,0.070000,13.000,0.50,92,NULL,3,3,'2018-02-02','SP','2018-02-01 09:17:14','2021-05-04 11:10:14'); -/*!40000 ALTER TABLE `fcs_order_detail` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_order_detail_feedbacks` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_order_detail_feedbacks` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_order_detail_purchase_prices` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_order_detail_purchase_prices` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_order_detail_units` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_order_detail_units` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_pages` DISABLE KEYS */; -INSERT INTO `fcs_pages` VALUES -(3,'Page','',1,'header',1,'',88,0,'2016-08-29 13:36:43','2016-08-29 13:36:43',0,0,0,0); -/*!40000 ALTER TABLE `fcs_pages` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_payments` DISABLE KEYS */; -INSERT INTO `fcs_payments` VALUES -(1,92,0,'product',100.00,'','2018-07-03 20:00:20','2018-07-03 20:00:20',NULL,NULL,0,1,0,'',0,92), -(2,87,0,'product',100000.00,'','2020-12-09 20:00:20','2020-12-09 20:00:20',NULL,NULL,0,1,0,'',0,87); -/*!40000 ALTER TABLE `fcs_payments` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_pickup_days` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_pickup_days` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_product` DISABLE KEYS */; -INSERT INTO `fcs_product` VALUES -(60,15,3,1,0.909091,'Milch','','1 Liter','',0,0,1,'week',1,NULL,NULL,3,NULL,'2014-06-11 21:20:24','2014-12-14 19:47:33'), -(102,4,2,1,0.000000,'Frankfurter','','

2 Paar

','',0,0,1,'week',1,NULL,NULL,3,NULL,'2016-04-27 21:13:37','2014-09-19 14:32:51'), -(103,4,2,1,3.181819,'Bratwürstel','','2 Paar','',0,0,1,'week',1,NULL,NULL,3,NULL,'2016-05-05 08:28:49','2014-08-16 14:05:58'), -(163,5,0,1,1.363637,'Mangold','','0,25kg','',0,0,1,'week',1,NULL,NULL,3,NULL,'2014-07-12 20:41:43','2017-07-26 13:24:10'), -(339,5,0,1,0.000000,'Kartoffel','','','',0,0,1,'week',1,NULL,NULL,3,NULL,'2015-09-07 12:05:38','2015-02-26 13:54:07'), -(340,4,0,1,4.545455,'Beuschl','','','',0,0,1,'week',1,NULL,NULL,3,NULL,'2016-05-05 08:28:45','2015-06-23 14:52:53'), -(344,5,0,1,0.636364,'Knoblauch','','','100 g',0,0,1,'week',1,NULL,NULL,3,NULL,'2015-10-05 17:22:40','2015-07-06 10:24:44'), -(346,5,2,1,1.652893,'Artischocke','','','Stück',0,0,1,'week',1,NULL,NULL,3,NULL,'2015-08-19 09:35:46','2015-08-19 09:35:45'), -(347,4,2,1,0.000000,'Forelle','','','Stück',0,0,1,'week',1,NULL,NULL,3,NULL,'2018-05-17 16:13:39','2018-05-17 16:15:21'), -(348,4,2,1,0.000000,'Rindfleisch','','','',0,0,1,'week',1,NULL,NULL,3,NULL,'2018-05-17 16:15:33','2018-05-17 16:16:38'), -(349,5,2,1,4.545455,'Lagerprodukt','','','',0,1,1,'week',1,NULL,NULL,3,NULL,'2018-08-16 12:15:48','2018-08-16 12:16:51'), -(350,5,2,1,0.000000,'Lagerprodukt mit Varianten','','','',0,1,1,'week',1,NULL,NULL,3,NULL,'2018-08-16 12:19:06','2018-08-16 12:19:23'), -(351,5,1,1,0.000000,'Lagerprodukt 2','','','',0,1,1,'week',1,NULL,NULL,3,NULL,'2019-06-05 15:09:53','2019-06-05 15:10:08'); -/*!40000 ALTER TABLE `fcs_product` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_product_attribute` DISABLE KEYS */; -INSERT INTO `fcs_product_attribute` VALUES -(10,60,0.545455,0), -(11,348,0.000000,1), -(12,348,0.000000,0), -(13,350,1.818182,1), -(14,350,3.636364,0), -(15,350,0.000000,0); -/*!40000 ALTER TABLE `fcs_product_attribute` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_product_attribute_combination` DISABLE KEYS */; -INSERT INTO `fcs_product_attribute_combination` VALUES -(33,10), -(36,11), -(35,12), -(36,13), -(35,14), -(36,15); -/*!40000 ALTER TABLE `fcs_product_attribute_combination` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_purchase_prices` DISABLE KEYS */; -INSERT INTO `fcs_purchase_prices` VALUES -(1,346,0,1,1.200000), -(2,0,13,0,1.400000), -(3,347,0,3,NULL), -(4,348,0,3,NULL), -(5,60,0,2,NULL), -(6,0,10,0,0.250000), -(7,163,0,0,1.072727); -/*!40000 ALTER TABLE `fcs_purchase_prices` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_sliders` DISABLE KEYS */; -INSERT INTO `fcs_sliders` VALUES -(6,'demo-slider.jpg',NULL,0,0,1); -/*!40000 ALTER TABLE `fcs_sliders` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_stock_available` DISABLE KEYS */; -INSERT INTO `fcs_stock_available` VALUES -(132,60,0,1015,0,NULL,1,NULL), -(195,102,0,2996,0,NULL,1,NULL), -(196,103,0,990,0,NULL,1,NULL), -(318,163,0,988,0,NULL,1,NULL), -(674,339,0,2959,0,NULL,1,NULL), -(678,340,0,990,0,NULL,1,NULL), -(680,344,0,78,0,NULL,0,NULL), -(686,346,0,97,0,NULL,0,NULL), -(692,60,9,996,0,NULL,1,NULL), -(693,60,10,19,0,NULL,0,NULL), -(704,347,0,999,0,NULL,1,NULL), -(705,348,0,1998,0,NULL,1,NULL), -(706,348,11,999,0,NULL,1,NULL), -(707,348,12,999,0,NULL,1,NULL), -(708,349,0,5,-5,0,0,NULL), -(709,350,0,1004,0,NULL,1,NULL), -(710,350,13,5,-5,0,0,NULL), -(711,350,14,999,0,NULL,1,NULL), -(712,350,15,999,0,NULL,1,NULL), -(713,351,0,999,0,NULL,1,NULL); -/*!40000 ALTER TABLE `fcs_stock_available` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_storage_locations` DISABLE KEYS */; -INSERT INTO `fcs_storage_locations` VALUES -(1,'Keine Kühlung',10), -(2,'Kühlschrank',20), -(3,'Tiefkühler',30); -/*!40000 ALTER TABLE `fcs_storage_locations` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_sync_domains` DISABLE KEYS */; -INSERT INTO `fcs_sync_domains` VALUES -(1,'{{serverName}}',1); -/*!40000 ALTER TABLE `fcs_sync_domains` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_sync_products` DISABLE KEYS */; -INSERT INTO `fcs_sync_products` VALUES -(1,1,346,346,0,0), -(2,1,350,350,0,0), -(3,1,350,350,14,14), -(4,1,350,350,13,13); -/*!40000 ALTER TABLE `fcs_sync_products` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_tax` DISABLE KEYS */; -INSERT INTO `fcs_tax` VALUES -(1,20.000,1,0), -(2,10.000,1,0), -(3,13.000,1,0); -/*!40000 ALTER TABLE `fcs_tax` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_units` DISABLE KEYS */; -INSERT INTO `fcs_units` VALUES -(1,347,0,1.50,0.98,'g',100,1,350.000), -(2,0,11,20.00,NULL,'kg',1,1,0.500), -(3,0,12,20.00,14.00,'g',500,1,300.000), -(4,349,0,0.00,NULL,'kg',1,0,0.000), -(5,0,13,0.00,NULL,'kg',1,0,0.000), -(6,0,14,0.00,NULL,'kg',1,0,0.000), -(7,0,15,10.00,6.00,'kg',1,1,0.500), -(8,351,0,15.00,NULL,'kg',1,1,1.000); -/*!40000 ALTER TABLE `fcs_units` ENABLE KEYS */; - -/*!40000 ALTER TABLE `phinxlog` DISABLE KEYS */; -INSERT INTO `phinxlog` VALUES -(20200404145856,'RemoveV2Migrations','2020-04-04 15:01:12','2020-04-04 15:01:12',0), -(20200415073329,'ShowNewProductsOnHome','2020-04-15 07:42:02','2020-04-15 07:42:02',0), -(20200501192722,'EnableCashlessPaymentAddTypeConfiguration','2020-05-01 19:30:17','2020-05-01 19:30:17',0), -(20200618063024,'AddProductFeedback','2020-06-19 07:02:54','2020-06-19 07:02:55',0), -(20200703072605,'CustomerCanSelectPickupDay','2020-07-06 08:34:44','2020-07-06 08:34:44',0), -(20200831142250,'RemoveEmailLogTable','2020-08-31 15:10:29','2020-08-31 15:10:29',0), -(20200910091755,'AddMemberSettingUseCameraForMobileBarcodeScanning','2020-09-10 09:21:00','2020-09-10 09:21:00',0), -(20200925073919,'GermanIbanFix','2020-09-25 08:12:53','2020-09-25 08:12:53',0), -(20201017182431,'AdaptMinimalCreditBalance','2020-10-17 18:38:11','2020-10-17 18:38:11',0), -(20201029084931,'AddRetailMode','2020-10-29 09:06:50','2020-10-29 09:06:50',0), -(20201029084932,'AddRetailMode','2020-11-09 10:31:46','2020-11-09 10:31:47',0), -(20201118084516,'AddRetailMode2','2020-11-18 08:47:48','2020-11-18 08:47:48',0), -(20201213120713,'AddRetailMode3','2020-12-13 12:14:11','2020-12-13 12:14:11',0), -(20201217101514,'SliderWithLink','2020-12-17 10:26:47','2020-12-17 10:26:47',0), -(20201217101515,'SliderWithLink','2020-12-17 18:47:08','2020-12-17 18:47:08',0), -(20201220182015,'ImproveMemberFeeAdministration','2020-12-20 18:26:26','2020-12-20 18:26:26',0), -(20210119101923,'CheckCreditBalanceLimit','2021-01-19 10:23:49','2021-01-19 10:23:49',0), -(20210401071718,'RemoveCustomerGroupSetting','2021-04-01 07:18:55','2021-04-01 07:18:55',0), -(20210401082727,'CustomerActivateEmailCode','2021-04-01 08:29:23','2021-04-01 08:29:23',0), -(20210419084816,'BlogPostShowOnStartPageUntilDate','2021-04-19 09:41:23','2021-04-19 09:41:24',0), -(20210427144234,'RemoveOldMemberFeeSetting','2021-04-27 15:05:04','2021-04-27 15:05:04',0), -(20210504085123,'SaveTaxInOrderDetails','2021-05-04 09:10:14','2021-05-04 09:10:14',0), -(20210510080630,'EnablePurchasePrices','2021-05-12 13:24:17','2021-05-12 13:24:18',0), -(20210707083827,'AddRegistrierkasseApi','2021-07-07 08:55:14','2021-07-07 08:55:14',0), -(20210802090623,'AddStorageLocation','2021-08-02 09:28:40','2021-08-02 09:28:40',0), -(20210910191430,'Instagram','2021-09-10 19:23:18','2021-09-10 19:23:18',0), -(20210914071747,'DifferentPricesForCustomers','2021-09-16 05:50:12','2021-09-16 05:50:12',0), -(20210922154148,'RemoveUnusedQueueTable','2021-09-22 15:43:09','2021-09-22 15:43:09',0), -(20210923073422,'RemoveSettingShowNewProductsOnHome','2021-09-23 07:39:32','2021-09-23 07:39:32',0), -(20210923090820,'AllowNullAsPurchasePrice','2021-09-23 09:09:52','2021-09-23 09:09:52',0), -(20211028083847,'UseExistingBarcode','2021-10-28 08:45:02','2021-10-28 08:45:02',0), -(20211123095227,'DeactivateCheckCreditReminder','2021-11-23 10:01:05','2021-11-23 10:01:05',0), -(20211213081433,'ImproveCustomerNotifications','2021-12-13 09:24:45','2021-12-13 09:24:46',0), -(20211213081434,'ImproveCustomerNotifications','2021-12-13 10:44:55','2021-12-13 10:44:55',0), -(20211215184633,'ManufacturerSettingIncludeStockProductsOnOrderList','2021-12-15 18:51:00','2021-12-15 18:51:00',0), -(20211229194617,'AddIndizesForBetterPerformance','2021-12-29 19:53:31','2021-12-29 19:53:31',0), -(20220129082136,'SendDeliveryNotesEveryMonth','2022-01-29 08:32:01','2022-01-29 08:32:02',0), -(20220201163254,'OptionalDeliveryRhythmSettingOrderInWeekBeforeDelivery','2022-02-01 16:48:46','2022-02-01 16:48:46',0), -(20220321103059,'PrefixForInvoices','2022-03-21 11:03:07','2022-03-21 11:03:07',0), -(20220323075926,'TaxBasedOnNetInvoiceSum','2022-03-23 08:12:43','2022-03-23 08:12:43',0), -(20220407093247,'AddIsCompanyFieldForCustomer','2022-04-07 09:37:45','2022-04-07 09:37:45',0), -(20220412131842,'Newsletter','2022-04-12 13:29:05','2022-04-12 13:29:05',0), -(20220525092822,'BiggerQueuedJobDataField','2022-05-25 09:32:10','2022-05-25 09:32:10',0), -(20220620091755,'RemoveTimebasedCurrencyModule','2022-06-20 09:30:39','2022-06-20 09:30:39',0), -(20220717194215,'UserFeedback','2022-07-19 12:39:45','2022-07-19 12:39:45',0); -/*!40000 ALTER TABLE `phinxlog` ENABLE KEYS */; - -/*!40000 ALTER TABLE `queue_phinxlog` DISABLE KEYS */; -INSERT INTO `queue_phinxlog` VALUES -(20150425180802,'Init','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20150511062806,'Fixmissing','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20150911132343,'ImprovementsForMysql','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20161319000000,'IncreaseDataSize','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20161319000001,'Priority','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20161319000002,'Rename','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20161319000003,'Processes','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20171013131845,'AlterQueuedJobs','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20171013133145,'Utf8mb4Fix','2020-09-17 07:23:31','2020-09-17 07:23:31',0), -(20171019083500,'ColumnLength','2020-09-17 07:23:31','2020-09-17 07:23:32',0), -(20171019083501,'MigrationQueueNull','2020-09-17 07:23:32','2020-09-17 07:23:32',0), -(20171019083502,'MigrationQueueStatus','2020-09-17 07:23:32','2020-09-17 07:23:32',0), -(20171019083503,'MigrationQueueProcesses','2020-09-17 07:23:32','2020-09-17 07:23:32',0), -(20171019083505,'MigrationQueueProcessesIndex','2020-09-17 07:23:32','2020-09-17 07:23:32',0), -(20171019083506,'MigrationQueueProcessesKey','2020-09-17 07:23:32','2020-09-17 07:23:32',0), -(20191319000002,'MigrationQueueRename','2021-07-20 11:13:02','2021-07-20 11:13:02',0); -/*!40000 ALTER TABLE `queue_phinxlog` ENABLE KEYS */; - -/*!40000 ALTER TABLE `queue_processes` DISABLE KEYS */; -/*!40000 ALTER TABLE `queue_processes` ENABLE KEYS */; - -/*!40000 ALTER TABLE `queued_jobs` DISABLE KEYS */; -/*!40000 ALTER TABLE `queued_jobs` ENABLE KEYS */; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - From c4fc6da1a1b574ed355dd97219d2680468e2957e Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sat, 1 Oct 2022 20:12:28 +0000 Subject: [PATCH 126/646] resolve error on gitpod --- templates/element/layout/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/element/layout/header.php b/templates/element/layout/header.php index 6a41db0410..ec7f2672a3 100644 --- a/templates/element/layout/header.php +++ b/templates/element/layout/header.php @@ -41,7 +41,7 @@ - + From a0baf0b9587c8cb7cb0f799759a50074cc2b785b Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 2 Oct 2022 20:10:25 +0200 Subject: [PATCH 127/646] tmpfs smaller --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1b1a2b0304..8493abbd93 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,7 +43,7 @@ services: image: mysql:8.0 container_name: fcs-database-test restart: always - tmpfs: /var/lib/mysql:exec,size=1G + tmpfs: /var/lib/mysql:exec,size=256M ports: - '3311:3306' environment: From 8cac68ed9d754458e2bee5435725d720eb62497e Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 2 Oct 2022 20:15:25 +0200 Subject: [PATCH 128/646] remove non existing option --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8493abbd93..5bb4843236 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -94,7 +94,7 @@ services: container_name: fcs-composer image: composer:latest user: ${CURRENT_UID} - entrypoint: ['composer', '--ignore-platform-reqs'] + entrypoint: ['composer'] working_dir: /var/www/html volumes: - ./:/var/www/html From ae8df9e5787288dff347b54d04ad4a1735de8b07 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 2 Oct 2022 20:35:57 +0200 Subject: [PATCH 129/646] gitpod fix --- devtools/init-dev-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index f433fb9690..86f5bc45f0 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -2,7 +2,7 @@ CURRENT_UID=$(id -u):$(id -g) docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ./config/sql/_installation/clean-db-structure.sql CURRENT_UID=$(id -u):$(id -g) docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ./tests/config/sql/test-db-data.sql -CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install +CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install --ignore-platform-reqs bash ./devtools/setup-dev/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh docker compose run -w /var/www/html/webroot --rm node npm install From fa35f3ce88e4b3815f67df4b6ac09a90a21087a7 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 2 Oct 2022 20:53:02 +0200 Subject: [PATCH 130/646] forceEnable debugkit --- src/Application.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Application.php b/src/Application.php index 8af52ae343..aca3919163 100644 --- a/src/Application.php +++ b/src/Application.php @@ -43,6 +43,7 @@ public function bootstrap(): void // Call parent to load bootstrap from files. parent::bootstrap(); if (Configure::read('debug')) { + Configure::write('DebugKit.forceEnable', true); $this->addPlugin('DebugKit', ['bootstrap' => true]); } From 94d52bcb8bbf73976a98d7fbff626fbaba777d72 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 2 Oct 2022 22:46:34 +0200 Subject: [PATCH 131/646] Revert "remove non existing option" This reverts commit 8cac68ed9d754458e2bee5435725d720eb62497e. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5bb4843236..8493abbd93 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -94,7 +94,7 @@ services: container_name: fcs-composer image: composer:latest user: ${CURRENT_UID} - entrypoint: ['composer'] + entrypoint: ['composer', '--ignore-platform-reqs'] working_dir: /var/www/html volumes: - ./:/var/www/html From adfaeb557d9084765cfe9f255a5afff895a2a5b7 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 2 Oct 2022 22:47:04 +0200 Subject: [PATCH 132/646] revert --- devtools/init-dev-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index 86f5bc45f0..f433fb9690 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -2,7 +2,7 @@ CURRENT_UID=$(id -u):$(id -g) docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ./config/sql/_installation/clean-db-structure.sql CURRENT_UID=$(id -u):$(id -g) docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ./tests/config/sql/test-db-data.sql -CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install --ignore-platform-reqs +CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install bash ./devtools/setup-dev/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh docker compose run -w /var/www/html/webroot --rm node npm install From e4596f14a6a2e080a7cacee963f4ce01ab2e8cbb Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 2 Oct 2022 23:01:52 +0200 Subject: [PATCH 133/646] vendor updates --- composer.lock | 88 +++++++++---------- plugins/Admin/templates/layout/default.php | 4 +- webroot/js/ckeditor/config-big.js | 2 +- .../js/ckeditor/config-small-with-upload.js | 2 +- webroot/js/ckeditor/config.js | 2 +- webroot/js/helper.js | 6 +- webroot/package-lock.json | 26 +++--- webroot/package.json | 4 +- 8 files changed, 68 insertions(+), 66 deletions(-) diff --git a/composer.lock b/composer.lock index 18c19cb3aa..36afce3994 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "cakephp/cakephp", - "version": "4.4.5", + "version": "4.4.6", "source": { "type": "git", "url": "https://github.com/cakephp/cakephp.git", - "reference": "45c91d7ed8a8804d20daf2e001e8e2b292aed77d" + "reference": "074248ad68fb6669e951862d0f2f82a0d7c99b23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/cakephp/zipball/45c91d7ed8a8804d20daf2e001e8e2b292aed77d", - "reference": "45c91d7ed8a8804d20daf2e001e8e2b292aed77d", + "url": "https://api.github.com/repos/cakephp/cakephp/zipball/074248ad68fb6669e951862d0f2f82a0d7c99b23", + "reference": "074248ad68fb6669e951862d0f2f82a0d7c99b23", "shasum": "" }, "require": { @@ -108,7 +108,7 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/cakephp" }, - "time": "2022-08-29T00:25:46+00:00" + "time": "2022-10-01T23:52:05+00:00" }, { "name": "cakephp/chronos", @@ -656,16 +656,16 @@ }, { "name": "hisorange/browser-detect", - "version": "4.5.2", + "version": "4.5.3", "source": { "type": "git", "url": "https://github.com/hisorange/browser-detect.git", - "reference": "701b1f15be45118f126266166f6beea351296452" + "reference": "2a54d202491edda3c6a8c5bb2eeacb7191430769" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hisorange/browser-detect/zipball/701b1f15be45118f126266166f6beea351296452", - "reference": "701b1f15be45118f126266166f6beea351296452", + "url": "https://api.github.com/repos/hisorange/browser-detect/zipball/2a54d202491edda3c6a8c5bb2eeacb7191430769", + "reference": "2a54d202491edda3c6a8c5bb2eeacb7191430769", "shasum": "" }, "require": { @@ -725,9 +725,9 @@ ], "support": { "issues": "https://github.com/hisorange/browser-detect/issues", - "source": "https://github.com/hisorange/browser-detect/tree/4.5.2" + "source": "https://github.com/hisorange/browser-detect/tree/4.5.3" }, - "time": "2022-07-12T10:31:47+00:00" + "time": "2022-09-28T20:23:32+00:00" }, { "name": "ifsnop/mysqldump-php", @@ -2793,16 +2793,16 @@ }, { "name": "symfony/console", - "version": "v6.1.4", + "version": "v6.1.5", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "7fccea8728aa2d431a6725b02b3ce759049fc84d" + "reference": "17524a64ebcfab68d237bbed247e9a9917747096" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/7fccea8728aa2d431a6725b02b3ce759049fc84d", - "reference": "7fccea8728aa2d431a6725b02b3ce759049fc84d", + "url": "https://api.github.com/repos/symfony/console/zipball/17524a64ebcfab68d237bbed247e9a9917747096", + "reference": "17524a64ebcfab68d237bbed247e9a9917747096", "shasum": "" }, "require": { @@ -2869,7 +2869,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.1.4" + "source": "https://github.com/symfony/console/tree/v6.1.5" }, "funding": [ { @@ -2885,7 +2885,7 @@ "type": "tidelift" } ], - "time": "2022-08-26T10:32:31+00:00" + "time": "2022-09-03T14:24:42+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2956,16 +2956,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.1.4", + "version": "v6.1.5", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "3f39c04d2630c34019907b02f85672dac99f8659" + "reference": "4d216a2beef096edf040a070117c39ca2abce307" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/3f39c04d2630c34019907b02f85672dac99f8659", - "reference": "3f39c04d2630c34019907b02f85672dac99f8659", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/4d216a2beef096edf040a070117c39ca2abce307", + "reference": "4d216a2beef096edf040a070117c39ca2abce307", "shasum": "" }, "require": { @@ -2999,7 +2999,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.1.4" + "source": "https://github.com/symfony/filesystem/tree/v6.1.5" }, "funding": [ { @@ -3015,7 +3015,7 @@ "type": "tidelift" } ], - "time": "2022-08-02T16:17:38+00:00" + "time": "2022-09-21T20:29:40+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3434,16 +3434,16 @@ }, { "name": "symfony/string", - "version": "v6.1.4", + "version": "v6.1.5", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "290972cad7b364e3befaa74ba0ec729800fb161c" + "reference": "17c08b068176996a1d7db8d00ffae3c248267016" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/290972cad7b364e3befaa74ba0ec729800fb161c", - "reference": "290972cad7b364e3befaa74ba0ec729800fb161c", + "url": "https://api.github.com/repos/symfony/string/zipball/17c08b068176996a1d7db8d00ffae3c248267016", + "reference": "17c08b068176996a1d7db8d00ffae3c248267016", "shasum": "" }, "require": { @@ -3499,7 +3499,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.1.4" + "source": "https://github.com/symfony/string/tree/v6.1.5" }, "funding": [ { @@ -3515,7 +3515,7 @@ "type": "tidelift" } ], - "time": "2022-08-12T18:05:43+00:00" + "time": "2022-09-02T08:05:20+00:00" }, { "name": "tecnickcom/tcpdf", @@ -6634,16 +6634,16 @@ }, { "name": "slevomat/coding-standard", - "version": "8.5.1", + "version": "8.5.2", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "971f489404350bf4608b7e59381e603c47700366" + "reference": "f32937dc41b587f3500efed1dbca2f82aa519373" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/971f489404350bf4608b7e59381e603c47700366", - "reference": "971f489404350bf4608b7e59381e603c47700366", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/f32937dc41b587f3500efed1dbca2f82aa519373", + "reference": "f32937dc41b587f3500efed1dbca2f82aa519373", "shasum": "" }, "require": { @@ -6655,11 +6655,11 @@ "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.10|1.8.5", + "phpstan/phpstan": "1.4.10|1.8.6", "phpstan/phpstan-deprecation-rules": "1.0.0", "phpstan/phpstan-phpunit": "1.0.0|1.1.1", - "phpstan/phpstan-strict-rules": "1.4.3", - "phpunit/phpunit": "7.5.20|8.5.21|9.5.24" + "phpstan/phpstan-strict-rules": "1.4.4", + "phpunit/phpunit": "7.5.20|8.5.21|9.5.25" }, "type": "phpcodesniffer-standard", "extra": { @@ -6679,7 +6679,7 @@ "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.5.1" + "source": "https://github.com/slevomat/coding-standard/tree/8.5.2" }, "funding": [ { @@ -6691,7 +6691,7 @@ "type": "tidelift" } ], - "time": "2022-09-23T05:34:53+00:00" + "time": "2022-09-27T16:45:37+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -7038,16 +7038,16 @@ }, { "name": "symfony/var-dumper", - "version": "v6.1.3", + "version": "v6.1.5", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "d5a5e44a2260c5eb5e746bf4f1fbd12ee6ceb427" + "reference": "d0833493fb2413a86f522fb54a1896a7718e98ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d5a5e44a2260c5eb5e746bf4f1fbd12ee6ceb427", - "reference": "d5a5e44a2260c5eb5e746bf4f1fbd12ee6ceb427", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d0833493fb2413a86f522fb54a1896a7718e98ec", + "reference": "d0833493fb2413a86f522fb54a1896a7718e98ec", "shasum": "" }, "require": { @@ -7106,7 +7106,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.1.3" + "source": "https://github.com/symfony/var-dumper/tree/v6.1.5" }, "funding": [ { @@ -7122,7 +7122,7 @@ "type": "tidelift" } ], - "time": "2022-07-20T13:46:29+00:00" + "time": "2022-09-08T09:34:40+00:00" }, { "name": "theseer/tokenizer", diff --git a/plugins/Admin/templates/layout/default.php b/plugins/Admin/templates/layout/default.php index 1b551e7f7b..7e767a6fcb 100644 --- a/plugins/Admin/templates/layout/default.php +++ b/plugins/Admin/templates/layout/default.php @@ -89,8 +89,8 @@ ); } -echo $this->Html->script('/node_modules/ckeditor4/ckeditor.js?v4.19.1'); -echo $this->Html->script('/node_modules/ckeditor4/adapters/jquery.js?v4.19.1'); +echo $this->Html->script('/node_modules/ckeditor4/ckeditor.js?v4.20.0'); +echo $this->Html->script('/node_modules/ckeditor4/adapters/jquery.js?v4.20.0'); $scripts = $this->fetch('script'); if ($scripts != '') { diff --git a/webroot/js/ckeditor/config-big.js b/webroot/js/ckeditor/config-big.js index 7751274145..285d8d8eab 100644 --- a/webroot/js/ckeditor/config-big.js +++ b/webroot/js/ckeditor/config-big.js @@ -42,5 +42,5 @@ CKEDITOR.editorConfig = function ( config ) { }; -CKEDITOR.timestamp = 'v4.19.1'; // change this string if version is updated in package.json +CKEDITOR.timestamp = 'v4.20.0'; // change this string if version is updated in package.json diff --git a/webroot/js/ckeditor/config-small-with-upload.js b/webroot/js/ckeditor/config-small-with-upload.js index e3be2fa804..3b08ecf53c 100644 --- a/webroot/js/ckeditor/config-small-with-upload.js +++ b/webroot/js/ckeditor/config-small-with-upload.js @@ -37,4 +37,4 @@ CKEDITOR.editorConfig = function ( config ) { }; -CKEDITOR.timestamp = 'v4.19.1'; // change this string if version is updated in package.json +CKEDITOR.timestamp = 'v4.20.0'; // change this string if version is updated in package.json diff --git a/webroot/js/ckeditor/config.js b/webroot/js/ckeditor/config.js index b525fc4ab0..c0c1a233c2 100644 --- a/webroot/js/ckeditor/config.js +++ b/webroot/js/ckeditor/config.js @@ -29,5 +29,5 @@ CKEDITOR.editorConfig = function ( config ) { }; -CKEDITOR.timestamp = 'v4.19.1'; // change this string if version is updated in package.json +CKEDITOR.timestamp = 'v4.20.0'; // change this string if version is updated in package.json diff --git a/webroot/js/helper.js b/webroot/js/helper.js index 8a1a4ef4e6..40ed9a0718 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -810,7 +810,7 @@ foodcoopshop.Helper = { this.destroyCkeditor(name); - CKEDITOR.timestamp = 'v4.19.1'; + CKEDITOR.timestamp = 'v4.20.0'; $('textarea#' + name + '.ckeditor').ckeditor({ customConfig: '/js/ckeditor/config.js', startupFocus : startupFocus @@ -839,7 +839,7 @@ foodcoopshop.Helper = { this.destroyCkeditor(name); - CKEDITOR.timestamp = 'v4.19.1'; + CKEDITOR.timestamp = 'v4.20.0'; $('textarea#' + name + '.ckeditor').ckeditor({ customConfig: '/js/ckeditor/config-big.js' }); @@ -854,7 +854,7 @@ foodcoopshop.Helper = { this.destroyCkeditor(name); - CKEDITOR.timestamp = 'v4.19.1'; + CKEDITOR.timestamp = 'v4.20.0'; $('textarea#' + name + '.ckeditor').ckeditor({ customConfig: '/js/ckeditor/config-small-with-upload.js' }); diff --git a/webroot/package-lock.json b/webroot/package-lock.json index 00d7197a24..a2fcc9d032 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -8,7 +8,7 @@ "hasInstallScript": true, "license": "AGPL-3.0", "dependencies": { - "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", + "@beyonk/gdpr-cookie-consent-banner": "^9.0.4", "@ericblade/quagga2": "^1.7.4", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", @@ -16,7 +16,7 @@ "bootstrap-select": "^1.14.0-beta3", "chart.js": "^3.9.1", "chartjs-plugin-datalabels": "^2.1.0", - "ckeditor4": "^4.19.1", + "ckeditor4": "^4.20.0", "clean-css-cli": "^5.6.1", "clipboard": "^2.0.11", "jquery": "^3.6.1", @@ -46,8 +46,9 @@ } }, "node_modules/@beyonk/gdpr-cookie-consent-banner": { - "version": "9.0.3", - "integrity": "sha512-9rno8oVhhMZNWMslkfOISr31pYZy5OKEr8393nUn7DdLRNveu2r6eoNeeTabY2WSzWagySt+IIrspHxT3PAqXQ==", + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/@beyonk/gdpr-cookie-consent-banner/-/gdpr-cookie-consent-banner-9.0.4.tgz", + "integrity": "sha512-8rs38BbzTIRNVz043EPstVqsxTVOfVczQMpHDeGlWF1BVKaqs1k4pufNDcw5FUKQxoOkdGF32EK+2UxNx15YBA==", "dependencies": { "js-cookie": "^3.0.1" } @@ -288,9 +289,9 @@ } }, "node_modules/ckeditor4": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/ckeditor4/-/ckeditor4-4.19.1.tgz", - "integrity": "sha512-eK/tilHSUpLc9mrD7Lvt07LJfJ13BBa4ftxJBxIX49sGMlWg5WaB81C+MRBZwnntcfpjVdyCLpZAptAHTDB65Q==" + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/ckeditor4/-/ckeditor4-4.20.0.tgz", + "integrity": "sha512-Wa7OzaRXN6qRQ0IxIcX4CjZ5qxNlNqIbdQnBf9sxVEx22kTTsAaE5ePT+TpME0rJhLdCwAIRnbjRCJoGcp05oA==" }, "node_modules/clean-css": { "version": "5.3.1", @@ -1149,8 +1150,9 @@ } }, "@beyonk/gdpr-cookie-consent-banner": { - "version": "9.0.3", - "integrity": "sha512-9rno8oVhhMZNWMslkfOISr31pYZy5OKEr8393nUn7DdLRNveu2r6eoNeeTabY2WSzWagySt+IIrspHxT3PAqXQ==", + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/@beyonk/gdpr-cookie-consent-banner/-/gdpr-cookie-consent-banner-9.0.4.tgz", + "integrity": "sha512-8rs38BbzTIRNVz043EPstVqsxTVOfVczQMpHDeGlWF1BVKaqs1k4pufNDcw5FUKQxoOkdGF32EK+2UxNx15YBA==", "requires": { "js-cookie": "^3.0.1" } @@ -1325,9 +1327,9 @@ } }, "ckeditor4": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/ckeditor4/-/ckeditor4-4.19.1.tgz", - "integrity": "sha512-eK/tilHSUpLc9mrD7Lvt07LJfJ13BBa4ftxJBxIX49sGMlWg5WaB81C+MRBZwnntcfpjVdyCLpZAptAHTDB65Q==" + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/ckeditor4/-/ckeditor4-4.20.0.tgz", + "integrity": "sha512-Wa7OzaRXN6qRQ0IxIcX4CjZ5qxNlNqIbdQnBf9sxVEx22kTTsAaE5ePT+TpME0rJhLdCwAIRnbjRCJoGcp05oA==" }, "clean-css": { "version": "5.3.1", diff --git a/webroot/package.json b/webroot/package.json index a8f68deb21..7bd08197c3 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -14,7 +14,7 @@ "install": "bash ../devtools/npm-post-install.sh" }, "dependencies": { - "@beyonk/gdpr-cookie-consent-banner": "^9.0.3", + "@beyonk/gdpr-cookie-consent-banner": "^9.0.4", "@ericblade/quagga2": "^1.7.4", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", @@ -22,7 +22,7 @@ "bootstrap-select": "^1.14.0-beta3", "chart.js": "^3.9.1", "chartjs-plugin-datalabels": "^2.1.0", - "ckeditor4": "^4.19.1", + "ckeditor4": "^4.20.0", "clean-css-cli": "^5.6.1", "clipboard": "^2.0.11", "jquery": "^3.6.1", From 95c50ba32a8d4e827915c68daa46ee5e95e3ee67 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 3 Oct 2022 07:21:41 +0200 Subject: [PATCH 134/646] add helloCash info --- templates/element/legal/de_DE/privacyPolicy.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/element/legal/de_DE/privacyPolicy.php b/templates/element/legal/de_DE/privacyPolicy.php index 083b4374bd..09b7ea0def 100644 --- a/templates/element/legal/de_DE/privacyPolicy.php +++ b/templates/element/legal/de_DE/privacyPolicy.php @@ -164,3 +164,8 @@

3.4.6 Auskunftsrecht

Das Mitglied hat jederzeit das Recht auf kostenlose Auskunft.

+ + +

3.4.7 Datenweitergabe an helloCash

+

Die personenbezogenen Daten der Mitglieder werden zum Zweck der Rechnungs- bzw. Belegerstellung an helloCash (www.hellocash.at) übermittelt. Zur Datenschutzerklärung von helloCash.

+ From aec1973a32d39f6fb6214d02412b0c1dc7c58e6b Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 3 Oct 2022 07:52:15 +0200 Subject: [PATCH 135/646] add hostname as prefix in database backup file --- src/Shell/BackupDatabaseShell.php | 7 ++++++- src/View/Helper/MyHtmlHelper.php | 9 +++++++++ templates/layout/email/html/default.php | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/Shell/BackupDatabaseShell.php b/src/Shell/BackupDatabaseShell.php index e7d916d2b0..3400f7ec69 100644 --- a/src/Shell/BackupDatabaseShell.php +++ b/src/Shell/BackupDatabaseShell.php @@ -16,10 +16,12 @@ namespace App\Shell; use Cake\Mailer\Mailer; +use Cake\Utility\Inflector; use Cake\Core\Configure; use Cake\Datasource\ConnectionManager; use Cake\I18n\Number; use Ifsnop\Mysqldump as IMysqldump; +use App\Controller\Component\StringComponent; class BackupDatabaseShell extends AppShell { @@ -38,7 +40,10 @@ public function main() $dbConfig = ConnectionManager::getConfig('default'); $backupdir = ROOT . DS . 'files_private' . DS . 'db-backups'; - $filename = $backupdir . DS . 'db-backup-' . date('Y-m-d_H-i-s', time()) . '.bz2'; + $preparedHostWithoutProtocol = Configure::read('app.htmlHelper')->getHostWithoutProtocol(Configure::read('app.cakeServerName')); + $preparedHostWithoutProtocol = str_replace('www.', '', $preparedHostWithoutProtocol); + $preparedHostWithoutProtocol = StringComponent::slugify($preparedHostWithoutProtocol); + $filename = $backupdir . DS . $preparedHostWithoutProtocol . '-' . date('Y-m-d_H-i-s', time()) . '.bz2'; if (! is_dir($backupdir)) { $this->out(' ', 1); diff --git a/src/View/Helper/MyHtmlHelper.php b/src/View/Helper/MyHtmlHelper.php index e3cb53fd4f..020bb912af 100644 --- a/src/View/Helper/MyHtmlHelper.php +++ b/src/View/Helper/MyHtmlHelper.php @@ -35,6 +35,15 @@ public function __construct(View $View, array $config = []) parent::__construct($View, $config); } + public function getHostWithoutProtocol($hostnameWithProtocol) + { + $parsedHostnameWithProtocol = (parse_url($hostnameWithProtocol)); + if (!empty($parsedHostnameWithProtocol['host'])) { + return $parsedHostnameWithProtocol['host']; + } + return false; + } + public function buildElementProductCacheKey($product, $appAuth) { $elementCacheKey = join('_', [ diff --git a/templates/layout/email/html/default.php b/templates/layout/email/html/default.php index a8b4b5c57e..0c436df011 100644 --- a/templates/layout/email/html/default.php +++ b/templates/layout/email/html/default.php @@ -60,7 +60,7 @@ echo Configure::read('appDb.FCS_APP_NAME').'
'; echo Configure::read('appDb.FCS_APP_ADDRESS').'
'; echo ''.Configure::read('appDb.FCS_APP_EMAIL').'
'; - echo ''.preg_replace('/http(s)?\:\/\//', '', Configure::read('app.cakeServerName')).''; + echo ''.$this->MyHtml->getHostWithoutProtocol(Configure::read('app.cakeServerName')).''; ?> user()) { ?>

: From edd2b9e2bf6923fa0618cc1011a77b80680ee488 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 3 Oct 2022 08:06:42 +0200 Subject: [PATCH 136/646] sometimes userType is not set - add logging --- plugins/Admin/src/Controller/PaymentsController.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/plugins/Admin/src/Controller/PaymentsController.php b/plugins/Admin/src/Controller/PaymentsController.php index 0b1d963e2b..f14dbc738a 100644 --- a/plugins/Admin/src/Controller/PaymentsController.php +++ b/plugins/Admin/src/Controller/PaymentsController.php @@ -292,6 +292,16 @@ public function add() } if ($type == 'deposit') { + if (!isset($userType)) { + $msg = 'no userType set - payment cannot be saved'; + $this->log($msg); + $this->set([ + 'status' => 0, + 'msg' => $msg, + ]); + $this->viewBuilder()->setOption('serialize', ['status', 'msg']); + return; + } $actionLogType .= '_'.$userType; } } From 6c9bdcb2f9388b93920912f5d70a3304348e5c38 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 3 Oct 2022 09:42:00 +0200 Subject: [PATCH 137/646] remove old sql files and add seeds --- config/Seeds/AddTaxesAustriaSeed.php | 28 + config/Seeds/AddTaxesGermanySeed.php | 28 + config/Seeds/InitDataSeed.php | 40 + config/Seeds/locale/de_DE/InitDataSeed.php | 94 +++ config/Seeds/locale/en_US/InitDataSeed.php | 93 +++ config/Seeds/tests/InitTestDataSeed.php | 3 - .../sql/_installation/clean-db-data-de_DE.sql | 328 -------- .../sql/_installation/clean-db-data-en_US.sql | 328 -------- .../sql/_installation/clean-db-structure.sql | 706 ------------------ devtools/init-dev-setup.sh | 6 +- devtools/setup-dev/init-database.sh | 8 + 11 files changed, 295 insertions(+), 1367 deletions(-) create mode 100644 config/Seeds/AddTaxesAustriaSeed.php create mode 100644 config/Seeds/AddTaxesGermanySeed.php create mode 100644 config/Seeds/InitDataSeed.php create mode 100644 config/Seeds/locale/de_DE/InitDataSeed.php create mode 100644 config/Seeds/locale/en_US/InitDataSeed.php delete mode 100644 config/sql/_installation/clean-db-data-de_DE.sql delete mode 100644 config/sql/_installation/clean-db-data-en_US.sql delete mode 100644 config/sql/_installation/clean-db-structure.sql create mode 100644 devtools/setup-dev/init-database.sh diff --git a/config/Seeds/AddTaxesAustriaSeed.php b/config/Seeds/AddTaxesAustriaSeed.php new file mode 100644 index 0000000000..8ef7094bb5 --- /dev/null +++ b/config/Seeds/AddTaxesAustriaSeed.php @@ -0,0 +1,28 @@ +execute($query); + } +} diff --git a/config/Seeds/AddTaxesGermanySeed.php b/config/Seeds/AddTaxesGermanySeed.php new file mode 100644 index 0000000000..9ef590a4d5 --- /dev/null +++ b/config/Seeds/AddTaxesGermanySeed.php @@ -0,0 +1,28 @@ +execute($query); + } +} diff --git a/config/Seeds/InitDataSeed.php b/config/Seeds/InitDataSeed.php new file mode 100644 index 0000000000..3ed6f62af0 --- /dev/null +++ b/config/Seeds/InitDataSeed.php @@ -0,0 +1,40 @@ +execute($query); + + $query = "INSERT INTO `fcs_sliders` VALUES (1,'demo-slider.jpg',NULL,0,0,1);"; + $this->execute($query); + + } +} diff --git a/config/Seeds/locale/de_DE/InitDataSeed.php b/config/Seeds/locale/de_DE/InitDataSeed.php new file mode 100644 index 0000000000..d8f1040a0c --- /dev/null +++ b/config/Seeds/locale/de_DE/InitDataSeed.php @@ -0,0 +1,94 @@ +
Ab welcher verfügbaren Produkt-Anzahl soll beim Bestellen der Hinweis \"(x verfügbar\") angezeigt werden?
','10','number',600,'de_DE','2017-07-26 13:24:47','2014-06-01 01:40:34'), +(31,1,'FCS_DAYS_SHOW_PRODUCT_AS_NEW','Wie viele Tage sollen Produkte \"als neu markiert\" bleiben?','7','number',700,'de_DE','2017-07-26 13:24:47','2014-05-14 21:15:45'), +(456,1,'FCS_FOOTER_CMS_TEXT','Zusätzlicher Text für den Footer',NULL,'textarea_big',920,'de_DE','2014-06-11 17:50:55','2016-07-01 21:47:47'), +(508,1,'FCS_FACEBOOK_URL','Facebook-Url für die Einbindung im Footer','https://www.facebook.com/FoodCoopShop/','text',910,'de_DE','2015-07-08 13:23:54','2015-07-08 13:23:54'), +(538,1,'FCS_REGISTRATION_EMAIL_TEXT','Zusätzlicher Text, der in der Bestätigungsmail nach einer Registrierung versendet wird.
E-Mail-Vorschau anzeigen','','textarea_big',1700,'de_DE','2016-06-26 00:00:00','2016-06-26 00:00:00'), +(543,1,'FCS_RIGHT_INFO_BOX_HTML','Inhalt der Box in der rechten Spalte unterhalb des Warenkorbes.
Um eine Zeile grün zu hinterlegen (Überschrift) bitte als \"Überschrift 3\" formatieren.
','

Abholzeiten

\r\n\r\n

Du kannst jede Woche bis spätestens Dienstag Mitternacht bestellen und die Produkte am Freitag abholen.

\r\n','textarea_big',1500,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(544,1,'FCS_NO_DELIVERY_DAYS_GLOBAL','Lieferpause für alle Hersteller?
Hier können lieferfreie Tage (z.B. Feiertage) für die gesamte Foodcoop festgelegt werden.
','','multiple_dropdown',100,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(545,1,'FCS_ACCOUNTING_EMAIL','E-Mail-Adresse des Finanzverantwortlichen
Wer bekommt die Benachrichtigung über den erfolgten Rechnungsversand?
','','text',1100,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(546,1,'FCS_REGISTRATION_INFO_TEXT','Info-Text beim Registrierungsformular
Beim Registrierungsformlar wird unterhalb der E-Mail-Adresse dieser Text angezeigt.
','Um bei uns zu bestellen musst du Vereinsmitglied sein.','textarea_big',1600,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(547,1,'FCS_SHOW_PRODUCTS_FOR_GUESTS','Produkte für nicht eingeloggte Mitglieder sichtbar?','0','boolean',200,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(548,1,'FCS_DEFAULT_NEW_MEMBER_ACTIVE','Neue Mitglieder automatisch aktivieren?','0','boolean',500,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(549,1,'FCS_MINIMAL_CREDIT_BALANCE','Bis zu welchem Guthaben-Betrag sollen Bestellungen möglich sein?','0','number',1250,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(550,1,'FCS_BANK_ACCOUNT_DATA','Bankverbindung für die Guthaben-Einzahlungen\".','Guthaben-Konto Testbank / IBAN: AT65 5645 4154 8748 8999 / BIC: ABC87878','text',1300,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(552,1,'FCS_DELIVERY_DETAILS_FOR_MANUFACTURERS','Zusätzliche Liefer-Informationen für die Hersteller
wird in den Bestell-Listen nach dem Lieferdatum angezeigt.
',', 15:00 bis 17:00 Uhr','text',1200,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(553,1,'FCS_BACKUP_EMAIL_ADDRESS_BCC','E-Mail-Adresse, an die sämtliche vom System generierten E-Mails als BCC verschickt werden (Backup).
Kann leer gelassen werden.
','','text',1900,'de_DE','2016-10-06 00:00:00','2016-10-06 00:00:00'), +(554,1,'FCS_SHOW_FOODCOOPSHOP_BACKLINK','Auf Homepage Link auf www.foodcoopshop.com anzeigen?
Der Link wird im Footer angezeigt.
','1','boolean',930,'de_DE','2016-11-27 00:00:00','2016-11-27 00:00:00'), +(556,1,'FCS_APP_NAME','Name der Foodcoop','','text',50,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(557,1,'FCS_APP_ADDRESS','Adresse der Foodcoop
Wird im Footer von Homepage und E-Mails, Datenschutzerklärung, Nutzungsbedingungen usw. verwendet.
','','textarea',60,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(558,1,'FCS_APP_EMAIL','E-Mail-Adresse der Foodcoop
','','text',900,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(559,1,'FCS_PLATFORM_OWNER','Betreiber der Plattform
Für Datenschutzerklärung und Nutzungsbedingungen, bitte auch Adresse angeben. Kann leer gelassen werden, wenn die Foodcoop selbst die Plattform betreibt.
','','textarea',90,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(564,1,'FCS_ORDER_COMMENT_ENABLED','Kommentarfeld bei Bestell-Abschluss anzeigen?
Wird im Admin-Bereich unter \"Bestellungen\" angezeigt.
','1','boolean',130,'de_DE','2017-07-09 00:00:00','2017-07-09 00:00:00'), +(565,1,'FCS_USE_VARIABLE_MEMBER_FEE','Variablen Mitgliedsbeitrag verwenden?
Den variablen Mitgliedsbeitrag bei den Hersteller-Rechnungen abziehen? Die Produkt-Preise müssen entsprechend höher eingegeben werden.
','0','readonly',400,'de_DE','2017-08-02 00:00:00','2017-08-02 00:00:00'), +(566,1,'FCS_DEFAULT_VARIABLE_MEMBER_FEE_PERCENTAGE','Standardwert für variablen Mitgliedsbeitrag
Der Prozentsatz kann in den Hersteller-Einstellungen auch individuell angepasst werden.
','0','readonly',500,'de_DE','2017-08-02 00:00:00','2017-08-02 00:00:00'), +(567,1,'FCS_NETWORK_PLUGIN_ENABLED','Netzwerk-Modul aktiviert?
Infos zum Netzwerk-Modul
','0','readonly',500,'de_DE','2017-09-14 00:00:00','2017-09-14 00:00:00'), +(574,1,'FCS_SHOW_PRODUCT_PRICE_FOR_GUESTS','Produktpreis für nicht eingeloggte Mitglieder anzeigen?','0','boolean',210,'de_DE','2018-05-28 18:05:54','2018-05-28 18:05:54'), +(575,1,'FCS_CURRENCY_SYMBOL','Währungssymbol','€','readonly',520,'de_DE','2018-06-13 19:53:14','2018-06-13 19:53:14'), +(576,1,'FCS_DEFAULT_LOCALE','Sprache','de_DE','readonly',550,'de_DE','2018-06-26 10:18:55','2018-06-26 10:18:55'), +(577,1,'FCS_FOODCOOPS_MAP_ENABLED','Auf Home Karte mit anderen Foodcoops anzeigen?','1','boolean',1280,'de_DE','2019-02-11 22:25:36','2019-02-11 22:25:36'), +(578,1,'FCS_WEEKLY_PICKUP_DAY','Wöchentlicher Abholtag','5','readonly',600,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(579,1,'FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA','Bestelllisten-Versand: x Tage vor dem Abholtag','2','readonly',650,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(580,1,'FCS_ORDER_POSSIBLE_FOR_STOCK_PRODUCTS_IN_ORDERS_WITH_DELIVERY_RHYTHM','Sollen Lagerprodukte mit der wöchentlichen Bestellung bestellt werden können?','1','boolean',750,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(581,1,'FCS_SHOW_NON_STOCK_PRODUCTS_IN_INSTANT_ORDERS','In der Sofort-Bestellung ausschließlich Lagerprodukte anzeigen?','0','boolean',760,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(582,1,'FCS_INCLUDE_STOCK_PRODUCTS_IN_INVOICES','Lagerprodukte in Rechnungen miteinbeziehen?','1','readonly',600,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(583,1,'FCS_REGISTRATION_NOTIFICATION_EMAILS','Wer soll bei neuen Registrierungen informiert werden?
Mehrere E-Mail-Adressen mit , (ohne Leerzeichen) trennen.
','','text',550,'de_DE','2019-03-05 20:01:59','2019-03-05 20:01:59'), +(584,1,'FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED','Selbstbedienungs-Modus für Lagerprodukte aktiv?
Zur Online-Doku
','0','boolean',3000,'de_DE','2019-04-17 20:01:59','2019-04-17 20:01:59'), +(585,1,'FCS_APP_ADDITIONAL_DATA','Zusätzliche Infos zur Foodcoop
Z.B. ZVR-Zahl
','','textarea',80,'de_DE','2019-08-03 20:07:04','2019-08-03 20:07:04'), +(586,1,'FCS_SELF_SERVICE_MODE_TEST_MODE_ENABLED','Selbstbedienungs-Modus im Test-Modus ausführen?
Keine Verlinkung im Haupt-Menü und bei Lagerprodukten.
','0','boolean',3100,'de_DE','2019-12-09 13:46:27','2019-12-09 13:46:27'), +(587,1,'FCS_CASHLESS_PAYMENT_ADD_TYPE','Art der Eintragung der Guthaben-Aufladungen
Wie gelangen die Guthaben-Aufladungen vom Bankkonto in den FoodCoopShop?
','list-upload','dropdown',1450,'de_DE','2020-02-11 10:12:57','2020-02-11 10:12:57'), +(589,1,'FCS_FEEDBACK_TO_PRODUCTS_ENABLED','Feedback-Funktion für Produkte aktiviert?
Mitglieder können Feedback zu bestellten Produkte verfassen.
','0','boolean',3200,'de_DE','2020-06-19 09:02:46','2020-06-19 09:02:46'), +(590,1,'FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY','Mitglied kann Abholtag beim Bestellen selbst auswählen.','0','readonly',590,'de_DE','2020-07-06 10:34:35','2020-07-06 10:34:35'), +(591,1,'FCS_SEND_INVOICES_TO_CUSTOMERS','Einzelhandels-Modus aktiviert?
Infos zur Verwendung im Einzelhandel
','0','readonly',580,'de_DE','2020-10-29 10:06:34','2020-10-29 10:06:34'), +(592,1,'FCS_DEPOSIT_TAX_RATE','Umsatzsteuersatz für Pfand','20,00','readonly',581,'de_DE','2020-11-03 15:23:55','2020-11-03 15:23:55'), +(593,1,'FCS_INVOICE_HEADER_TEXT','Header-Text für Rechnungen an Mitglieder','','readonly',582,'de_DE','2020-11-03 15:23:55','2020-11-03 15:23:55'), +(594,1,'FCS_MEMBER_FEE_PRODUCTS','Welche Produkte werden als Mitgliedsbeitrag verwendet?
Die ausgewählten Produkte sind Datengrundlage der Spalte Mitgliedsbeitrag in der Mitgliederverwaltung und werden nicht in der Umsatzstatistik angezeigt.
','','multiple_dropdown',3300,'de_DE','2020-12-20 19:26:10','2020-12-20 19:26:10'), +(595,1,'FCS_CHECK_CREDIT_BALANCE_LIMIT','Ab welchem Guthaben-Stand soll die Erinnerungsmail versendet werden?','50','number',1450,'de_DE','2021-01-19 11:23:34','2021-01-19 11:23:34'), +(596,1,'FCS_PURCHASE_PRICE_ENABLED','Einkaufspreis für Produkte erfassen?
Der Einkaufspreis ist die Datengrundlage für die Gewinn-Statistik und für Lieferscheine an die Hersteller.
','0','readonly',587,'de_DE','2021-05-10 11:27:38','2021-05-10 11:27:38'), +(597,1,'FCS_HELLO_CASH_API_ENABLED','Schnittstelle (API) zu Registrierkasse HelloCash (hellocash.at) aktivieren?
Alle Rechnungen (bar und unbar) über die Registrierkasse erstellen.
','0','readonly',583,'de_DE','2021-07-07 10:55:03','2021-07-07 10:55:03'), +(598,1,'FCS_SAVE_STORAGE_LOCATION_FOR_PRODUCTS','Lagerort für Produkte erfassen und in Bestelllisten anzeigen?
Lagerorte: Keine Kühlung / Kühlschrank / Tiefkühler. Es erscheint ein zusätzlicher Button neben \"Bestellungen - Bestellungen als PDF generieren\"
','1','boolean',3210,'de_DE','2021-08-02 11:28:29','2021-08-02 11:28:29'), +(599,1,'FCS_INSTAGRAM_URL','Instagram-Url für die Einbindung im Footer','','text',920,'de_DE','2021-09-10 21:23:08','2021-09-10 21:23:08'), +(600,1,'FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY','Bestellungen beim ein- und zweiwöchigen Lieferhythmus sind nur in der Woche vor der Lieferung möglich.','0','boolean',3210,'de_DE','2022-02-01 17:48:35','2022-02-01 17:48:35'), +(601,1,'FCS_INVOICE_NUMBER_PREFIX','Präfix für Rechnungs-Nummernkreis
Max. 6 Zeichen inkl. Trennzeichen.
','','readonly',586,'de_DE','2022-03-21 12:02:48','2022-03-21 12:02:48'), +(602,1,'FCS_TAX_BASED_ON_NET_INVOICE_SUM','Rechnungslegung für pauschalierte Betriebe
Die Berechnung der Umsatzsteuer erfolgt auf Basis der Netto-Rechnungsumme und ist nicht die Summe der Umsatzsteuerbeträge pro Stück.
','0','readonly',585,'de_DE','2022-03-23 09:12:23','2022-03-23 09:12:23'), +(603,1,'FCS_NEWSLETTER_ENABLED','Newsletter-Funktion aktiv?
Mitglieder können sich bei der Registrierung für den Newsletter anmelden. Mehr Infos
','0','boolean',3400,'de_DE','2022-04-12 15:28:47','2022-04-12 15:28:47'), +(604,1,'FCS_USER_FEEDBACK_ENABLED','Mitglieder- und Hersteller-Feedback aktiv?
Ermöglicht das Erfassen und Anzeigen von Feedback. Mehr Infos
','0','boolean',3500,'de_DE','2022-07-19 14:39:27','2022-07-19 14:39:27'); +"; + $this->execute($query); + + $query = " + INSERT INTO `fcs_storage_locations` VALUES + (1,'Keine Kühlung',10), + (2,'Kühlschrank',20), + (3,'Tiefkühler',30); + "; + $this->execute($query); + + $query = " + INSERT INTO `fcs_category` VALUES + (20,2,'Alle Produkte','',3,4,1,'2016-10-19 21:05:00','2016-10-19 21:05:00'); + "; + $this->execute($query); + + } +} diff --git a/config/Seeds/locale/en_US/InitDataSeed.php b/config/Seeds/locale/en_US/InitDataSeed.php new file mode 100644 index 0000000000..b74ec99b54 --- /dev/null +++ b/config/Seeds/locale/en_US/InitDataSeed.php @@ -0,0 +1,93 @@ +
From which amount on there should be an information text visible \"(x available\")?
','10','number',600,'en_US','2017-07-26 13:24:47','2014-06-01 01:40:34'), +(31,1,'FCS_DAYS_SHOW_PRODUCT_AS_NEW','How many days products should be \"marked as new\"?','7','number',700,'en_US','2017-07-26 13:24:47','2014-05-14 21:15:45'), +(456,1,'FCS_FOOTER_CMS_TEXT','Additional text for footer',NULL,'textarea_big',920,'en_US','2014-06-11 17:50:55','2016-07-01 21:47:47'), +(508,1,'FCS_FACEBOOK_URL','Facebook url for embedding in footer','https://www.facebook.com/FoodCoopShop/','text',910,'en_US','2015-07-08 13:23:54','2015-07-08 13:23:54'), +(538,1,'FCS_REGISTRATION_EMAIL_TEXT','Additional text that is sent in the registration e-mail after a successful registration.
E-mail preview','','textarea_big',1700,'en_US','2016-06-26 00:00:00','2016-06-26 00:00:00'), +(543,1,'FCS_RIGHT_INFO_BOX_HTML','Content of the box in the right column below the shopping cart.
To make the background of a row green, please format as \"Heading 3\".
','

Delivery time

You can order every week until Tuesday midnight and pick the products up the following Friday.

','textarea_big',1500,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(544,1,'FCS_NO_DELIVERY_DAYS_GLOBAL','Delivery break for all manufacturers?
Here you can define delivery-free days for the whole food-coop.
','','multiple_dropdown',100,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(545,1,'FCS_ACCOUNTING_EMAIL','E-mail address for the financial manager
Who receives the notification that invoices have been sent?
','','text',1100,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(546,1,'FCS_REGISTRATION_INFO_TEXT','Info text in registration form
This info text is shown in the registration form below the e-mail address.
','You need to be a member if you want to order here.','textarea_big',1600,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(547,1,'FCS_SHOW_PRODUCTS_FOR_GUESTS','Products visible for guests?','0','boolean',200,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(548,1,'FCS_DEFAULT_NEW_MEMBER_ACTIVE','Automatically activate new members?','0','boolean',500,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(549,1,'FCS_MINIMAL_CREDIT_BALANCE','Up to which credit amount orders should be possible?','0','number',1250,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(550,1,'FCS_BANK_ACCOUNT_DATA','Bank account for credit uploads.','Credit account Example Bank / IBAN: AT65 5645 4154 8748 8999 / BIC: ABC87878','text',1300,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(552,1,'FCS_DELIVERY_DETAILS_FOR_MANUFACTURERS','Additional deliverey details for manufacturers
will be shown in the order lists after the delivery date.
',', 3pm to 5pm','text',1200,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), +(553,1,'FCS_BACKUP_EMAIL_ADDRESS_BCC','E-mail adress to which all automatically generated e-mail are sent to as BCC (Backup).
Can be left empty.
','','text',1900,'en_US','2016-10-06 00:00:00','2016-10-06 00:00:00'), +(554,1,'FCS_SHOW_FOODCOOPSHOP_BACKLINK','Show link to www.foodcoopshop.com?
The link is shown in the footer.
','1','boolean',930,'en_US','2016-11-27 00:00:00','2016-11-27 00:00:00'), +(556,1,'FCS_APP_NAME','Name of the food-coop','','text',50,'en_US','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(557,1,'FCS_APP_ADDRESS','Adress of the food-coop
Used in footer of homepage and e-mails, privacy policy and terms of use.
','','textarea',60,'en_US','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(558,1,'FCS_APP_EMAIL','E-mail adress of the food-coop
','','text',900,'en_US','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(559,1,'FCS_PLATFORM_OWNER','Operator of the platform
For privacy policy and terms of use, please also add adrress. Can be left empty if the food-coop itself is operator.
','','textarea',90,'en_US','2017-01-12 00:00:00','2017-01-12 00:00:00'), +(564,1,'FCS_ORDER_COMMENT_ENABLED','Show comment field when placing an order?
Shown in admin area under \"Orders\".
','1','boolean',130,'en_US','2017-07-09 00:00:00','2017-07-09 00:00:00'), +(565,1,'FCS_USE_VARIABLE_MEMBER_FEE','Use variable member fee?
Reduce the variable member fee in the manufacturer\'s invoices? Therefore the prices need to be increased.
','0','readonly',400,'en_US','2017-08-02 00:00:00','2017-08-02 00:00:00'), +(566,1,'FCS_DEFAULT_VARIABLE_MEMBER_FEE_PERCENTAGE','Default value for variable member fee
The percentage can be changed in the manufacturer\'s settings.
','0','readonly',500,'en_US','2017-08-02 00:00:00','2017-08-02 00:00:00'), +(567,1,'FCS_NETWORK_PLUGIN_ENABLED','Network module activated?
Infos to the network module
','0','readonly',500,'en_US','2017-09-14 00:00:00','2017-09-14 00:00:00'), +(574,1,'FCS_SHOW_PRODUCT_PRICE_FOR_GUESTS','Shop product price for guests?','0','boolean',210,'en_US','2018-05-28 18:05:54','2018-05-28 18:05:54'), +(575,1,'FCS_CURRENCY_SYMBOL','Currency symbol','$','readonly',520,'en_US','2018-06-13 19:53:14','2018-06-13 19:53:14'), +(576,1,'FCS_DEFAULT_LOCALE','Language','en_US','readonly',550,'en_US','2018-06-26 10:18:55','2018-06-26 10:18:55'), +(577,1,'FCS_FOODCOOPS_MAP_ENABLED','Show map with other foodcoops on home?','1','boolean',1280,'en_US','2019-02-11 22:25:36','2019-02-11 22:25:36'), +(578,1,'FCS_WEEKLY_PICKUP_DAY','Weekly pickup day','5','readonly',600,'en_US','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(579,1,'FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA','Sending of order lists: x days before pickup day','2','readonly',650,'en_US','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(580,1,'FCS_ORDER_POSSIBLE_FOR_STOCK_PRODUCTS_IN_ORDERS_WITH_DELIVERY_RHYTHM','Allow weekly orders for stock products?','1','boolean',750,'en_US','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(581,1,'FCS_SHOW_NON_STOCK_PRODUCTS_IN_INSTANT_ORDERS','Only show stock products in instant orders?','0','boolean',760,'en_US','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(582,1,'FCS_INCLUDE_STOCK_PRODUCTS_IN_INVOICES','Include stock products in invoices?','1','readonly',600,'en_US','2019-02-18 12:38:00','2019-02-18 12:38:00'), +(583,1,'FCS_REGISTRATION_NOTIFICATION_EMAILS','Who should be notified on new registrations?
Please separate multiple e-mail addresses with , (no space).
','','text',550,'en_US','2019-03-05 20:01:59','2019-03-05 20:01:59'), +(584,1,'FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED','Use self-service mode for stock products?
Online documentation
','0','boolean',3000,'en_US','2019-04-17 20:01:59','2019-04-17 20:01:59'), +(585,1,'FCS_APP_ADDITIONAL_DATA','Additional food-coop infos','','textarea',80,'en_US','2019-08-03 20:07:08','2019-08-03 20:07:08'), +(586,1,'FCS_SELF_SERVICE_MODE_TEST_MODE_ENABLED','Run self-service mode in test mode?
Does not add links to main menu and to stock products.
','0','boolean',3100,'en_US','2019-12-09 13:46:32','2019-12-09 13:46:32'), +(587,1,'FCS_CASHLESS_PAYMENT_ADD_TYPE','Type of adding the payments
How do the payment addings get into FoodCoopShop?
','list-upload','dropdown',1450,'en_US','2020-02-11 10:13:01','2020-02-11 10:13:01'), +(589,1,'FCS_FEEDBACK_TO_PRODUCTS_ENABLED','Are members allowed to write feedback to products?','0','boolean',3200,'en_US','2020-06-19 09:02:50','2020-06-19 09:02:50'), +(590,1,'FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY','Pickup day can be selected by member on order confirmation.','0','readonly',590,'en_US','2020-07-06 10:34:39','2020-07-06 10:34:39'), +(591,1,'FCS_SEND_INVOICES_TO_CUSTOMERS','Retail mode activated?.','0','readonly',580,'en_US','2020-10-29 10:06:39','2020-10-29 10:06:39'), +(592,1,'FCS_DEPOSIT_TAX_RATE','VAT for deposit','20.00','readonly',581,'en_US','2020-11-03 15:24:01','2020-11-03 15:24:01'), +(593,1,'FCS_INVOICE_HEADER_TEXT','Header text for invoices to members','','readonly',582,'en_US','2020-11-03 15:24:01','2020-11-03 15:24:01'), +(594,1,'FCS_MEMBER_FEE_PRODUCTS','Which products are used as member fee product?
The selected products are the basis for the column Member Fee in the members adminstration and are not shown in the turnover statistics.
','','multiple_dropdown',3300,'en_US','2020-12-20 19:26:16','2020-12-20 19:26:16'), +(595,1,'FCS_CHECK_CREDIT_BALANCE_LIMIT','Height of credit saldo when the reminder email is sent.','50','number',1450,'en_US','2021-01-19 11:23:39','2021-01-19 11:23:39'), +(596,1,'FCS_PURCHASE_PRICE_ENABLED','Enable input of purchase price?
The purchase price is the base for profit statistics and bill of delivery to manufacturers.
','0','readonly',587,'en_US','2021-05-10 11:27:43','2021-05-10 11:27:43'), +(597,1,'FCS_HELLO_CASH_API_ENABLED','Enable API to hellocash.at?
Invoices (cash and cashless) are generated by hellocash.at.
','0','readonly',583,'en_US','2021-07-07 10:55:08','2021-07-07 10:55:08'), +(598,1,'FCS_SAVE_STORAGE_LOCATION_FOR_PRODUCTS','Save storage location for products?
New button next to \"Orders - show order as pdf\"
','1','boolean',3210,'en_US','2021-08-02 11:28:34','2021-08-02 11:28:34'), +(599,1,'FCS_INSTAGRAM_URL','Instagram url for embedding in footer','','text',920,'en_US','2021-09-10 21:23:13','2021-09-10 21:23:13'), +(600,1,'FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY','Ordering products with delivery rhythm one or two weeks is only possible in the week before delivery.','0','boolean',3210,'en_US','2022-02-01 17:48:40','2022-02-01 17:48:40'), +(601,1,'FCS_INVOICE_NUMBER_PREFIX','Prefix for invoice numbers
Max. 6 chars incl. separator.
','','readonly',586,'en_US','2022-03-21 12:02:57','2022-03-21 12:02:57'), +(602,1,'FCS_TAX_BASED_ON_NET_INVOICE_SUM','Invoices for companies with fixed tax rate
Vat is calculated based on the sum of net price of the invoice.
','0','readonly',585,'en_US','2022-03-23 09:12:33','2022-03-23 09:12:33'), +(603,1,'FCS_NEWSLETTER_ENABLED','Newsletter enabled?
Shows newsletter checkbox on registration.
','0','boolean',3400,'en_US','2022-04-12 15:28:56','2022-04-12 15:28:56'), +(604,1,'FCS_USER_FEEDBACK_ENABLED','Member and manufacturer feedback enabled?
Members and manufacturers can write feedback.
','0','boolean',3500,'en_US','2022-07-19 14:39:36','2022-07-19 14:39:36');"; + $this->execute($query); + + $query = " + INSERT INTO `fcs_storage_locations` VALUES + (1,'No cooling',10), + (2,'Refrigerator',20), + (3,'Freezer',30); + "; + $this->execute($query); + + $query = " + INSERT INTO `fcs_category` VALUES + (20,2,'All Products','',3,4,1,'2016-10-19 21:05:00','2016-10-19 21:05:00'); + "; + $this->execute($query); + + } +} diff --git a/config/Seeds/tests/InitTestDataSeed.php b/config/Seeds/tests/InitTestDataSeed.php index dc4e9186b3..2a7ee4168a 100644 --- a/config/Seeds/tests/InitTestDataSeed.php +++ b/config/Seeds/tests/InitTestDataSeed.php @@ -3,9 +3,6 @@ use Migrations\AbstractSeed; -/** - * TestData seed. - */ class InitTestDataSeed extends AbstractSeed { /** diff --git a/config/sql/_installation/clean-db-data-de_DE.sql b/config/sql/_installation/clean-db-data-de_DE.sql deleted file mode 100644 index 2156588875..0000000000 --- a/config/sql/_installation/clean-db-data-de_DE.sql +++ /dev/null @@ -1,328 +0,0 @@ - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!50503 SET NAMES utf8mb4 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- Truncate tables before insertion -TRUNCATE TABLE `fcs_action_logs`; -TRUNCATE TABLE `fcs_address`; -TRUNCATE TABLE `fcs_attribute`; -TRUNCATE TABLE `fcs_barcodes`; -TRUNCATE TABLE `fcs_blog_posts`; -TRUNCATE TABLE `fcs_cart_product_units`; -TRUNCATE TABLE `fcs_cart_products`; -TRUNCATE TABLE `fcs_carts`; -TRUNCATE TABLE `fcs_category`; -TRUNCATE TABLE `fcs_category_product`; -TRUNCATE TABLE `fcs_configuration`; -TRUNCATE TABLE `fcs_cronjob_logs`; -TRUNCATE TABLE `fcs_cronjobs`; -TRUNCATE TABLE `fcs_customer`; -TRUNCATE TABLE `fcs_deposits`; -TRUNCATE TABLE `fcs_feedbacks`; -TRUNCATE TABLE `fcs_images`; -TRUNCATE TABLE `fcs_invoice_taxes`; -TRUNCATE TABLE `fcs_invoices`; -TRUNCATE TABLE `fcs_manufacturer`; -TRUNCATE TABLE `fcs_order_detail`; -TRUNCATE TABLE `fcs_order_detail_feedbacks`; -TRUNCATE TABLE `fcs_order_detail_purchase_prices`; -TRUNCATE TABLE `fcs_order_detail_units`; -TRUNCATE TABLE `fcs_pages`; -TRUNCATE TABLE `fcs_payments`; -TRUNCATE TABLE `fcs_pickup_days`; -TRUNCATE TABLE `fcs_product`; -TRUNCATE TABLE `fcs_product_attribute`; -TRUNCATE TABLE `fcs_product_attribute_combination`; -TRUNCATE TABLE `fcs_purchase_prices`; -TRUNCATE TABLE `fcs_sliders`; -TRUNCATE TABLE `fcs_stock_available`; -TRUNCATE TABLE `fcs_storage_locations`; -TRUNCATE TABLE `fcs_sync_domains`; -TRUNCATE TABLE `fcs_sync_products`; -TRUNCATE TABLE `fcs_tax`; -TRUNCATE TABLE `fcs_units`; -TRUNCATE TABLE `phinxlog`; -TRUNCATE TABLE `queue_phinxlog`; -TRUNCATE TABLE `queue_processes`; -TRUNCATE TABLE `queued_jobs`; - -/*!40000 ALTER TABLE `fcs_action_logs` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_action_logs` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_address` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_address` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_attribute` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_attribute` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_barcodes` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_barcodes` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_blog_posts` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_blog_posts` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_cart_product_units` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_cart_product_units` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_cart_products` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_cart_products` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_carts` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_carts` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_category` DISABLE KEYS */; -INSERT INTO `fcs_category` VALUES -(20,2,'Alle Produkte','',3,4,1,'2016-10-19 21:05:00','2016-10-19 21:05:00'); -/*!40000 ALTER TABLE `fcs_category` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_category_product` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_category_product` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_configuration` DISABLE KEYS */; -INSERT INTO `fcs_configuration` VALUES -(11,1,'FCS_PRODUCT_AVAILABILITY_LOW','Geringe Verfügbarkeit
Ab welcher verfügbaren Produkt-Anzahl soll beim Bestellen der Hinweis \"(x verfügbar\") angezeigt werden?
','10','number',600,'de_DE','2017-07-26 13:24:47','2014-06-01 01:40:34'), -(31,1,'FCS_DAYS_SHOW_PRODUCT_AS_NEW','Wie viele Tage sollen Produkte \"als neu markiert\" bleiben?','7','number',700,'de_DE','2017-07-26 13:24:47','2014-05-14 21:15:45'), -(456,1,'FCS_FOOTER_CMS_TEXT','Zusätzlicher Text für den Footer',NULL,'textarea_big',920,'de_DE','2014-06-11 17:50:55','2016-07-01 21:47:47'), -(508,1,'FCS_FACEBOOK_URL','Facebook-Url für die Einbindung im Footer','https://www.facebook.com/FoodCoopShop/','text',910,'de_DE','2015-07-08 13:23:54','2015-07-08 13:23:54'), -(538,1,'FCS_REGISTRATION_EMAIL_TEXT','Zusätzlicher Text, der in der Bestätigungsmail nach einer Registrierung versendet wird.
E-Mail-Vorschau anzeigen','','textarea_big',1700,'de_DE','2016-06-26 00:00:00','2016-06-26 00:00:00'), -(543,1,'FCS_RIGHT_INFO_BOX_HTML','Inhalt der Box in der rechten Spalte unterhalb des Warenkorbes.
Um eine Zeile grün zu hinterlegen (Überschrift) bitte als \"Überschrift 3\" formatieren.
','

Abholzeiten

\r\n\r\n

Du kannst jede Woche bis spätestens Dienstag Mitternacht bestellen und die Produkte am Freitag abholen.

\r\n','textarea_big',1500,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(544,1,'FCS_NO_DELIVERY_DAYS_GLOBAL','Lieferpause für alle Hersteller?
Hier können lieferfreie Tage (z.B. Feiertage) für die gesamte Foodcoop festgelegt werden.
','','multiple_dropdown',100,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(545,1,'FCS_ACCOUNTING_EMAIL','E-Mail-Adresse des Finanzverantwortlichen
Wer bekommt die Benachrichtigung über den erfolgten Rechnungsversand?
','','text',1100,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(546,1,'FCS_REGISTRATION_INFO_TEXT','Info-Text beim Registrierungsformular
Beim Registrierungsformlar wird unterhalb der E-Mail-Adresse dieser Text angezeigt.
','Um bei uns zu bestellen musst du Vereinsmitglied sein.','textarea_big',1600,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(547,1,'FCS_SHOW_PRODUCTS_FOR_GUESTS','Produkte für nicht eingeloggte Mitglieder sichtbar?','0','boolean',200,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(548,1,'FCS_DEFAULT_NEW_MEMBER_ACTIVE','Neue Mitglieder automatisch aktivieren?','0','boolean',500,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(549,1,'FCS_MINIMAL_CREDIT_BALANCE','Bis zu welchem Guthaben-Betrag sollen Bestellungen möglich sein?','0','number',1250,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(550,1,'FCS_BANK_ACCOUNT_DATA','Bankverbindung für die Guthaben-Einzahlungen\".','Guthaben-Konto Testbank / IBAN: AT65 5645 4154 8748 8999 / BIC: ABC87878','text',1300,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(552,1,'FCS_DELIVERY_DETAILS_FOR_MANUFACTURERS','Zusätzliche Liefer-Informationen für die Hersteller
wird in den Bestell-Listen nach dem Lieferdatum angezeigt.
',', 15:00 bis 17:00 Uhr','text',1200,'de_DE','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(553,1,'FCS_BACKUP_EMAIL_ADDRESS_BCC','E-Mail-Adresse, an die sämtliche vom System generierten E-Mails als BCC verschickt werden (Backup).
Kann leer gelassen werden.
','','text',1900,'de_DE','2016-10-06 00:00:00','2016-10-06 00:00:00'), -(554,1,'FCS_SHOW_FOODCOOPSHOP_BACKLINK','Auf Homepage Link auf www.foodcoopshop.com anzeigen?
Der Link wird im Footer angezeigt.
','1','boolean',930,'de_DE','2016-11-27 00:00:00','2016-11-27 00:00:00'), -(556,1,'FCS_APP_NAME','Name der Foodcoop','','text',50,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(557,1,'FCS_APP_ADDRESS','Adresse der Foodcoop
Wird im Footer von Homepage und E-Mails, Datenschutzerklärung, Nutzungsbedingungen usw. verwendet.
','','textarea',60,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(558,1,'FCS_APP_EMAIL','E-Mail-Adresse der Foodcoop
','','text',900,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(559,1,'FCS_PLATFORM_OWNER','Betreiber der Plattform
Für Datenschutzerklärung und Nutzungsbedingungen, bitte auch Adresse angeben. Kann leer gelassen werden, wenn die Foodcoop selbst die Plattform betreibt.
','','textarea',90,'de_DE','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(564,1,'FCS_ORDER_COMMENT_ENABLED','Kommentarfeld bei Bestell-Abschluss anzeigen?
Wird im Admin-Bereich unter \"Bestellungen\" angezeigt.
','1','boolean',130,'de_DE','2017-07-09 00:00:00','2017-07-09 00:00:00'), -(565,1,'FCS_USE_VARIABLE_MEMBER_FEE','Variablen Mitgliedsbeitrag verwenden?
Den variablen Mitgliedsbeitrag bei den Hersteller-Rechnungen abziehen? Die Produkt-Preise müssen entsprechend höher eingegeben werden.
','0','readonly',400,'de_DE','2017-08-02 00:00:00','2017-08-02 00:00:00'), -(566,1,'FCS_DEFAULT_VARIABLE_MEMBER_FEE_PERCENTAGE','Standardwert für variablen Mitgliedsbeitrag
Der Prozentsatz kann in den Hersteller-Einstellungen auch individuell angepasst werden.
','0','readonly',500,'de_DE','2017-08-02 00:00:00','2017-08-02 00:00:00'), -(567,1,'FCS_NETWORK_PLUGIN_ENABLED','Netzwerk-Modul aktiviert?
Infos zum Netzwerk-Modul
','0','readonly',500,'de_DE','2017-09-14 00:00:00','2017-09-14 00:00:00'), -(574,1,'FCS_SHOW_PRODUCT_PRICE_FOR_GUESTS','Produktpreis für nicht eingeloggte Mitglieder anzeigen?','0','boolean',210,'de_DE','2018-05-28 18:05:54','2018-05-28 18:05:54'), -(575,1,'FCS_CURRENCY_SYMBOL','Währungssymbol','€','readonly',520,'de_DE','2018-06-13 19:53:14','2018-06-13 19:53:14'), -(576,1,'FCS_DEFAULT_LOCALE','Sprache','de_DE','readonly',550,'de_DE','2018-06-26 10:18:55','2018-06-26 10:18:55'), -(577,1,'FCS_FOODCOOPS_MAP_ENABLED','Auf Home Karte mit anderen Foodcoops anzeigen?','1','boolean',1280,'de_DE','2019-02-11 22:25:36','2019-02-11 22:25:36'), -(578,1,'FCS_WEEKLY_PICKUP_DAY','Wöchentlicher Abholtag','5','readonly',600,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(579,1,'FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA','Bestelllisten-Versand: x Tage vor dem Abholtag','2','readonly',650,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(580,1,'FCS_ORDER_POSSIBLE_FOR_STOCK_PRODUCTS_IN_ORDERS_WITH_DELIVERY_RHYTHM','Sollen Lagerprodukte mit der wöchentlichen Bestellung bestellt werden können?','1','boolean',750,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(581,1,'FCS_SHOW_NON_STOCK_PRODUCTS_IN_INSTANT_ORDERS','In der Sofort-Bestellung ausschließlich Lagerprodukte anzeigen?','0','boolean',760,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(582,1,'FCS_INCLUDE_STOCK_PRODUCTS_IN_INVOICES','Lagerprodukte in Rechnungen miteinbeziehen?','1','readonly',600,'de_DE','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(583,1,'FCS_REGISTRATION_NOTIFICATION_EMAILS','Wer soll bei neuen Registrierungen informiert werden?
Mehrere E-Mail-Adressen mit , (ohne Leerzeichen) trennen.
','','text',550,'de_DE','2019-03-05 20:01:59','2019-03-05 20:01:59'), -(584,1,'FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED','Selbstbedienungs-Modus für Lagerprodukte aktiv?
Zur Online-Doku
','0','boolean',3000,'de_DE','2019-04-17 20:01:59','2019-04-17 20:01:59'), -(585,1,'FCS_APP_ADDITIONAL_DATA','Zusätzliche Infos zur Foodcoop
Z.B. ZVR-Zahl
','','textarea',80,'de_DE','2019-08-03 20:07:04','2019-08-03 20:07:04'), -(586,1,'FCS_SELF_SERVICE_MODE_TEST_MODE_ENABLED','Selbstbedienungs-Modus im Test-Modus ausführen?
Keine Verlinkung im Haupt-Menü und bei Lagerprodukten.
','0','boolean',3100,'de_DE','2019-12-09 13:46:27','2019-12-09 13:46:27'), -(587,1,'FCS_CASHLESS_PAYMENT_ADD_TYPE','Art der Eintragung der Guthaben-Aufladungen
Wie gelangen die Guthaben-Aufladungen vom Bankkonto in den FoodCoopShop?
','list-upload','dropdown',1450,'de_DE','2020-02-11 10:12:57','2020-02-11 10:12:57'), -(589,1,'FCS_FEEDBACK_TO_PRODUCTS_ENABLED','Feedback-Funktion für Produkte aktiviert?
Mitglieder können Feedback zu bestellten Produkte verfassen.
','0','boolean',3200,'de_DE','2020-06-19 09:02:46','2020-06-19 09:02:46'), -(590,1,'FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY','Mitglied kann Abholtag beim Bestellen selbst auswählen.','0','readonly',590,'de_DE','2020-07-06 10:34:35','2020-07-06 10:34:35'), -(591,1,'FCS_SEND_INVOICES_TO_CUSTOMERS','Einzelhandels-Modus aktiviert?
Infos zur Verwendung im Einzelhandel
','0','readonly',580,'de_DE','2020-10-29 10:06:34','2020-10-29 10:06:34'), -(592,1,'FCS_DEPOSIT_TAX_RATE','Umsatzsteuersatz für Pfand','20,00','readonly',581,'de_DE','2020-11-03 15:23:55','2020-11-03 15:23:55'), -(593,1,'FCS_INVOICE_HEADER_TEXT','Header-Text für Rechnungen an Mitglieder','','readonly',582,'de_DE','2020-11-03 15:23:55','2020-11-03 15:23:55'), -(594,1,'FCS_MEMBER_FEE_PRODUCTS','Welche Produkte werden als Mitgliedsbeitrag verwendet?
Die ausgewählten Produkte sind Datengrundlage der Spalte Mitgliedsbeitrag in der Mitgliederverwaltung und werden nicht in der Umsatzstatistik angezeigt.
','','multiple_dropdown',3300,'de_DE','2020-12-20 19:26:10','2020-12-20 19:26:10'), -(595,1,'FCS_CHECK_CREDIT_BALANCE_LIMIT','Ab welchem Guthaben-Stand soll die Erinnerungsmail versendet werden?','50','number',1450,'de_DE','2021-01-19 11:23:34','2021-01-19 11:23:34'), -(596,1,'FCS_PURCHASE_PRICE_ENABLED','Einkaufspreis für Produkte erfassen?
Der Einkaufspreis ist die Datengrundlage für die Gewinn-Statistik und für Lieferscheine an die Hersteller.
','0','readonly',587,'de_DE','2021-05-10 11:27:38','2021-05-10 11:27:38'), -(597,1,'FCS_HELLO_CASH_API_ENABLED','Schnittstelle (API) zu Registrierkasse HelloCash (hellocash.at) aktivieren?
Alle Rechnungen (bar und unbar) über die Registrierkasse erstellen.
','0','readonly',583,'de_DE','2021-07-07 10:55:03','2021-07-07 10:55:03'), -(598,1,'FCS_SAVE_STORAGE_LOCATION_FOR_PRODUCTS','Lagerort für Produkte erfassen und in Bestelllisten anzeigen?
Lagerorte: Keine Kühlung / Kühlschrank / Tiefkühler. Es erscheint ein zusätzlicher Button neben \"Bestellungen - Bestellungen als PDF generieren\"
','1','boolean',3210,'de_DE','2021-08-02 11:28:29','2021-08-02 11:28:29'), -(599,1,'FCS_INSTAGRAM_URL','Instagram-Url für die Einbindung im Footer','','text',920,'de_DE','2021-09-10 21:23:08','2021-09-10 21:23:08'), -(600,1,'FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY','Bestellungen beim ein- und zweiwöchigen Lieferhythmus sind nur in der Woche vor der Lieferung möglich.','0','boolean',3210,'de_DE','2022-02-01 17:48:35','2022-02-01 17:48:35'), -(601,1,'FCS_INVOICE_NUMBER_PREFIX','Präfix für Rechnungs-Nummernkreis
Max. 6 Zeichen inkl. Trennzeichen.
','','readonly',586,'de_DE','2022-03-21 12:02:48','2022-03-21 12:02:48'), -(602,1,'FCS_TAX_BASED_ON_NET_INVOICE_SUM','Rechnungslegung für pauschalierte Betriebe
Die Berechnung der Umsatzsteuer erfolgt auf Basis der Netto-Rechnungsumme und ist nicht die Summe der Umsatzsteuerbeträge pro Stück.
','0','readonly',585,'de_DE','2022-03-23 09:12:23','2022-03-23 09:12:23'), -(603,1,'FCS_NEWSLETTER_ENABLED','Newsletter-Funktion aktiv?
Mitglieder können sich bei der Registrierung für den Newsletter anmelden. Mehr Infos
','0','boolean',3400,'de_DE','2022-04-12 15:28:47','2022-04-12 15:28:47'), -(604,1,'FCS_USER_FEEDBACK_ENABLED','Mitglieder- und Hersteller-Feedback aktiv?
Ermöglicht das Erfassen und Anzeigen von Feedback. Mehr Infos
','0','boolean',3500,'de_DE','2022-07-19 14:39:27','2022-07-19 14:39:27'); -/*!40000 ALTER TABLE `fcs_configuration` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_cronjob_logs` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_cronjob_logs` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_cronjobs` DISABLE KEYS */; -INSERT INTO `fcs_cronjobs` VALUES -(1,'BackupDatabase','day',NULL,NULL,'04:00:00',1), -(2,'CheckCreditBalance','week',NULL,'Friday','22:30:00',1), -(3,'EmailOrderReminder','week',NULL,'Monday','18:00:00',1), -(4,'PickupReminder','week',NULL,'Monday','09:00:00',1), -(5,'SendInvoicesToManufacturers','month',11,NULL,'10:30:00',1), -(6,'SendOrderLists','day',NULL,NULL,'04:30:00',1), -(7,'SendInvoicesToCustomers','week',NULL,'Saturday','10:00:00',0), -(8,'SendDeliveryNotes','month',1,NULL,'18:00:00',0); -/*!40000 ALTER TABLE `fcs_cronjobs` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_customer` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_customer` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_deposits` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_deposits` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_feedbacks` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_feedbacks` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_images` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_images` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_invoice_taxes` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_invoice_taxes` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_invoices` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_invoices` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_manufacturer` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_manufacturer` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_order_detail` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_order_detail` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_order_detail_feedbacks` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_order_detail_feedbacks` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_order_detail_purchase_prices` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_order_detail_purchase_prices` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_order_detail_units` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_order_detail_units` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_pages` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_pages` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_payments` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_payments` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_pickup_days` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_pickup_days` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_product` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_product` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_product_attribute` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_product_attribute` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_product_attribute_combination` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_product_attribute_combination` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_purchase_prices` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_purchase_prices` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_sliders` DISABLE KEYS */; -INSERT INTO `fcs_sliders` VALUES -(1,'demo-slider.jpg',NULL,0,0,1); -/*!40000 ALTER TABLE `fcs_sliders` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_stock_available` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_stock_available` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_storage_locations` DISABLE KEYS */; -INSERT INTO `fcs_storage_locations` VALUES -(1,'Keine Kühlung',10), -(2,'Kühlschrank',20), -(3,'Tiefkühler',30); -/*!40000 ALTER TABLE `fcs_storage_locations` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_sync_domains` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_sync_domains` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_sync_products` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_sync_products` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_tax` DISABLE KEYS */; -INSERT INTO `fcs_tax` VALUES -(1,20.000,1,0), -(2,10.000,1,0), -(3,13.000,1,0); -/*!40000 ALTER TABLE `fcs_tax` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_units` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_units` ENABLE KEYS */; - -/*!40000 ALTER TABLE `phinxlog` DISABLE KEYS */; -INSERT INTO `phinxlog` VALUES -(20200404145856,'RemoveV2Migrations','2020-04-04 15:01:04','2020-04-04 15:01:04',0), -(20200415073329,'ShowNewProductsOnHome','2020-04-15 07:41:54','2020-04-15 07:41:54',0), -(20200501192722,'EnableCashlessPaymentAddTypeConfiguration','2020-05-01 19:30:09','2020-05-01 19:30:09',0), -(20200618063024,'AddProductFeedback','2020-06-19 07:02:46','2020-06-19 07:02:46',0), -(20200703072605,'CustomerCanSelectPickupDay','2020-07-06 08:34:35','2020-07-06 08:34:35',0), -(20200831142250,'RemoveEmailLogTable','2020-08-31 15:10:21','2020-08-31 15:10:21',0), -(20200910091755,'AddMemberSettingUseCameraForMobileBarcodeScanning','2020-09-10 09:20:50','2020-09-10 09:20:51',0), -(20200925073919,'GermanIbanFix','2020-09-25 08:12:37','2020-09-25 08:12:37',0), -(20201017182431,'AdaptMinimalCreditBalance','2020-10-17 18:37:54','2020-10-17 18:37:54',0), -(20201029084931,'AddRetailMode','2020-10-29 09:06:34','2020-10-29 09:06:34',0), -(20201118084516,'AddRetailMode2','2020-11-18 08:47:32','2020-11-18 08:47:32',0), -(20201213120713,'AddRetailMode3','2020-12-13 12:13:56','2020-12-13 12:13:56',0), -(20201217101514,'SliderWithLink','2020-12-17 10:26:31','2020-12-17 10:26:31',0), -(20201220182015,'ImproveMemberFeeAdministration','2020-12-20 18:26:10','2020-12-20 18:26:10',0), -(20210119101923,'CheckCreditBalanceLimit','2021-01-19 10:23:34','2021-01-19 10:23:34',0), -(20210401071718,'RemoveCustomerGroupSetting','2021-04-01 07:18:43','2021-04-01 07:18:43',0), -(20210401082727,'CustomerActivateEmailCode','2021-04-01 08:29:12','2021-04-01 08:29:12',0), -(20210419084816,'BlogPostShowOnStartPageUntilDate','2021-04-19 09:41:13','2021-04-19 09:41:13',0), -(20210427144234,'RemoveOldMemberFeeSetting','2021-04-27 15:04:53','2021-04-27 15:04:53',0), -(20210504085123,'SaveTaxInOrderDetails','2021-05-04 09:10:04','2021-05-04 09:10:04',0), -(20210510080630,'EnablePurchasePrices','2021-05-10 09:27:38','2021-05-10 09:27:38',0), -(20210707083827,'AddRegistrierkasseApi','2021-07-07 08:55:03','2021-07-07 08:55:03',0), -(20210802090623,'AddStorageLocation','2021-08-02 09:28:29','2021-08-02 09:28:29',0), -(20210910191430,'Instagram','2021-09-10 19:23:08','2021-09-10 19:23:08',0), -(20210914071747,'DifferentPricesForCustomers','2021-09-16 05:50:01','2021-09-16 05:50:01',0), -(20210922154148,'RemoveUnusedQueueTable','2021-09-22 15:42:59','2021-09-22 15:42:59',0), -(20210923073422,'RemoveSettingShowNewProductsOnHome','2021-09-23 07:39:22','2021-09-23 07:39:22',0), -(20210923090820,'AllowNullAsPurchasePrice','2021-09-23 09:09:41','2021-09-23 09:09:41',0), -(20211028083847,'UseExistingBarcode','2021-10-28 08:44:51','2021-10-28 08:44:51',0), -(20211123095227,'DeactivateCheckCreditReminder','2021-11-23 10:00:54','2021-11-23 10:00:54',0), -(20211213081433,'ImproveCustomerNotifications','2021-12-13 09:24:34','2021-12-13 09:24:34',0), -(20211213081434,'ImproveCustomerNotifications','2021-12-13 10:44:45','2021-12-13 10:44:45',0), -(20211215184633,'ManufacturerSettingIncludeStockProductsOnOrderList','2021-12-15 18:50:50','2021-12-15 18:50:50',0), -(20211229194617,'AddIndizesForBetterPerformance','2021-12-29 19:55:28','2021-12-29 19:55:28',0), -(20220129082136,'SendDeliveryNotesEveryMonth','2022-01-29 08:31:51','2022-01-29 08:31:51',0), -(20220201163254,'OptionalDeliveryRhythmSettingOrderInWeekBeforeDelivery','2022-02-01 16:48:35','2022-02-01 16:48:35',0), -(20220321103059,'PrefixForInvoices','2022-03-21 11:02:48','2022-03-21 11:02:48',0), -(20220323075926,'TaxBasedOnNetInvoiceSum','2022-03-23 08:12:23','2022-03-23 08:12:23',0), -(20220407093247,'AddIsCompanyFieldForCustomer','2022-04-07 09:37:26','2022-04-07 09:37:26',0), -(20220412131842,'Newsletter','2022-04-12 13:28:47','2022-04-12 13:28:47',0), -(20220525092822,'BiggerQueuedJobDataField','2022-05-25 09:31:51','2022-05-25 09:31:51',0), -(20220620091755,'RemoveTimebasedCurrencyModule','2022-06-20 09:30:19','2022-06-20 09:30:19',0), -(20220717194215,'UserFeedback','2022-07-19 12:39:27','2022-07-19 12:39:27',0); -/*!40000 ALTER TABLE `phinxlog` ENABLE KEYS */; - -/*!40000 ALTER TABLE `queue_phinxlog` DISABLE KEYS */; -INSERT INTO `queue_phinxlog` VALUES -(20150425180802,'Init','2020-09-17 07:23:19','2020-09-17 07:23:19',0), -(20150511062806,'Fixmissing','2020-09-17 07:23:19','2020-09-17 07:23:19',0), -(20150911132343,'ImprovementsForMysql','2020-09-17 07:23:19','2020-09-17 07:23:19',0), -(20161319000000,'IncreaseDataSize','2020-09-17 07:23:19','2020-09-17 07:23:19',0), -(20161319000001,'Priority','2020-09-17 07:23:19','2020-09-17 07:23:19',0), -(20161319000002,'Rename','2020-09-17 07:23:19','2020-09-17 07:23:19',0), -(20161319000003,'Processes','2020-09-17 07:23:19','2020-09-17 07:23:19',0), -(20171013131845,'AlterQueuedJobs','2020-09-17 07:23:19','2020-09-17 07:23:19',0), -(20171013133145,'Utf8mb4Fix','2020-09-17 07:23:19','2020-09-17 07:23:19',0), -(20171019083500,'ColumnLength','2020-09-17 07:23:19','2020-09-17 07:23:19',0), -(20171019083501,'MigrationQueueNull','2020-09-17 07:23:19','2020-09-17 07:23:19',0), -(20171019083502,'MigrationQueueStatus','2020-09-17 07:23:19','2020-09-17 07:23:20',0), -(20171019083503,'MigrationQueueProcesses','2020-09-17 07:23:20','2020-09-17 07:23:20',0), -(20171019083505,'MigrationQueueProcessesIndex','2020-09-17 07:23:20','2020-09-17 07:23:20',0), -(20171019083506,'MigrationQueueProcessesKey','2020-09-17 07:23:20','2020-09-17 07:23:20',0), -(20191319000002,'MigrationQueueRename','2021-07-20 11:12:52','2021-07-20 11:12:52',0); -/*!40000 ALTER TABLE `queue_phinxlog` ENABLE KEYS */; - -/*!40000 ALTER TABLE `queue_processes` DISABLE KEYS */; -/*!40000 ALTER TABLE `queue_processes` ENABLE KEYS */; - -/*!40000 ALTER TABLE `queued_jobs` DISABLE KEYS */; -/*!40000 ALTER TABLE `queued_jobs` ENABLE KEYS */; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - diff --git a/config/sql/_installation/clean-db-data-en_US.sql b/config/sql/_installation/clean-db-data-en_US.sql deleted file mode 100644 index 18ae036859..0000000000 --- a/config/sql/_installation/clean-db-data-en_US.sql +++ /dev/null @@ -1,328 +0,0 @@ - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!50503 SET NAMES utf8mb4 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- Truncate tables before insertion -TRUNCATE TABLE `fcs_action_logs`; -TRUNCATE TABLE `fcs_address`; -TRUNCATE TABLE `fcs_attribute`; -TRUNCATE TABLE `fcs_barcodes`; -TRUNCATE TABLE `fcs_blog_posts`; -TRUNCATE TABLE `fcs_cart_product_units`; -TRUNCATE TABLE `fcs_cart_products`; -TRUNCATE TABLE `fcs_carts`; -TRUNCATE TABLE `fcs_category`; -TRUNCATE TABLE `fcs_category_product`; -TRUNCATE TABLE `fcs_configuration`; -TRUNCATE TABLE `fcs_cronjob_logs`; -TRUNCATE TABLE `fcs_cronjobs`; -TRUNCATE TABLE `fcs_customer`; -TRUNCATE TABLE `fcs_deposits`; -TRUNCATE TABLE `fcs_feedbacks`; -TRUNCATE TABLE `fcs_images`; -TRUNCATE TABLE `fcs_invoice_taxes`; -TRUNCATE TABLE `fcs_invoices`; -TRUNCATE TABLE `fcs_manufacturer`; -TRUNCATE TABLE `fcs_order_detail`; -TRUNCATE TABLE `fcs_order_detail_feedbacks`; -TRUNCATE TABLE `fcs_order_detail_purchase_prices`; -TRUNCATE TABLE `fcs_order_detail_units`; -TRUNCATE TABLE `fcs_pages`; -TRUNCATE TABLE `fcs_payments`; -TRUNCATE TABLE `fcs_pickup_days`; -TRUNCATE TABLE `fcs_product`; -TRUNCATE TABLE `fcs_product_attribute`; -TRUNCATE TABLE `fcs_product_attribute_combination`; -TRUNCATE TABLE `fcs_purchase_prices`; -TRUNCATE TABLE `fcs_sliders`; -TRUNCATE TABLE `fcs_stock_available`; -TRUNCATE TABLE `fcs_storage_locations`; -TRUNCATE TABLE `fcs_sync_domains`; -TRUNCATE TABLE `fcs_sync_products`; -TRUNCATE TABLE `fcs_tax`; -TRUNCATE TABLE `fcs_units`; -TRUNCATE TABLE `phinxlog`; -TRUNCATE TABLE `queue_phinxlog`; -TRUNCATE TABLE `queue_processes`; -TRUNCATE TABLE `queued_jobs`; - -/*!40000 ALTER TABLE `fcs_action_logs` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_action_logs` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_address` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_address` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_attribute` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_attribute` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_barcodes` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_barcodes` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_blog_posts` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_blog_posts` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_cart_product_units` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_cart_product_units` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_cart_products` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_cart_products` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_carts` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_carts` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_category` DISABLE KEYS */; -INSERT INTO `fcs_category` VALUES -(20,2,'All products','',3,4,1,'2016-10-19 21:05:00','2016-10-19 21:05:00'); -/*!40000 ALTER TABLE `fcs_category` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_category_product` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_category_product` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_configuration` DISABLE KEYS */; -INSERT INTO `fcs_configuration` VALUES -(11,1,'FCS_PRODUCT_AVAILABILITY_LOW','Low availability
From which amount on there should be an information text visible \"(x available\")?
','10','number',600,'en_US','2017-07-26 13:24:47','2014-06-01 01:40:34'), -(31,1,'FCS_DAYS_SHOW_PRODUCT_AS_NEW','How many days products should be \"marked as new\"?','7','number',700,'en_US','2017-07-26 13:24:47','2014-05-14 21:15:45'), -(456,1,'FCS_FOOTER_CMS_TEXT','Additional text for footer',NULL,'textarea_big',920,'en_US','2014-06-11 17:50:55','2016-07-01 21:47:47'), -(508,1,'FCS_FACEBOOK_URL','Facebook url for embedding in footer','https://www.facebook.com/FoodCoopShop/','text',910,'en_US','2015-07-08 13:23:54','2015-07-08 13:23:54'), -(538,1,'FCS_REGISTRATION_EMAIL_TEXT','Additional text that is sent in the registration e-mail after a successful registration.
E-mail preview','','textarea_big',1700,'en_US','2016-06-26 00:00:00','2016-06-26 00:00:00'), -(543,1,'FCS_RIGHT_INFO_BOX_HTML','Content of the box in the right column below the shopping cart.
To make the background of a row green, please format as \"Heading 3\".
','

Delivery time

You can order every week until Tuesday midnight and pick the products up the following Friday.

','textarea_big',1500,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(544,1,'FCS_NO_DELIVERY_DAYS_GLOBAL','Delivery break for all manufacturers?
Here you can define delivery-free days for the whole food-coop.
','','multiple_dropdown',100,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(545,1,'FCS_ACCOUNTING_EMAIL','E-mail address for the financial manager
Who receives the notification that invoices have been sent?
','','text',1100,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(546,1,'FCS_REGISTRATION_INFO_TEXT','Info text in registration form
This info text is shown in the registration form below the e-mail address.
','You need to be a member if you want to order here.','textarea_big',1600,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(547,1,'FCS_SHOW_PRODUCTS_FOR_GUESTS','Products visible for guests?','0','boolean',200,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(548,1,'FCS_DEFAULT_NEW_MEMBER_ACTIVE','Automatically activate new members?','0','boolean',500,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(549,1,'FCS_MINIMAL_CREDIT_BALANCE','Up to which credit amount orders should be possible?','0','number',1250,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(550,1,'FCS_BANK_ACCOUNT_DATA','Bank account for credit uploads.','Credit account Example Bank / IBAN: AT65 5645 4154 8748 8999 / BIC: ABC87878','text',1300,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(552,1,'FCS_DELIVERY_DETAILS_FOR_MANUFACTURERS','Additional deliverey details for manufacturers
will be shown in the order lists after the delivery date.
',', 3pm to 5pm','text',1200,'en_US','2017-07-26 13:24:47','2017-07-26 13:24:47'), -(553,1,'FCS_BACKUP_EMAIL_ADDRESS_BCC','E-mail adress to which all automatically generated e-mail are sent to as BCC (Backup).
Can be left empty.
','','text',1900,'en_US','2016-10-06 00:00:00','2016-10-06 00:00:00'), -(554,1,'FCS_SHOW_FOODCOOPSHOP_BACKLINK','Show link to www.foodcoopshop.com?
The link is shown in the footer.
','1','boolean',930,'en_US','2016-11-27 00:00:00','2016-11-27 00:00:00'), -(556,1,'FCS_APP_NAME','Name of the food-coop','','text',50,'en_US','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(557,1,'FCS_APP_ADDRESS','Adress of the food-coop
Used in footer of homepage and e-mails, privacy policy and terms of use.
','','textarea',60,'en_US','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(558,1,'FCS_APP_EMAIL','E-mail adress of the food-coop
','','text',900,'en_US','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(559,1,'FCS_PLATFORM_OWNER','Operator of the platform
For privacy policy and terms of use, please also add adrress. Can be left empty if the food-coop itself is operator.
','','textarea',90,'en_US','2017-01-12 00:00:00','2017-01-12 00:00:00'), -(564,1,'FCS_ORDER_COMMENT_ENABLED','Show comment field when placing an order?
Shown in admin area under \"Orders\".
','1','boolean',130,'en_US','2017-07-09 00:00:00','2017-07-09 00:00:00'), -(565,1,'FCS_USE_VARIABLE_MEMBER_FEE','Use variable member fee?
Reduce the variable member fee in the manufacturer\'s invoices? Therefore the prices need to be increased.
','0','readonly',400,'en_US','2017-08-02 00:00:00','2017-08-02 00:00:00'), -(566,1,'FCS_DEFAULT_VARIABLE_MEMBER_FEE_PERCENTAGE','Default value for variable member fee
The percentage can be changed in the manufacturer\'s settings.
','0','readonly',500,'en_US','2017-08-02 00:00:00','2017-08-02 00:00:00'), -(567,1,'FCS_NETWORK_PLUGIN_ENABLED','Network module activated?
Infos to the network module
','0','readonly',500,'en_US','2017-09-14 00:00:00','2017-09-14 00:00:00'), -(574,1,'FCS_SHOW_PRODUCT_PRICE_FOR_GUESTS','Shop product price for guests?','0','boolean',210,'en_US','2018-05-28 18:05:54','2018-05-28 18:05:54'), -(575,1,'FCS_CURRENCY_SYMBOL','Currency symbol','$','readonly',520,'en_US','2018-06-13 19:53:14','2018-06-13 19:53:14'), -(576,1,'FCS_DEFAULT_LOCALE','Language','en_US','readonly',550,'en_US','2018-06-26 10:18:55','2018-06-26 10:18:55'), -(577,1,'FCS_FOODCOOPS_MAP_ENABLED','Show map with other foodcoops on home?','1','boolean',1280,'en_US','2019-02-11 22:25:36','2019-02-11 22:25:36'), -(578,1,'FCS_WEEKLY_PICKUP_DAY','Weekly pickup day','5','readonly',600,'en_US','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(579,1,'FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA','Sending of order lists: x days before pickup day','2','readonly',650,'en_US','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(580,1,'FCS_ORDER_POSSIBLE_FOR_STOCK_PRODUCTS_IN_ORDERS_WITH_DELIVERY_RHYTHM','Allow weekly orders for stock products?','1','boolean',750,'en_US','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(581,1,'FCS_SHOW_NON_STOCK_PRODUCTS_IN_INSTANT_ORDERS','Only show stock products in instant orders?','0','boolean',760,'en_US','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(582,1,'FCS_INCLUDE_STOCK_PRODUCTS_IN_INVOICES','Include stock products in invoices?','1','readonly',600,'en_US','2019-02-18 12:38:00','2019-02-18 12:38:00'), -(583,1,'FCS_REGISTRATION_NOTIFICATION_EMAILS','Who should be notified on new registrations?
Please separate multiple e-mail addresses with , (no space).
','','text',550,'en_US','2019-03-05 20:01:59','2019-03-05 20:01:59'), -(584,1,'FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED','Use self-service mode for stock products?
Online documentation
','0','boolean',3000,'en_US','2019-04-17 20:01:59','2019-04-17 20:01:59'), -(585,1,'FCS_APP_ADDITIONAL_DATA','Additional food-coop infos','','textarea',80,'en_US','2019-08-03 20:07:08','2019-08-03 20:07:08'), -(586,1,'FCS_SELF_SERVICE_MODE_TEST_MODE_ENABLED','Run self-service mode in test mode?
Does not add links to main menu and to stock products.
','0','boolean',3100,'en_US','2019-12-09 13:46:32','2019-12-09 13:46:32'), -(587,1,'FCS_CASHLESS_PAYMENT_ADD_TYPE','Type of adding the payments
How do the payment addings get into FoodCoopShop?
','list-upload','dropdown',1450,'en_US','2020-02-11 10:13:01','2020-02-11 10:13:01'), -(589,1,'FCS_FEEDBACK_TO_PRODUCTS_ENABLED','Are members allowed to write feedback to products?','0','boolean',3200,'en_US','2020-06-19 09:02:50','2020-06-19 09:02:50'), -(590,1,'FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY','Pickup day can be selected by member on order confirmation.','0','readonly',590,'en_US','2020-07-06 10:34:39','2020-07-06 10:34:39'), -(591,1,'FCS_SEND_INVOICES_TO_CUSTOMERS','Retail mode activated?.','0','readonly',580,'en_US','2020-10-29 10:06:39','2020-10-29 10:06:39'), -(592,1,'FCS_DEPOSIT_TAX_RATE','VAT for deposit','20.00','readonly',581,'en_US','2020-11-03 15:24:01','2020-11-03 15:24:01'), -(593,1,'FCS_INVOICE_HEADER_TEXT','Header text for invoices to members','','readonly',582,'en_US','2020-11-03 15:24:01','2020-11-03 15:24:01'), -(594,1,'FCS_MEMBER_FEE_PRODUCTS','Which products are used as member fee product?
The selected products are the basis for the column Member Fee in the members adminstration and are not shown in the turnover statistics.
','','multiple_dropdown',3300,'en_US','2020-12-20 19:26:16','2020-12-20 19:26:16'), -(595,1,'FCS_CHECK_CREDIT_BALANCE_LIMIT','Height of credit saldo when the reminder email is sent.','50','number',1450,'en_US','2021-01-19 11:23:39','2021-01-19 11:23:39'), -(596,1,'FCS_PURCHASE_PRICE_ENABLED','Enable input of purchase price?
The purchase price is the base for profit statistics and bill of delivery to manufacturers.
','0','readonly',587,'en_US','2021-05-10 11:27:43','2021-05-10 11:27:43'), -(597,1,'FCS_HELLO_CASH_API_ENABLED','Enable API to hellocash.at?
Invoices (cash and cashless) are generated by hellocash.at.
','0','readonly',583,'en_US','2021-07-07 10:55:08','2021-07-07 10:55:08'), -(598,1,'FCS_SAVE_STORAGE_LOCATION_FOR_PRODUCTS','Save storage location for products?
New button next to \"Orders - show order as pdf\"
','1','boolean',3210,'en_US','2021-08-02 11:28:34','2021-08-02 11:28:34'), -(599,1,'FCS_INSTAGRAM_URL','Instagram url for embedding in footer','','text',920,'en_US','2021-09-10 21:23:13','2021-09-10 21:23:13'), -(600,1,'FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY','Ordering products with delivery rhythm one or two weeks is only possible in the week before delivery.','0','boolean',3210,'en_US','2022-02-01 17:48:40','2022-02-01 17:48:40'), -(601,1,'FCS_INVOICE_NUMBER_PREFIX','Prefix for invoice numbers
Max. 6 chars incl. separator.
','','readonly',586,'en_US','2022-03-21 12:02:57','2022-03-21 12:02:57'), -(602,1,'FCS_TAX_BASED_ON_NET_INVOICE_SUM','Invoices for companies with fixed tax rate
Vat is calculated based on the sum of net price of the invoice.
','0','readonly',585,'en_US','2022-03-23 09:12:33','2022-03-23 09:12:33'), -(603,1,'FCS_NEWSLETTER_ENABLED','Newsletter enabled?
Shows newsletter checkbox on registration.
','0','boolean',3400,'en_US','2022-04-12 15:28:56','2022-04-12 15:28:56'), -(604,1,'FCS_USER_FEEDBACK_ENABLED','Member and manufacturer feedback enabled?
Members and manufacturers can write feedback.
','0','boolean',3500,'en_US','2022-07-19 14:39:36','2022-07-19 14:39:36'); -/*!40000 ALTER TABLE `fcs_configuration` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_cronjob_logs` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_cronjob_logs` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_cronjobs` DISABLE KEYS */; -INSERT INTO `fcs_cronjobs` VALUES -(1,'BackupDatabase','day',NULL,NULL,'04:00:00',1), -(2,'CheckCreditBalance','week',NULL,'Friday','22:30:00',1), -(3,'EmailOrderReminder','week',NULL,'Monday','18:00:00',1), -(4,'PickupReminder','week',NULL,'Monday','09:00:00',1), -(5,'SendInvoicesToManufacturers','month',11,NULL,'10:30:00',1), -(6,'SendOrderLists','day',NULL,NULL,'04:30:00',1), -(7,'SendInvoicesToCustomers','week',NULL,'Saturday','10:00:00',0), -(8,'SendDeliveryNotes','month',1,NULL,'18:00:00',0); -/*!40000 ALTER TABLE `fcs_cronjobs` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_customer` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_customer` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_deposits` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_deposits` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_feedbacks` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_feedbacks` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_images` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_images` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_invoice_taxes` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_invoice_taxes` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_invoices` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_invoices` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_manufacturer` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_manufacturer` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_order_detail` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_order_detail` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_order_detail_feedbacks` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_order_detail_feedbacks` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_order_detail_purchase_prices` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_order_detail_purchase_prices` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_order_detail_units` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_order_detail_units` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_pages` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_pages` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_payments` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_payments` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_pickup_days` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_pickup_days` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_product` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_product` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_product_attribute` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_product_attribute` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_product_attribute_combination` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_product_attribute_combination` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_purchase_prices` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_purchase_prices` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_sliders` DISABLE KEYS */; -INSERT INTO `fcs_sliders` VALUES -(1,'demo-slider.jpg',NULL,0,0,1); -/*!40000 ALTER TABLE `fcs_sliders` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_stock_available` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_stock_available` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_storage_locations` DISABLE KEYS */; -INSERT INTO `fcs_storage_locations` VALUES -(1,'No cooling',10), -(2,'Refrigerator',20), -(3,'Freezer',30); -/*!40000 ALTER TABLE `fcs_storage_locations` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_sync_domains` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_sync_domains` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_sync_products` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_sync_products` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_tax` DISABLE KEYS */; -INSERT INTO `fcs_tax` VALUES -(1,20.000,1,0), -(2,10.000,1,0), -(3,13.000,1,0); -/*!40000 ALTER TABLE `fcs_tax` ENABLE KEYS */; - -/*!40000 ALTER TABLE `fcs_units` DISABLE KEYS */; -/*!40000 ALTER TABLE `fcs_units` ENABLE KEYS */; - -/*!40000 ALTER TABLE `phinxlog` DISABLE KEYS */; -INSERT INTO `phinxlog` VALUES -(20200404145856,'RemoveV2Migrations','2020-04-04 15:01:08','2020-04-04 15:01:08',0), -(20200415073329,'ShowNewProductsOnHome','2020-04-15 07:41:58','2020-04-15 07:41:58',0), -(20200501192722,'EnableCashlessPaymentAddTypeConfiguration','2020-05-01 19:30:13','2020-05-01 19:30:13',0), -(20200618063024,'AddProductFeedback','2020-06-19 07:02:50','2020-06-19 07:02:50',0), -(20200703072605,'CustomerCanSelectPickupDay','2020-07-06 08:34:39','2020-07-06 08:34:39',0), -(20200831142250,'RemoveEmailLogTable','2020-08-31 15:10:25','2020-08-31 15:10:25',0), -(20200910091755,'AddMemberSettingUseCameraForMobileBarcodeScanning','2020-09-10 09:20:55','2020-09-10 09:20:55',0), -(20200925073919,'GermanIbanFix','2020-09-25 08:12:42','2020-09-25 08:12:42',0), -(20201017182431,'AdaptMinimalCreditBalance','2020-10-17 18:38:00','2020-10-17 18:38:00',0), -(20201029084931,'AddRetailMode','2020-10-29 09:06:39','2020-10-29 09:06:39',0), -(20201118084516,'AddRetailMode2','2020-11-18 08:47:37','2020-11-18 08:47:37',0), -(20201213120713,'AddRetailMode3','2020-12-13 12:14:01','2020-12-13 12:14:01',0), -(20201217101514,'SliderWithLink','2020-12-17 10:26:36','2020-12-17 10:26:37',0), -(20201220182015,'ImproveMemberFeeAdministration','2020-12-20 18:26:16','2020-12-20 18:26:16',0), -(20210119101923,'CheckCreditBalanceLimit','2021-01-19 10:23:39','2021-01-19 10:23:39',0), -(20210401071718,'RemoveCustomerGroupSetting','2021-04-01 07:18:49','2021-04-01 07:18:49',0), -(20210401082727,'CustomerActivateEmailCode','2021-04-01 08:29:17','2021-04-01 08:29:18',0), -(20210419084816,'BlogPostShowOnStartPageUntilDate','2021-04-19 09:41:18','2021-04-19 09:41:18',0), -(20210427144234,'RemoveOldMemberFeeSetting','2021-04-27 15:04:58','2021-04-27 15:04:58',0), -(20210504085123,'SaveTaxInOrderDetails','2021-05-04 09:10:09','2021-05-04 09:10:09',0), -(20210510080630,'EnablePurchasePrices','2021-05-10 09:27:43','2021-05-10 09:27:43',0), -(20210707083827,'AddRegistrierkasseApi','2021-07-07 08:55:08','2021-07-07 08:55:08',0), -(20210802090623,'AddStorageLocation','2021-08-02 09:28:34','2021-08-02 09:28:35',0), -(20210910191430,'Instagram','2021-09-10 19:23:13','2021-09-10 19:23:13',0), -(20210914071747,'DifferentPricesForCustomers','2021-09-16 05:50:07','2021-09-16 05:50:07',0), -(20210922154148,'RemoveUnusedQueueTable','2021-09-22 15:43:04','2021-09-22 15:43:04',0), -(20210923073422,'RemoveSettingShowNewProductsOnHome','2021-09-23 07:39:27','2021-09-23 07:39:27',0), -(20210923090820,'AllowNullAsPurchasePrice','2021-09-23 09:09:46','2021-09-23 09:09:46',0), -(20211028083847,'UseExistingBarcode','2021-10-28 08:44:56','2021-10-28 08:44:56',0), -(20211123095227,'DeactivateCheckCreditReminder','2021-11-23 10:01:00','2021-11-23 10:01:00',0), -(20211213081433,'ImproveCustomerNotifications','2021-12-13 09:24:39','2021-12-13 09:24:40',0), -(20211213081434,'ImproveCustomerNotifications','2021-12-13 10:44:50','2021-12-13 10:44:50',0), -(20211215184633,'ManufacturerSettingIncludeStockProductsOnOrderList','2021-12-15 18:50:55','2021-12-15 18:50:55',0), -(20211229194617,'AddIndizesForBetterPerformance','2021-12-29 19:55:34','2021-12-29 19:55:34',0), -(20220129082136,'SendDeliveryNotesEveryMonth','2022-01-29 08:31:56','2022-01-29 08:31:56',0), -(20220201163254,'OptionalDeliveryRhythmSettingOrderInWeekBeforeDelivery','2022-02-01 16:48:40','2022-02-01 16:48:40',0), -(20220321103059,'PrefixForInvoices','2022-03-21 11:02:57','2022-03-21 11:02:57',0), -(20220323075926,'TaxBasedOnNetInvoiceSum','2022-03-23 08:12:33','2022-03-23 08:12:33',0), -(20220407093247,'AddIsCompanyFieldForCustomer','2022-04-07 09:37:35','2022-04-07 09:37:35',0), -(20220412131842,'Newsletter','2022-04-12 13:28:56','2022-04-12 13:28:56',0), -(20220525092822,'BiggerQueuedJobDataField','2022-05-25 09:32:00','2022-05-25 09:32:00',0), -(20220620091755,'RemoveTimebasedCurrencyModule','2022-06-20 09:30:29','2022-06-20 09:30:29',0), -(20220717194215,'UserFeedback','2022-07-19 12:39:36','2022-07-19 12:39:36',0); -/*!40000 ALTER TABLE `phinxlog` ENABLE KEYS */; - -/*!40000 ALTER TABLE `queue_phinxlog` DISABLE KEYS */; -INSERT INTO `queue_phinxlog` VALUES -(20150425180802,'Init','2020-09-17 07:23:25','2020-09-17 07:23:25',0), -(20150511062806,'Fixmissing','2020-09-17 07:23:25','2020-09-17 07:23:25',0), -(20150911132343,'ImprovementsForMysql','2020-09-17 07:23:25','2020-09-17 07:23:25',0), -(20161319000000,'IncreaseDataSize','2020-09-17 07:23:25','2020-09-17 07:23:25',0), -(20161319000001,'Priority','2020-09-17 07:23:25','2020-09-17 07:23:25',0), -(20161319000002,'Rename','2020-09-17 07:23:25','2020-09-17 07:23:25',0), -(20161319000003,'Processes','2020-09-17 07:23:25','2020-09-17 07:23:25',0), -(20171013131845,'AlterQueuedJobs','2020-09-17 07:23:25','2020-09-17 07:23:25',0), -(20171013133145,'Utf8mb4Fix','2020-09-17 07:23:25','2020-09-17 07:23:25',0), -(20171019083500,'ColumnLength','2020-09-17 07:23:25','2020-09-17 07:23:25',0), -(20171019083501,'MigrationQueueNull','2020-09-17 07:23:25','2020-09-17 07:23:26',0), -(20171019083502,'MigrationQueueStatus','2020-09-17 07:23:26','2020-09-17 07:23:26',0), -(20171019083503,'MigrationQueueProcesses','2020-09-17 07:23:26','2020-09-17 07:23:26',0), -(20171019083505,'MigrationQueueProcessesIndex','2020-09-17 07:23:26','2020-09-17 07:23:26',0), -(20171019083506,'MigrationQueueProcessesKey','2020-09-17 07:23:26','2020-09-17 07:23:26',0), -(20191319000002,'MigrationQueueRename','2021-07-20 11:12:57','2021-07-20 11:12:57',0); -/*!40000 ALTER TABLE `queue_phinxlog` ENABLE KEYS */; - -/*!40000 ALTER TABLE `queue_processes` DISABLE KEYS */; -/*!40000 ALTER TABLE `queue_processes` ENABLE KEYS */; - -/*!40000 ALTER TABLE `queued_jobs` DISABLE KEYS */; -/*!40000 ALTER TABLE `queued_jobs` ENABLE KEYS */; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - diff --git a/config/sql/_installation/clean-db-structure.sql b/config/sql/_installation/clean-db-structure.sql deleted file mode 100644 index 97655aa0f7..0000000000 --- a/config/sql/_installation/clean-db-structure.sql +++ /dev/null @@ -1,706 +0,0 @@ - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!50503 SET NAMES utf8mb4 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; -DROP TABLE IF EXISTS `fcs_action_logs`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_action_logs` ( - `id` int NOT NULL AUTO_INCREMENT, - `type` varchar(255) NOT NULL DEFAULT '', - `customer_id` int unsigned NOT NULL DEFAULT '0', - `object_id` int unsigned NOT NULL DEFAULT '0', - `object_type` varchar(255) NOT NULL DEFAULT '', - `text` mediumtext NOT NULL, - `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_address`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_address` ( - `id_address` int unsigned NOT NULL AUTO_INCREMENT, - `id_customer` int unsigned NOT NULL DEFAULT '0', - `id_manufacturer` int unsigned NOT NULL DEFAULT '0', - `lastname` varchar(50) NOT NULL DEFAULT '', - `firstname` varchar(50) NOT NULL DEFAULT '', - `address1` varchar(128) NOT NULL DEFAULT '', - `address2` varchar(128) DEFAULT NULL, - `postcode` varchar(12) DEFAULT NULL, - `city` varchar(64) NOT NULL DEFAULT '', - `comment` mediumtext, - `phone` varchar(32) DEFAULT NULL, - `phone_mobile` varchar(32) DEFAULT NULL, - `email` varchar(255) DEFAULT NULL, - `date_add` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `date_upd` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`id_address`), - KEY `address_customer` (`id_customer`), - KEY `id_manufacturer` (`id_manufacturer`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_attribute`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_attribute` ( - `id_attribute` int unsigned NOT NULL AUTO_INCREMENT, - `name` varchar(128) DEFAULT NULL, - `can_be_used_as_unit` tinyint unsigned NOT NULL DEFAULT '0', - `active` int NOT NULL DEFAULT '1', - `created` datetime DEFAULT NULL, - `modified` datetime DEFAULT NULL, - PRIMARY KEY (`id_attribute`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_barcodes`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_barcodes` ( - `id` int unsigned NOT NULL AUTO_INCREMENT, - `product_id` int unsigned NOT NULL DEFAULT '0', - `product_attribute_id` int unsigned NOT NULL DEFAULT '0', - `barcode` varchar(13) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`id`), - KEY `product_id` (`product_id`,`product_attribute_id`), - KEY `barcode` (`barcode`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_blog_posts`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_blog_posts` ( - `id_blog_post` int unsigned NOT NULL AUTO_INCREMENT, - `title` varchar(150) NOT NULL, - `short_description` varchar(100) NOT NULL, - `content` longtext NOT NULL, - `id_customer` int unsigned NOT NULL DEFAULT '0', - `id_manufacturer` int unsigned DEFAULT NULL, - `is_private` int unsigned NOT NULL DEFAULT '0', - `active` int DEFAULT NULL, - `created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `modified` datetime DEFAULT NULL, - `show_on_start_page_until` date DEFAULT NULL, - PRIMARY KEY (`id_blog_post`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_cart_product_units`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_cart_product_units` ( - `id_cart_product` int unsigned NOT NULL, - `ordered_quantity_in_units` decimal(10,3) unsigned DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_cart_products`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_cart_products` ( - `id_cart_product` int unsigned NOT NULL AUTO_INCREMENT, - `id_cart` int unsigned NOT NULL DEFAULT '0', - `id_product` int unsigned NOT NULL DEFAULT '0', - `id_product_attribute` int unsigned NOT NULL DEFAULT '0', - `amount` int unsigned NOT NULL DEFAULT '0', - `created` datetime DEFAULT NULL, - `modified` datetime DEFAULT NULL, - PRIMARY KEY (`id_cart_product`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_carts`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_carts` ( - `id_cart` int unsigned NOT NULL AUTO_INCREMENT, - `id_customer` int unsigned NOT NULL DEFAULT '0', - `cart_type` int unsigned NOT NULL DEFAULT '1', - `status` tinyint NOT NULL DEFAULT '1', - `created` datetime DEFAULT NULL, - `modified` datetime DEFAULT NULL, - PRIMARY KEY (`id_cart`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_category`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_category` ( - `id_category` int unsigned NOT NULL AUTO_INCREMENT, - `id_parent` int unsigned DEFAULT '0', - `name` varchar(128) NOT NULL, - `description` mediumtext NOT NULL, - `nleft` int NOT NULL DEFAULT '0', - `nright` int NOT NULL DEFAULT '0', - `active` tinyint unsigned NOT NULL DEFAULT '0', - `created` datetime DEFAULT NULL, - `modified` datetime DEFAULT NULL, - PRIMARY KEY (`id_category`), - KEY `category_parent` (`id_parent`), - KEY `nleftrightactive` (`nleft`,`nright`,`active`), - KEY `nright` (`nright`), - KEY `activenleft` (`active`,`nleft`), - KEY `activenright` (`active`,`nright`), - KEY `active` (`active`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_category_product`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_category_product` ( - `id_category` int unsigned NOT NULL DEFAULT '0', - `id_product` int unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`id_category`,`id_product`), - KEY `id_product` (`id_product`), - KEY `id_category` (`id_category`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_configuration`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_configuration` ( - `id_configuration` int unsigned NOT NULL AUTO_INCREMENT, - `active` tinyint(1) NOT NULL DEFAULT '0', - `name` varchar(254) NOT NULL DEFAULT '', - `text` mediumtext NOT NULL, - `value` mediumtext, - `type` varchar(20) NOT NULL DEFAULT '', - `position` int unsigned NOT NULL DEFAULT '0', - `locale` varchar(5) DEFAULT NULL, - `date_add` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `date_upd` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`id_configuration`), - KEY `name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_cronjob_logs`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_cronjob_logs` ( - `id` int NOT NULL AUTO_INCREMENT, - `cronjob_id` int unsigned NOT NULL, - `created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `success` tinyint unsigned NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_cronjobs`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_cronjobs` ( - `id` int NOT NULL AUTO_INCREMENT, - `name` varchar(255) NOT NULL, - `time_interval` varchar(50) NOT NULL, - `day_of_month` tinyint unsigned DEFAULT NULL, - `weekday` varchar(50) DEFAULT NULL, - `not_before_time` time NOT NULL, - `active` tinyint unsigned NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_customer`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_customer` ( - `id_customer` int unsigned NOT NULL AUTO_INCREMENT, - `id_default_group` int unsigned NOT NULL DEFAULT '1', - `is_company` tinyint NOT NULL DEFAULT '0', - `firstname` varchar(50) NOT NULL DEFAULT '', - `lastname` varchar(50) NOT NULL DEFAULT '', - `email` varchar(128) NOT NULL DEFAULT '', - `passwd` char(60) DEFAULT NULL, - `tmp_new_passwd` char(60) DEFAULT NULL, - `activate_new_password_code` varchar(12) DEFAULT NULL, - `auto_login_hash` varchar(40) DEFAULT NULL, - `email_order_reminder_enabled` tinyint unsigned NOT NULL DEFAULT '0', - `terms_of_use_accepted_date` date NOT NULL DEFAULT '1000-01-01', - `activate_email_code` varchar(12) DEFAULT NULL, - `active` tinyint unsigned NOT NULL DEFAULT '0', - `date_add` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `date_upd` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `use_camera_for_barcode_scanning` tinyint unsigned DEFAULT '0', - `user_id_registrierkasse` int unsigned DEFAULT '0', - `shopping_price` varchar(2) DEFAULT 'SP', - `check_credit_reminder_enabled` tinyint unsigned DEFAULT '1', - `invoices_per_email_enabled` tinyint unsigned DEFAULT '1', - `pickup_day_reminder_enabled` tinyint unsigned DEFAULT '1', - `credit_upload_reminder_enabled` tinyint unsigned DEFAULT '1', - `newsletter_enabled` tinyint unsigned DEFAULT '0', - PRIMARY KEY (`id_customer`), - KEY `customer_email` (`email`), - KEY `customer_login` (`email`,`passwd`), - KEY `id_customer_passwd` (`id_customer`,`passwd`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_deposits`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_deposits` ( - `id` int NOT NULL AUTO_INCREMENT, - `id_product` int unsigned NOT NULL DEFAULT '0', - `id_product_attribute` int unsigned NOT NULL DEFAULT '0', - `deposit` double NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_feedbacks`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_feedbacks` ( - `id` int NOT NULL AUTO_INCREMENT, - `customer_id` int DEFAULT NULL, - `text` text, - `approved` datetime NOT NULL DEFAULT '1970-01-01 00:00:00', - `modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `privacy_type` tinyint DEFAULT '0', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_images`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_images` ( - `id_image` int unsigned NOT NULL AUTO_INCREMENT, - `id_product` int unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`id_image`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_invoice_taxes`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_invoice_taxes` ( - `id` int NOT NULL AUTO_INCREMENT, - `invoice_id` int unsigned NOT NULL DEFAULT '0', - `tax_rate` double(20,6) NOT NULL DEFAULT '0.000000', - `total_price_tax_excl` double(20,6) NOT NULL DEFAULT '0.000000', - `total_price_tax` double(20,6) NOT NULL DEFAULT '0.000000', - `total_price_tax_incl` double(20,6) NOT NULL DEFAULT '0.000000', - PRIMARY KEY (`id`), - KEY `invoice_id` (`invoice_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_invoices`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_invoices` ( - `id` int NOT NULL AUTO_INCREMENT, - `id_manufacturer` int unsigned NOT NULL DEFAULT '0', - `invoice_number` varchar(17) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '0', - `created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `id_customer` int unsigned NOT NULL DEFAULT '0', - `paid_in_cash` tinyint unsigned DEFAULT '0', - `filename` varchar(512) NOT NULL DEFAULT '', - `email_status` varchar(30) DEFAULT NULL, - `cancellation_invoice_id` int unsigned DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_manufacturer`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_manufacturer` ( - `id_manufacturer` int unsigned NOT NULL AUTO_INCREMENT, - `name` varchar(64) DEFAULT NULL, - `description` longtext, - `short_description` mediumtext, - `created` datetime DEFAULT NULL, - `modified` datetime DEFAULT NULL, - `active` tinyint(1) NOT NULL DEFAULT '0', - `is_private` int unsigned NOT NULL DEFAULT '0', - `uid_number` varchar(30) DEFAULT NULL, - `additional_text_for_invoice` mediumtext, - `iban` varchar(22) DEFAULT NULL, - `bic` varchar(11) DEFAULT NULL, - `bank_name` varchar(255) DEFAULT NULL, - `firmenbuchnummer` varchar(20) DEFAULT NULL, - `firmengericht` varchar(150) DEFAULT NULL, - `aufsichtsbehoerde` varchar(150) DEFAULT NULL, - `kammer` varchar(150) DEFAULT NULL, - `homepage` varchar(255) DEFAULT NULL, - `id_customer` int unsigned DEFAULT NULL, - `variable_member_fee` int unsigned DEFAULT NULL, - `send_invoice` tinyint unsigned DEFAULT NULL, - `send_order_list` tinyint unsigned DEFAULT NULL, - `default_tax_id` int unsigned DEFAULT NULL, - `default_tax_id_purchase_price` int unsigned DEFAULT NULL, - `send_order_list_cc` varchar(512) DEFAULT NULL, - `send_instant_order_notification` tinyint unsigned DEFAULT NULL, - `send_ordered_product_deleted_notification` int unsigned DEFAULT NULL, - `send_ordered_product_price_changed_notification` int unsigned DEFAULT NULL, - `send_ordered_product_amount_changed_notification` int unsigned DEFAULT NULL, - `enabled_sync_domains` varchar(50) DEFAULT NULL, - `stock_management_enabled` tinyint unsigned NOT NULL DEFAULT '0', - `send_product_sold_out_limit_reached_for_manufacturer` tinyint unsigned NOT NULL DEFAULT '0', - `send_product_sold_out_limit_reached_for_contact_person` tinyint unsigned NOT NULL DEFAULT '0', - `no_delivery_days` mediumtext, - `include_stock_products_in_order_lists` tinyint unsigned NOT NULL DEFAULT '1', - `send_delivery_notes` tinyint unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`id_manufacturer`), - KEY `stock_management_enabled` (`stock_management_enabled`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_order_detail`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_order_detail` ( - `id_order_detail` int unsigned NOT NULL AUTO_INCREMENT, - `product_id` int unsigned NOT NULL DEFAULT '0', - `product_attribute_id` int unsigned DEFAULT NULL, - `product_name` varchar(255) NOT NULL DEFAULT '', - `product_amount` int unsigned NOT NULL DEFAULT '0', - `total_price_tax_incl` decimal(20,6) NOT NULL DEFAULT '0.000000', - `total_price_tax_excl` decimal(20,6) NOT NULL DEFAULT '0.000000', - `tax_unit_amount` decimal(16,6) NOT NULL DEFAULT '0.000000', - `tax_total_amount` decimal(16,6) NOT NULL DEFAULT '0.000000', - `tax_rate` decimal(10,3) NOT NULL DEFAULT '0.000', - `deposit` decimal(10,2) NOT NULL DEFAULT '0.00', - `id_customer` int unsigned NOT NULL, - `id_invoice` int unsigned DEFAULT NULL, - `id_cart_product` int unsigned NOT NULL, - `order_state` tinyint unsigned NOT NULL, - `pickup_day` date NOT NULL, - `shopping_price` varchar(2) DEFAULT 'SP', - `created` datetime NOT NULL, - `modified` datetime NOT NULL, - PRIMARY KEY (`id_order_detail`), - KEY `product_id` (`product_id`), - KEY `product_attribute_id` (`product_attribute_id`), - KEY `id_customer` (`id_customer`), - KEY `pickup_day` (`pickup_day`), - KEY `created` (`created`), - KEY `order_state` (`order_state`), - KEY `product_name` (`product_name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_order_detail_feedbacks`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_order_detail_feedbacks` ( - `id_order_detail` int unsigned NOT NULL DEFAULT '0', - `text` text NOT NULL, - `customer_id` int unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`id_order_detail`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_order_detail_purchase_prices`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_order_detail_purchase_prices` ( - `id_order_detail` int unsigned NOT NULL, - `tax_rate` decimal(10,3) NOT NULL DEFAULT '0.000', - `total_price_tax_incl` decimal(20,6) NOT NULL DEFAULT '0.000000', - `total_price_tax_excl` decimal(20,6) NOT NULL DEFAULT '0.000000', - `tax_unit_amount` decimal(16,6) NOT NULL DEFAULT '0.000000', - `tax_total_amount` decimal(16,6) NOT NULL DEFAULT '0.000000', - PRIMARY KEY (`id_order_detail`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_order_detail_units`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_order_detail_units` ( - `id_order_detail` int NOT NULL DEFAULT '0', - `product_quantity_in_units` decimal(10,3) unsigned DEFAULT NULL, - `price_incl_per_unit` decimal(10,2) unsigned DEFAULT NULL, - `purchase_price_incl_per_unit` decimal(10,2) unsigned DEFAULT NULL, - `quantity_in_units` decimal(10,3) unsigned DEFAULT NULL, - `unit_name` varchar(50) NOT NULL DEFAULT '', - `unit_amount` int unsigned DEFAULT NULL, - `mark_as_saved` tinyint unsigned NOT NULL DEFAULT '0', - UNIQUE KEY `id_order_detail` (`id_order_detail`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_pages`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_pages` ( - `id_page` int unsigned NOT NULL AUTO_INCREMENT, - `title` varchar(128) NOT NULL, - `content` longtext NOT NULL, - `position` int unsigned NOT NULL DEFAULT '0', - `menu_type` varchar(255) NOT NULL DEFAULT 'header', - `active` tinyint NOT NULL DEFAULT '0', - `extern_url` varchar(255) NOT NULL DEFAULT '', - `id_customer` int unsigned NOT NULL DEFAULT '0', - `is_private` int unsigned NOT NULL DEFAULT '0', - `modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `full_width` tinyint unsigned NOT NULL DEFAULT '0', - `id_parent` int unsigned DEFAULT '0', - `lft` int NOT NULL DEFAULT '0', - `rght` int NOT NULL DEFAULT '0', - PRIMARY KEY (`id_page`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_payments`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_payments` ( - `id` int NOT NULL AUTO_INCREMENT, - `id_customer` int unsigned NOT NULL DEFAULT '0', - `id_manufacturer` int unsigned NOT NULL DEFAULT '0', - `type` varchar(20) NOT NULL DEFAULT 'product', - `amount` decimal(10,2) NOT NULL DEFAULT '0.00', - `text` varchar(255) NOT NULL DEFAULT '', - `date_add` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `date_changed` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `date_transaction_add` datetime DEFAULT NULL, - `transaction_text` mediumtext, - `invoice_id` int unsigned DEFAULT NULL, - `status` tinyint NOT NULL DEFAULT '1', - `approval` tinyint NOT NULL DEFAULT '0', - `approval_comment` mediumtext, - `changed_by` int unsigned NOT NULL DEFAULT '0', - `created_by` int unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_pickup_days`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_pickup_days` ( - `id` int unsigned NOT NULL AUTO_INCREMENT, - `customer_id` int unsigned NOT NULL, - `pickup_day` date NOT NULL, - `comment` mediumtext, - `products_picked_up` tinyint unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`id`), - KEY `customer_id` (`customer_id`), - KEY `pickup_day` (`pickup_day`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_product`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_product` ( - `id_product` int unsigned NOT NULL AUTO_INCREMENT, - `id_manufacturer` int unsigned DEFAULT NULL, - `id_tax` int unsigned NOT NULL DEFAULT '0', - `id_storage_location` tinyint unsigned NOT NULL DEFAULT '0', - `price` decimal(20,6) NOT NULL DEFAULT '0.000000', - `name` mediumtext NOT NULL, - `description` longtext, - `description_short` mediumtext, - `unity` varchar(255) DEFAULT NULL, - `is_declaration_ok` tinyint unsigned NOT NULL DEFAULT '0', - `is_stock_product` tinyint unsigned NOT NULL DEFAULT '0', - `active` int NOT NULL DEFAULT '0', - `delivery_rhythm_type` varchar(10) NOT NULL DEFAULT 'week', - `delivery_rhythm_count` tinyint NOT NULL DEFAULT '1', - `delivery_rhythm_first_delivery_day` date DEFAULT NULL, - `delivery_rhythm_order_possible_until` date DEFAULT NULL, - `delivery_rhythm_send_order_list_weekday` int unsigned DEFAULT NULL, - `delivery_rhythm_send_order_list_day` date DEFAULT NULL, - `created` datetime DEFAULT NULL, - `modified` datetime DEFAULT NULL, - PRIMARY KEY (`id_product`), - KEY `product_manufacturer` (`id_manufacturer`,`id_product`), - KEY `id_manufacturer` (`id_manufacturer`), - KEY `is_stock_product` (`is_stock_product`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_product_attribute`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_product_attribute` ( - `id_product_attribute` int unsigned NOT NULL AUTO_INCREMENT, - `id_product` int unsigned NOT NULL DEFAULT '0', - `price` decimal(20,6) NOT NULL DEFAULT '0.000000', - `default_on` tinyint unsigned DEFAULT NULL, - PRIMARY KEY (`id_product_attribute`), - KEY `product_attribute_product` (`id_product`), - KEY `id_product_id_product_attribute` (`id_product_attribute`,`id_product`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_product_attribute_combination`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_product_attribute_combination` ( - `id_attribute` int unsigned NOT NULL DEFAULT '0', - `id_product_attribute` int unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`id_attribute`,`id_product_attribute`), - KEY `id_product_attribute` (`id_product_attribute`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_purchase_prices`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_purchase_prices` ( - `id` int unsigned NOT NULL AUTO_INCREMENT, - `product_id` int unsigned NOT NULL DEFAULT '0', - `product_attribute_id` int unsigned NOT NULL DEFAULT '0', - `tax_id` int unsigned DEFAULT '0', - `price` decimal(20,6) DEFAULT NULL, - PRIMARY KEY (`id`), - KEY `product_id` (`product_id`,`product_attribute_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_sliders`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_sliders` ( - `id_slider` int unsigned NOT NULL AUTO_INCREMENT, - `image` varchar(255) DEFAULT NULL, - `link` varchar(999) DEFAULT NULL, - `is_private` int unsigned NOT NULL DEFAULT '0', - `position` int unsigned NOT NULL DEFAULT '0', - `active` tinyint NOT NULL DEFAULT '0', - PRIMARY KEY (`id_slider`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_stock_available`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_stock_available` ( - `id_stock_available` int unsigned NOT NULL AUTO_INCREMENT, - `id_product` int unsigned NOT NULL DEFAULT '0', - `id_product_attribute` int unsigned NOT NULL DEFAULT '0', - `quantity` int NOT NULL DEFAULT '0', - `quantity_limit` int NOT NULL DEFAULT '0', - `sold_out_limit` int DEFAULT NULL, - `always_available` tinyint unsigned NOT NULL DEFAULT '1', - `default_quantity_after_sending_order_lists` int unsigned DEFAULT NULL, - PRIMARY KEY (`id_stock_available`), - UNIQUE KEY `product_sqlstock` (`id_product`,`id_product_attribute`), - KEY `id_product` (`id_product`), - KEY `id_product_attribute` (`id_product_attribute`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_storage_locations`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_storage_locations` ( - `id` int NOT NULL AUTO_INCREMENT, - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `rank` tinyint unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_sync_domains`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_sync_domains` ( - `id` int NOT NULL AUTO_INCREMENT, - `domain` varchar(128) NOT NULL DEFAULT '', - `active` tinyint NOT NULL DEFAULT '1', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_sync_products`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_sync_products` ( - `id` int NOT NULL AUTO_INCREMENT, - `sync_domain_id` int unsigned NOT NULL DEFAULT '0', - `local_product_id` int unsigned NOT NULL DEFAULT '0', - `remote_product_id` int unsigned NOT NULL DEFAULT '0', - `local_product_attribute_id` int unsigned NOT NULL DEFAULT '0', - `remote_product_attribute_id` int unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_tax`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_tax` ( - `id_tax` int unsigned NOT NULL AUTO_INCREMENT, - `rate` decimal(10,3) NOT NULL DEFAULT '0.000', - `active` tinyint unsigned NOT NULL DEFAULT '1', - `deleted` tinyint unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`id_tax`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `fcs_units`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `fcs_units` ( - `id` int NOT NULL AUTO_INCREMENT, - `id_product` int unsigned DEFAULT NULL, - `id_product_attribute` int unsigned DEFAULT NULL, - `price_incl_per_unit` decimal(10,2) unsigned DEFAULT NULL, - `purchase_price_incl_per_unit` decimal(10,2) unsigned DEFAULT NULL, - `name` varchar(50) NOT NULL DEFAULT '', - `amount` int unsigned DEFAULT NULL, - `price_per_unit_enabled` tinyint NOT NULL DEFAULT '0', - `quantity_in_units` decimal(10,3) unsigned DEFAULT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `id_product` (`id_product`,`id_product_attribute`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `phinxlog`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `phinxlog` ( - `version` bigint NOT NULL, - `migration_name` varchar(100) DEFAULT NULL, - `start_time` timestamp NULL DEFAULT NULL, - `end_time` timestamp NULL DEFAULT NULL, - `breakpoint` tinyint(1) NOT NULL DEFAULT '0', - PRIMARY KEY (`version`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `queue_phinxlog`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `queue_phinxlog` ( - `version` bigint NOT NULL, - `migration_name` varchar(100) DEFAULT NULL, - `start_time` timestamp NULL DEFAULT NULL, - `end_time` timestamp NULL DEFAULT NULL, - `breakpoint` tinyint(1) NOT NULL DEFAULT '0', - PRIMARY KEY (`version`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `queue_processes`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `queue_processes` ( - `id` int NOT NULL AUTO_INCREMENT, - `pid` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `created` datetime NOT NULL, - `modified` datetime NOT NULL, - `terminate` tinyint(1) NOT NULL DEFAULT '0', - `server` varchar(90) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `workerkey` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `workerkey` (`workerkey`), - UNIQUE KEY `pid` (`pid`,`server`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; -/*!40101 SET character_set_client = @saved_cs_client */; -DROP TABLE IF EXISTS `queued_jobs`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `queued_jobs` ( - `id` int NOT NULL AUTO_INCREMENT, - `job_task` varchar(90) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `data` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, - `job_group` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `reference` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `created` datetime NOT NULL, - `notbefore` datetime DEFAULT NULL, - `fetched` datetime DEFAULT NULL, - `completed` datetime DEFAULT NULL, - `progress` float DEFAULT NULL, - `failed` int NOT NULL DEFAULT '0', - `failure_message` text, - `workerkey` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `priority` int NOT NULL DEFAULT '5', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; -/*!40101 SET character_set_client = @saved_cs_client */; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index f433fb9690..cf10f787fd 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -1,7 +1,9 @@ #!/usr/bin/env bash -CURRENT_UID=$(id -u):$(id -g) docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ./config/sql/_installation/clean-db-structure.sql -CURRENT_UID=$(id -u):$(id -g) docker compose exec -T database-dev mysql --port 3310 foodcoopshop-dev < ./tests/config/sql/test-db-data.sql +CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate -p Queue +CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate +CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations seed --source Seeds/tests --seed InitTestDataSeed + CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install bash ./devtools/setup-dev/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh diff --git a/devtools/setup-dev/init-database.sh b/devtools/setup-dev/init-database.sh new file mode 100644 index 0000000000..518f30c948 --- /dev/null +++ b/devtools/setup-dev/init-database.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +locale=$1 + +./bin/cake migrations migrate -p Queue +./bin/cake migrations migrate +./bin/cake migrations seed --source Seeds/locale/$locale --seed InitDataSeed +./bin/cake migrations seed --seed InitDataSeed \ No newline at end of file From 11ccf616320f98f7a00ce9bca4aad36a428048e9 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 3 Oct 2022 10:38:12 +0200 Subject: [PATCH 138/646] reset migrations for existing installations --- .../20220928063530_ResetMigrations.php | 19 ++++++++++++++++++ config/Migrations/20220928063531_Initial.php | 8 ++++++++ config/Migrations/schema-dump-default.lock | Bin 98105 -> 98196 bytes 3 files changed, 27 insertions(+) create mode 100644 config/Migrations/20220928063530_ResetMigrations.php diff --git a/config/Migrations/20220928063530_ResetMigrations.php b/config/Migrations/20220928063530_ResetMigrations.php new file mode 100644 index 0000000000..603c5e9e3e --- /dev/null +++ b/config/Migrations/20220928063530_ResetMigrations.php @@ -0,0 +1,19 @@ +execute("TRUNCATE phinxlog"); + } +} diff --git a/config/Migrations/20220928063531_Initial.php b/config/Migrations/20220928063531_Initial.php index 2ae9767cfb..cefe251d82 100644 --- a/config/Migrations/20220928063531_Initial.php +++ b/config/Migrations/20220928063531_Initial.php @@ -16,6 +16,14 @@ class Initial extends AbstractMigration */ public function up() { + + $query = "SELECT * FROM phinxlog"; + $rows = $this->fetchAll($query); + + if (count($rows) > 0) { + return; + } + $this->table('fcs_action_logs') ->addColumn('id', 'integer', [ 'autoIncrement' => true, diff --git a/config/Migrations/schema-dump-default.lock b/config/Migrations/schema-dump-default.lock index 16b495610732ff493e4407ccfbd76c96bf4234c5..be3554f9791eb6636fe6438124a1da112fc7bc5c 100644 GIT binary patch delta 2424 zcmZuydr*{B6rZ!~16bHqfmI|F(WPxtWC1}S@>?Y35d#iHijQ@L6<5|}*8>}yP7%45q}W$^f8@NLq>PN z<8+6iGJ^HvOyfG0-5(Q;`k3G&duvp7N37}%EHtV7B*hFbsxBNghZx&|ZKKvQHit`^ za!ATrn8j{VTc8%O>S+sB-PKc1+$o68$xn4PGz8qiAT3Dv4CIO|V-K(hIH)Djua#Ul z@qRSrlM5nPKcsk=9TLorc}uJHOw=`_;-;C4ti)d zYUAuP@>AC+6>9ImO`Yln|Rbn;S1vq?O_wrD{)3_pp+e)+XYRNvc z-7cV1AM(85mYm|9T&yS?jaN!1jk0GdPU+T&Hw)h`&6OfwEH&b(vg>kDzn9m_P*P{r zGB)S`@C*m4RUE+18nxXKtH;H+j$vdiO9f8pGMzquWtgM=b>A=zJnZaIH)*HqB?dhQ zU9l`pb%36$w}e|E5+J!TSIzi$SF-m-@+oB9(gL$F)$3>D<0Y@EJGgDtYbw9b*Us1+ z&1!z2-UCOd$!Q>)?lc4l{?_Xqw5xr zQSEq}8$CX`V+-4};%DZkdK#R{dA}Z^pcbTcaE7>qIGFDncnsiLH4m506p+iq@ zzbCg5`|F~yq{l=fdiE%Ih~g#CJr~p8pQ8$M#%d#7ZD7F+Gwa~Q5!BLYg_D8q+w}t* zhr_`SHZw6e-2I_iwwCS*sQih0+Zfw{m-cq3?90c-keVbIgWWab@t2QSHFDtc-t{Ag zC6?Ix)Q?^5WBD$sM4hA%t3EE%j$9O~=ja1^N5w~)f54#Lc=hmbq}(_WLgNV&9XMXb z9&yn5U)MyjQ6-pgTH$lV?-hD#%B>R@d7^yMjI�@uAl)o@Eh~zY#Jj3Vh_f3eeF% zf2<0N>XM%)C{0hMyZ$(#)IeLV7-b^K($;%jHJ(z#9@R_^h3Th@Zxt!8tLCByXRX)c zJGa@flw~$0TZezyzM|Le#K>|=C*Chtkodd>yh=n7TeJmw`9TewXLlX^4K3_ur_J%^ zA}#-$0XpS6_%~u8Rtd`Yn4v`;0X{Dd=0+elz5vZuJ*m!tChR_0Lb~fAX@sofu%jrQ z>BRrCo7@`*8<|5K8AyayX2Zd67!N1d965e-G7KAxnHl-1{y=j>Ykdg!Bov6VO)gjk zmD-sQlpM(`09L*oIAj~(4?hKIVZLU74G3q7No88P!>iUE3vYZ`t_can&$H!*%6}wb;c&w z`W>=uzH|~-`tf~Ur>T|PmrTuMZO1jZ&+JOAeHo9=EWmbWB9BSiJfI&PTQ0MTfFA+b z4u7^G@HEFG%3Fg62^6>(Jm>IS`Jde|?ks203s^l<15cbZP z(c!f62pfJCHQMwQ5j7RKEvH(Y*s_GvZe(L6lPV)t_EYH@!SraEP>3>ac6fWFnA^khU^+u$O5L$a zh-ql&J|d>A_Fb~JIw7b>b;5sX*CFyBsc++!ZQlJ<)CjwukB)WQRoV2h6HQUn1~atY z&}$X`DtC3>3s$&`#Hjt@hE(n-tEu}RQ%CkE<6OQT&A+5@>I}@U&BU)4lFM$Nb~lIC zU_Gnuc+&&DyK`~GsA2ve9?&QoKkDc5;nma}F^U}y6SFxisu-;71F2Cf+B;5dG0#sP zlW>&7(d@-fWzmyM9fG`BXNPj67jI{!ypi^W zeS66UoNXt2>+F8AC;HzfTYXME$msLWYQJP&_w4iqJ8wFhrF}6=BVx@L^8#ak=gltl30PR{ts4ZL*~XWvty@_4 z@6V|$S=hwn6)MeN37fk6Ju#{jQzG|BS@UnU%~yxDMc-o4%s~Phc7K_hLe}#@QgK?@ z)+afH6T|Ln2B#pF(q!ecIY4TWdgDMVCurd_+G5yNt-RO^I^2VouNlEWH^__4uw2Dt zm0JT~ttW;VGSD=wlOG4c5;p?=#A%4qOCi9gn0+i1TDX;mLSc+5$yY5fr@O@^%{( zc$tz2UPI&Vik9+bfhR2UT z*a#JrpbV%Hr!zD8S1wyOK_(^3%Fp_`TO#tE61b@LV8P*Zy?nhCoZOSm2i!HKe2&*r Y@<`9hmz^N*sf1khfK|R*1AT%20Z>w_=>Px# From ec326ed434e011c7c3f7c33981bd77889865127e Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 3 Oct 2022 11:42:24 +0200 Subject: [PATCH 139/646] cookie buttons fix --- webroot/css/global.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/webroot/css/global.css b/webroot/css/global.css index 457e23e561..06889bc6ee 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -598,9 +598,12 @@ tr.selected > td > div > i.far, table:not(.no-hover) tr:hover > td > div > i.far left: 1% ! important; } -.cookieConsentWrapper button[type="button"].cookieConsent__Button { +.cookieConsentWrapper button.cookieConsent__Button { display: none; } +.cookieConsentWrapper button.cookieConsent__Button:last-child { + display: block; +} .cookieConsentWrapper { box-shadow: none; border-radius: 3px; @@ -615,6 +618,9 @@ tr.selected > td > div > i.far, table:not(.no-hover) tr:hover > td > div > i.far .cookieConsentWrapper .cookieConsent { flex-direction: column; } +.cookieConsentWrapper .cookieConsent__Left a { + text-decoration: underline ! important; +} .cookieConsentWrapper .cookieConsent__Right { margin-top: 15px; } From 4a567968b800af2072f96836888b890fc2cabee3 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 3 Oct 2022 15:03:44 +0200 Subject: [PATCH 140/646] migrations --- .../20220928063530_ResetMigrations.php | 19 ---------- .../{ => init}/20220928063531_Initial.php | 7 ---- ...4125_AlterDataOnQueuedJobsToMediumtext.php | 0 ...063530_MarkInitialMigrationsAsMigrated.php | 33 ++++++++++++++++++ config/Migrations/schema-dump-default.lock | Bin 98196 -> 98105 bytes config/Seeds/AddTaxesAustriaSeed.php | 10 ------ config/Seeds/AddTaxesGermanySeed.php | 10 ------ config/Seeds/InitDataSeed.php | 13 ------- config/Seeds/locale/de_DE/InitDataSeed.php | 10 ------ config/Seeds/locale/en_US/InitDataSeed.php | 10 ------ config/Seeds/tests/InitTestDataSeed.php | 10 ------ devtools/setup-dev/init-database.sh | 10 ++++-- tests/bootstrap.php | 7 +++- 13 files changed, 47 insertions(+), 92 deletions(-) delete mode 100644 config/Migrations/20220928063530_ResetMigrations.php rename config/Migrations/{ => init}/20220928063531_Initial.php (99%) rename config/Migrations/{ => init}/20220928064125_AlterDataOnQueuedJobsToMediumtext.php (100%) create mode 100644 config/Migrations/prepare-for-update-from-v3.5/20220928063530_MarkInitialMigrationsAsMigrated.php diff --git a/config/Migrations/20220928063530_ResetMigrations.php b/config/Migrations/20220928063530_ResetMigrations.php deleted file mode 100644 index 603c5e9e3e..0000000000 --- a/config/Migrations/20220928063530_ResetMigrations.php +++ /dev/null @@ -1,19 +0,0 @@ -execute("TRUNCATE phinxlog"); - } -} diff --git a/config/Migrations/20220928063531_Initial.php b/config/Migrations/init/20220928063531_Initial.php similarity index 99% rename from config/Migrations/20220928063531_Initial.php rename to config/Migrations/init/20220928063531_Initial.php index cefe251d82..54d27b7055 100644 --- a/config/Migrations/20220928063531_Initial.php +++ b/config/Migrations/init/20220928063531_Initial.php @@ -17,13 +17,6 @@ class Initial extends AbstractMigration public function up() { - $query = "SELECT * FROM phinxlog"; - $rows = $this->fetchAll($query); - - if (count($rows) > 0) { - return; - } - $this->table('fcs_action_logs') ->addColumn('id', 'integer', [ 'autoIncrement' => true, diff --git a/config/Migrations/20220928064125_AlterDataOnQueuedJobsToMediumtext.php b/config/Migrations/init/20220928064125_AlterDataOnQueuedJobsToMediumtext.php similarity index 100% rename from config/Migrations/20220928064125_AlterDataOnQueuedJobsToMediumtext.php rename to config/Migrations/init/20220928064125_AlterDataOnQueuedJobsToMediumtext.php diff --git a/config/Migrations/prepare-for-update-from-v3.5/20220928063530_MarkInitialMigrationsAsMigrated.php b/config/Migrations/prepare-for-update-from-v3.5/20220928063530_MarkInitialMigrationsAsMigrated.php new file mode 100644 index 0000000000..7422dbb06a --- /dev/null +++ b/config/Migrations/prepare-for-update-from-v3.5/20220928063530_MarkInitialMigrationsAsMigrated.php @@ -0,0 +1,33 @@ +execute("TRUNCATE phinxlog"); + + $table = $this->table('phinxlog'); + $table->setData([ + [ + 'version' => 20220928063531, + 'migration_name' => 'Initial', + 'start_time' => FrozenTime::now(), + 'end_time' => FrozenTime::now(), + ], + [ + 'version' => 20220928064125, + 'migration_name' => 'AlterDataOnQueuedJobsToMediumtext', + 'start_time' => FrozenTime::now(), + 'end_time' => FrozenTime::now(), + ], + ]); + + $table->saveData(); + + } +} diff --git a/config/Migrations/schema-dump-default.lock b/config/Migrations/schema-dump-default.lock index be3554f9791eb6636fe6438124a1da112fc7bc5c..16b495610732ff493e4407ccfbd76c96bf4234c5 100644 GIT binary patch delta 1785 zcmY*Zdr*{B6rTh8fMsD<5D;uP-hl!sM1Y`fraTr!5*dk1LLP!35-+ncVN#~XadhK^ z-wcdN?f3{$nYqztg@FxH`j_VP7-PbjhH{)q2*sInl)iiJevAEe?mg$+dw%D4e)oPn zr~T@wc3=q5r#l;M<74cqM~>LU74G3q7No88P!>iUE3vYZ`t_can&$H!*%6}wb;c&w z`W>=uzH|~-`tf~Ur>T|PmrTuMZO1jZ&+JOAeHo9=EWmbWB9BSiJfI&PTQ0MTfFA+b z4u7^G@HEFG%3Fg62^6>(Jm>IS`Jde|?ks203s^l<15cbZP z(c!f62pfJCHQMwQ5j7RKEvH(Y*s_GvZe(L6lPV)t_EYH@!SraEP>3>ac6fWFnA^khU^+u$O5L$a zh-ql&J|d>A_Fb~JIw7b>b;5sX*CFyBsc++!ZQlJ<)CjwukB)WQRoV2h6HQUn1~atY z&}$X`DtC3>3s$&`#Hjt@hE(n-tEu}RQ%CkE<6OQT&A+5@>I}@U&BU)4lFM$Nb~lIC zU_Gnuc+&&DyK`~GsA2ve9?&QoKkDc5;nma}F^U}y6SFxisu-;71F2Cf+B;5dG0#sP zlW>&7(d@-fWzmyM9fG`BXNPj67jI{!ypi^W zeS66UoNXt2>+F8AC;HzfTYXME$msLWYQJP&_w4iqJ8wFhrF}6=BVx@L^8#ak=gltl30PR{ts4ZL*~XWvty@_4 z@6V|$S=hwn6)MeN37fk6Ju#{jQzG|BS@UnU%~yxDMc-o4%s~Phc7K_hLe}#@QgK?@ z)+afH6T|Ln2B#pF(q!ecIY4TWdgDMVCurd_+G5yNt-RO^I^2VouNlEWH^__4uw2Dt zm0JT~ttW;VGSD=wlOG4c5;p?=#A%4qOCi9gn0+i1TDX;mLSc+5$yY5fr@O@^%{( zc$tz2UPI&Vik9+bfhR2UT z*a#JrpbV%Hr!zD8S1wyOK_(^3%Fp_`TO#tE61b@LV8P*Zy?nhCoZOSm2i!HKe2&*r Y@<`9hmz^N*sf1khfK|R*1AT%20Z>w_=>Px# delta 2424 zcmZuydr*{B6rZ!~16bHqfmI|F(WPxtWC1}S@>?Y35d#iHijQ@L6<5|}*8>}yP7%45q}W$^f8@NLq>PN z<8+6iGJ^HvOyfG0-5(Q;`k3G&duvp7N37}%EHtV7B*hFbsxBNghZx&|ZKKvQHit`^ za!ATrn8j{VTc8%O>S+sB-PKc1+$o68$xn4PGz8qiAT3Dv4CIO|V-K(hIH)Djua#Ul z@qRSrlM5nPKcsk=9TLorc}uJHOw=`_;-;C4ti)d zYUAuP@>AC+6>9ImO`Yln|Rbn;S1vq?O_wrD{)3_pp+e)+XYRNvc z-7cV1AM(85mYm|9T&yS?jaN!1jk0GdPU+T&Hw)h`&6OfwEH&b(vg>kDzn9m_P*P{r zGB)S`@C*m4RUE+18nxXKtH;H+j$vdiO9f8pGMzquWtgM=b>A=zJnZaIH)*HqB?dhQ zU9l`pb%36$w}e|E5+J!TSIzi$SF-m-@+oB9(gL$F)$3>D<0Y@EJGgDtYbw9b*Us1+ z&1!z2-UCOd$!Q>)?lc4l{?_Xqw5xr zQSEq}8$CX`V+-4};%DZkdK#R{dA}Z^pcbTcaE7>qIGFDncnsiLH4m506p+iq@ zzbCg5`|F~yq{l=fdiE%Ih~g#CJr~p8pQ8$M#%d#7ZD7F+Gwa~Q5!BLYg_D8q+w}t* zhr_`SHZw6e-2I_iwwCS*sQih0+Zfw{m-cq3?90c-keVbIgWWab@t2QSHFDtc-t{Ag zC6?Ix)Q?^5WBD$sM4hA%t3EE%j$9O~=ja1^N5w~)f54#Lc=hmbq}(_WLgNV&9XMXb z9&yn5U)MyjQ6-pgTH$lV?-hD#%B>R@d7^yMjI�@uAl)o@Eh~zY#Jj3Vh_f3eeF% zf2<0N>XM%)C{0hMyZ$(#)IeLV7-b^K($;%jHJ(z#9@R_^h3Th@Zxt!8tLCByXRX)c zJGa@flw~$0TZezyzM|Le#K>|=C*Chtkodd>yh=n7TeJmw`9TewXLlX^4K3_ur_J%^ zA}#-$0XpS6_%~u8Rtd`Yn4v`;0X{Dd=0+elz5vZuJ*m!tChR_0Lb~fAX@sofu%jrQ z>BRrCo7@`*8<|5K8AyayX2Zd67!N1d965e-G7KAxnHl-1{y=j>Ykdg!Bov6VO)gjk zmD-sQlpM(`09L*oIAj~(4?hKIVZrunMany([ ['plugin' => 'Queue'], - [], + ['source' => 'Migrations' . DS . 'init'], ]); +// 2) add test data (generated to fit after run migrations in init folder) $migrations = new Migrations(); $migrations->seed([ 'connection' => 'test', 'source' => 'Seeds' . DS . 'tests', // needs to be a subfolder of config ]); +// 3) run new migrations (located in main folder) +$migrator->run([], false); + require dirname(__DIR__) . '/config/bootstrap_locale.php'; Security::setSalt(Configure::read('Security.salt_for_unit_tests')); From e91bd5f882af0a3c4a343f9e8ef24f5137c24ab8 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 3 Oct 2022 15:12:11 +0200 Subject: [PATCH 141/646] fixes --- devtools/init-dev-setup.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index cf10f787fd..8bbeb196a0 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -1,10 +1,12 @@ #!/usr/bin/env bash +CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install + CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate -p Queue -CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate +CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate --source Migrations/init CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations seed --source Seeds/tests --seed InitTestDataSeed +CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate -CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install bash ./devtools/setup-dev/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh docker compose run -w /var/www/html/webroot --rm node npm install From dd5ff485960e7d41326ee3d15c4a20a7dc20758b Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 3 Oct 2022 15:34:57 +0200 Subject: [PATCH 142/646] more size --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 13d46977c8..eb77fca6bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,7 +43,7 @@ services: image: mysql:8.0 container_name: fcs-database-test restart: always - tmpfs: /var/lib/mysql:exec,size=256M + tmpfs: /var/lib/mysql:exec,size=512M ports: - '3311:3306' environment: From 09b0d5c38dcf2531b66042ab919c2d17c9c20f36 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 4 Oct 2022 10:51:47 +0200 Subject: [PATCH 143/646] add npm to php-nginx docker image - for asset_compress build --- config/asset_compress.dev.ini | 12 ++++++++++++ config/docker-dev/node/Dockerfile | 3 --- config/docker-dev/php-nginx/Dockerfile | 2 +- devtools/init-dev-setup.sh | 2 +- devtools/setup-dev/copy-config-files.sh | 3 ++- docker-compose.yml | 9 --------- 6 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 config/asset_compress.dev.ini delete mode 100644 config/docker-dev/node/Dockerfile diff --git a/config/asset_compress.dev.ini b/config/asset_compress.dev.ini new file mode 100644 index 0000000000..ba1b9ee187 --- /dev/null +++ b/config/asset_compress.dev.ini @@ -0,0 +1,12 @@ +[filter_Uglifyjs] +node = /usr/bin/node +uglify = WEBROOT/node_modules/uglify-js/bin/uglifyjs +node_path = WEBROOT/node_modules/ +version = 3 +options = " --mangle" + +[filter_CleanCss] +node = /usr/bin/node +cleancss = WEBROOT/node_modules/clean-css-cli/bin/cleancss +node_path = WEBROOT/node_modules/ +options = " -O1 specialComments:none" diff --git a/config/docker-dev/node/Dockerfile b/config/docker-dev/node/Dockerfile deleted file mode 100644 index becdecba62..0000000000 --- a/config/docker-dev/node/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM node:18 - -RUN npm install -g npm-check-updates \ No newline at end of file diff --git a/config/docker-dev/php-nginx/Dockerfile b/config/docker-dev/php-nginx/Dockerfile index 9c4939dfc5..66a6f48b4d 100644 --- a/config/docker-dev/php-nginx/Dockerfile +++ b/config/docker-dev/php-nginx/Dockerfile @@ -1,3 +1,3 @@ FROM webdevops/php-nginx:8.1 -RUN apt-get update && apt-get install gettext-base && apt-get install gettext \ No newline at end of file +RUN apt-get update && apt-get install gettext-base && apt-get install gettext && apt-get -y install curl software-properties-common && curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install nodejs && npm install -g npm-check-updates \ No newline at end of file diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index f433fb9690..502ff4154f 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -5,4 +5,4 @@ CURRENT_UID=$(id -u):$(id -g) docker compose exec -T database-dev mysql --port 3 CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install bash ./devtools/setup-dev/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh -docker compose run -w /var/www/html/webroot --rm node npm install +CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html/webroot fcs-php-nginx npm install diff --git a/devtools/setup-dev/copy-config-files.sh b/devtools/setup-dev/copy-config-files.sh index 039ce936f2..7dbf40ca4a 100644 --- a/devtools/setup-dev/copy-config-files.sh +++ b/devtools/setup-dev/copy-config-files.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash cp -n ./config/custom_config.dev.php ./config/custom_config.php -cp -n ./config/credentials.default.php ./config/credentials.php \ No newline at end of file +cp -n ./config/credentials.default.php ./config/credentials.php +cp -n ./config/asset_compress.dev.ini ./config/asset_compress.local.ini \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 8493abbd93..8b0ac51f98 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -99,14 +99,5 @@ services: volumes: - ./:/var/www/html - node: - container_name: fcs-node - build: ./config/docker-dev/node - working_dir: /var/www/html - volumes: - - ./:/var/www/html - networks: - - fcs - networks: fcs: From caa0cdb09f031c77b40c15d1d8eac96b17ad0efa Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 4 Oct 2022 11:43:55 +0200 Subject: [PATCH 144/646] better format --- config/docker-dev/php-nginx/Dockerfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/config/docker-dev/php-nginx/Dockerfile b/config/docker-dev/php-nginx/Dockerfile index 66a6f48b4d..64e959d2d8 100644 --- a/config/docker-dev/php-nginx/Dockerfile +++ b/config/docker-dev/php-nginx/Dockerfile @@ -1,3 +1,11 @@ FROM webdevops/php-nginx:8.1 -RUN apt-get update && apt-get install gettext-base && apt-get install gettext && apt-get -y install curl software-properties-common && curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install nodejs && npm install -g npm-check-updates \ No newline at end of file +#https://tecadmin.net/install-latest-nodejs-npm-on-debian/ + +RUN apt-get update && \ + apt-get install gettext-base && apt-get install gettext && \ + apt-get -y install curl software-properties-common && \ + curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ + apt-get install nodejs && \ + npm install -g && \ + npm install -g npm-check-updates \ No newline at end of file From fd16c0579072b9b206910c949cc7e42c58e72c2d Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 4 Oct 2022 19:59:09 +0200 Subject: [PATCH 145/646] use official node image --- config/asset_compress.dev.ini | 12 ------------ config/docker-dev/php-nginx/Dockerfile | 13 +++++++------ devtools/init-dev-setup.sh | 2 +- devtools/setup-dev/copy-config-files.sh | 3 +-- 4 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 config/asset_compress.dev.ini diff --git a/config/asset_compress.dev.ini b/config/asset_compress.dev.ini deleted file mode 100644 index ba1b9ee187..0000000000 --- a/config/asset_compress.dev.ini +++ /dev/null @@ -1,12 +0,0 @@ -[filter_Uglifyjs] -node = /usr/bin/node -uglify = WEBROOT/node_modules/uglify-js/bin/uglifyjs -node_path = WEBROOT/node_modules/ -version = 3 -options = " --mangle" - -[filter_CleanCss] -node = /usr/bin/node -cleancss = WEBROOT/node_modules/clean-css-cli/bin/cleancss -node_path = WEBROOT/node_modules/ -options = " -O1 specialComments:none" diff --git a/config/docker-dev/php-nginx/Dockerfile b/config/docker-dev/php-nginx/Dockerfile index 64e959d2d8..81c3f0f021 100644 --- a/config/docker-dev/php-nginx/Dockerfile +++ b/config/docker-dev/php-nginx/Dockerfile @@ -1,11 +1,12 @@ +FROM node:latest AS node FROM webdevops/php-nginx:8.1 -#https://tecadmin.net/install-latest-nodejs-npm-on-debian/ +#https://stackoverflow.com/questions/44447821/how-to-create-a-docker-image-for-php-and-node +COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules +COPY --from=node /usr/local/bin/node /usr/local/bin/node + +RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm RUN apt-get update && \ apt-get install gettext-base && apt-get install gettext && \ - apt-get -y install curl software-properties-common && \ - curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ - apt-get install nodejs && \ - npm install -g && \ - npm install -g npm-check-updates \ No newline at end of file + npm install -g npm-check-updates diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index 502ff4154f..31743d96dd 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -5,4 +5,4 @@ CURRENT_UID=$(id -u):$(id -g) docker compose exec -T database-dev mysql --port 3 CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install bash ./devtools/setup-dev/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh -CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html/webroot fcs-php-nginx npm install +docker exec -w /var/www/html/webroot fcs-php-nginx npm install \ No newline at end of file diff --git a/devtools/setup-dev/copy-config-files.sh b/devtools/setup-dev/copy-config-files.sh index 7dbf40ca4a..039ce936f2 100644 --- a/devtools/setup-dev/copy-config-files.sh +++ b/devtools/setup-dev/copy-config-files.sh @@ -1,5 +1,4 @@ #!/usr/bin/env bash cp -n ./config/custom_config.dev.php ./config/custom_config.php -cp -n ./config/credentials.default.php ./config/credentials.php -cp -n ./config/asset_compress.dev.ini ./config/asset_compress.local.ini \ No newline at end of file +cp -n ./config/credentials.default.php ./config/credentials.php \ No newline at end of file From 1b2e259185b2d02552fa1e040dbdc31090ee9189 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 4 Oct 2022 20:05:32 +0200 Subject: [PATCH 146/646] bootstrap update --- webroot/package-lock.json | 14 +++++++------- webroot/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/webroot/package-lock.json b/webroot/package-lock.json index a2fcc9d032..5c558ad372 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -12,7 +12,7 @@ "@ericblade/quagga2": "^1.7.4", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", - "bootstrap": "^5.2.1", + "bootstrap": "^5.2.2", "bootstrap-select": "^1.14.0-beta3", "chart.js": "^3.9.1", "chartjs-plugin-datalabels": "^2.1.0", @@ -199,9 +199,9 @@ } }, "node_modules/bootstrap": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.1.tgz", - "integrity": "sha512-UQi3v2NpVPEi1n35dmRRzBJFlgvWHYwyem6yHhuT6afYF+sziEt46McRbT//kVXZ7b1YUYEVGdXEH74Nx3xzGA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.2.tgz", + "integrity": "sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ==", "funding": [ { "type": "github", @@ -1268,9 +1268,9 @@ "optional": true }, "bootstrap": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.1.tgz", - "integrity": "sha512-UQi3v2NpVPEi1n35dmRRzBJFlgvWHYwyem6yHhuT6afYF+sziEt46McRbT//kVXZ7b1YUYEVGdXEH74Nx3xzGA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.2.tgz", + "integrity": "sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ==", "requires": {} }, "bootstrap-select": { diff --git a/webroot/package.json b/webroot/package.json index 7bd08197c3..0085054cec 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -18,7 +18,7 @@ "@ericblade/quagga2": "^1.7.4", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", - "bootstrap": "^5.2.1", + "bootstrap": "^5.2.2", "bootstrap-select": "^1.14.0-beta3", "chart.js": "^3.9.1", "chartjs-plugin-datalabels": "^2.1.0", From c38abc724eb3dfd86ee9f905bf5fa17ba98ff9c6 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 4 Oct 2022 20:19:22 +0200 Subject: [PATCH 147/646] set npm cache path --- config/docker-dev/php-nginx/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/docker-dev/php-nginx/Dockerfile b/config/docker-dev/php-nginx/Dockerfile index 81c3f0f021..5166178229 100644 --- a/config/docker-dev/php-nginx/Dockerfile +++ b/config/docker-dev/php-nginx/Dockerfile @@ -7,6 +7,9 @@ COPY --from=node /usr/local/bin/node /usr/local/bin/node RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm +#avoid permission error on gitpod on running npm install +RUN npm config set cache /var/www/html/tmp --global + RUN apt-get update && \ apt-get install gettext-base && apt-get install gettext && \ npm install -g npm-check-updates From e6eca088527cbc9fad720ded926e7b95c0e11f23 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 5 Oct 2022 09:51:05 +0200 Subject: [PATCH 148/646] code cleaning --- src/Shell/BackupDatabaseShell.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Shell/BackupDatabaseShell.php b/src/Shell/BackupDatabaseShell.php index 3400f7ec69..ca63443b3c 100644 --- a/src/Shell/BackupDatabaseShell.php +++ b/src/Shell/BackupDatabaseShell.php @@ -16,7 +16,6 @@ namespace App\Shell; use Cake\Mailer\Mailer; -use Cake\Utility\Inflector; use Cake\Core\Configure; use Cake\Datasource\ConnectionManager; use Cake\I18n\Number; From ef4bf3e0f53a2c1a142a84a1957ae8936633b4b3 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 5 Oct 2022 09:56:07 +0200 Subject: [PATCH 149/646] lock specific node version --- config/docker-dev/php-nginx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/docker-dev/php-nginx/Dockerfile b/config/docker-dev/php-nginx/Dockerfile index 5166178229..d373442279 100644 --- a/config/docker-dev/php-nginx/Dockerfile +++ b/config/docker-dev/php-nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM node:latest AS node +FROM node:18 AS node FROM webdevops/php-nginx:8.1 #https://stackoverflow.com/questions/44447821/how-to-create-a-docker-image-for-php-and-node From 7476fc14fa19c0cf27dda45189cb7ece016322a2 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 5 Oct 2022 17:43:12 +0200 Subject: [PATCH 150/646] Use docker for github action tests (#887) * tests * syntax * syntax * syntax * run * init * syntax * run * split * apply secrets * for github actions * upload files * more size * phpstan / eslint * error * do not skip * add hint * remove test * remove github actions config files * restore old naming * set name --- .github/workflows/ci.yml | 74 ++++------------ .github/workflows/credentials.php | 27 ------ .github/workflows/custom_config.php | 88 ------------------- config/custom_config.dev.php | 10 ++- docker-compose.yml | 2 +- ...OrderDetailsControllerEditQuantityTest.php | 3 +- 6 files changed, 31 insertions(+), 173 deletions(-) delete mode 100644 .github/workflows/credentials.php delete mode 100644 .github/workflows/custom_config.php diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8d74e52c89..3986c64034 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,60 +7,27 @@ on: pull_request: paths-ignore: - '**.md' - + jobs: ci: runs-on: ubuntu-22.04 - continue-on-error: ${{matrix.experimental}} - strategy: - matrix: - php-version: ['8.1'] - experimental: [false] - services: - mysql: - image: mysql:8.0 - ports: - - 8888:3306 - env: - MYSQL_ROOT_PASSWORD: password - MYSQL_DATABASE: foodcoopshop_test - options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 - name: PHP ${{matrix.php-version}} - + name: FoodCoopShop CI steps: - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{matrix.php-version}} - env: - update: true #forces minor release update - - - name: Setup NodeJS - uses: actions/setup-node@v2 - with: - node-version: '18' - - - uses: actions/checkout@v2 + - name: Checkout code + uses: actions/checkout@v2 + - name: Run Docker Compose + run: CURRENT_UID=$(id -u):$(id -g) docker compose up -d + + - name: Setup Dev Environment + run: bash ./devtools/init-dev-setup.sh + - name: Apply secrets run: | - sed -i 's/HELLO_CASH_USERNAME/${{secrets.HELLO_CASH_USERNAME}}/' ./.github/workflows/custom_config.php - sed -i 's/HELLO_CASH_PASSWORD/${{secrets.HELLO_CASH_PASSWORD}}/' ./.github/workflows/custom_config.php - sed -i 's/HELLO_CASH_CASHIER_ID/${{secrets.HELLO_CASH_CASHIER_ID}}/' ./.github/workflows/custom_config.php - - - name: Setup DB - run: | - mysql --version - mysql -h 127.0.0.1 --port 8888 -u root -ppassword foodcoopshop_test < ./config/sql/_installation/clean-db-structure.sql - mysql -h 127.0.0.1 --port 8888 -u root -ppassword foodcoopshop_test < ./tests/config/sql/test-db-data.sql - - - name: Install vendors - run: | - composer install --optimize-autoloader --no-progress - cp ./.github/workflows/*.php ./config/ - npm --prefix ./webroot install ./webroot - + sed -i 's/HELLO_CASH_USERNAME/${{secrets.HELLO_CASH_USERNAME}}/' ./config/custom_config.php + sed -i 's/HELLO_CASH_PASSWORD/${{secrets.HELLO_CASH_PASSWORD}}/' ./config/custom_config.php + sed -i 's/HELLO_CASH_CASHIER_ID/${{secrets.HELLO_CASH_CASHIER_ID}}/' ./config/custom_config.php + - name: Upload files to server if: ${{github.event_name == 'push'}} uses: up9cloud/action-rsync@master @@ -75,17 +42,14 @@ jobs: echo ${{secrets.DEPLOY_PATH}}/builds/${{github.ref}} mkdir -p ${{secrets.DEPLOY_PATH}}/builds/${{github.ref}} SSH_ARGS: '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' - + - name: PHPStan - if: always() - run: vendor/bin/phpstan analyze -c phpstan.neon --no-interaction --no-progress + run: docker exec -w /var/www/html fcs-php-nginx php ./vendor/bin/phpstan analyze -c phpstan.neon --no-interaction --no-progress - name: ESLint - if: always() run: | npm install -g eslint bash devtools/eslint.sh - - - name: PHPUnit - if: always() - run: vendor/bin/phpunit + + - name: PHPUnit Tests + run: docker exec -w /var/www/html fcs-php-nginx php ./vendor/bin/phpunit diff --git a/.github/workflows/credentials.php b/.github/workflows/credentials.php deleted file mode 100644 index e8f9f68b4f..0000000000 --- a/.github/workflows/credentials.php +++ /dev/null @@ -1,27 +0,0 @@ - - * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com - * @link https://www.foodcoopshop.com - */ - -return [ - 'app' => [ - - /** - * set to true if you want to receive debug emails when exceptions are triggered - */ - 'emailErrorLoggingEnabled' => false, - ] -]; diff --git a/.github/workflows/custom_config.php b/.github/workflows/custom_config.php deleted file mode 100644 index cb3ea0679a..0000000000 --- a/.github/workflows/custom_config.php +++ /dev/null @@ -1,88 +0,0 @@ - - * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com - * @link https://www.foodcoopshop.com - */ - -return [ - 'debug' => true, - 'EmailTransport' => [ - 'default' => [ - 'className' => 'Mail', - ] - ], - 'Email' => [ - 'default' => [ - 'transport' => 'default', - 'from' => 'you@localhost' - ], - ], - 'Datasources' => [ - 'default' => [ - 'host' => '127.0.0.1', - 'username' => 'root', - 'password' => 'password', - 'database' => 'foodcoopshop_test', - 'port' => '8888', - ], - 'test' => [ - 'host' => '127.0.0.1', - 'username' => 'root', - 'password' => 'password', - 'database' => 'foodcoopshop_test', - 'port' => '8888', - ] - ], - - /** - * A random string used in security hashing methods. - */ - 'Security.salt' => 'b6OSgpEV0vA36P3PxjWigmbQc6J5CLhs3bSV89KK8m1IKkl8gJfp84Odz3gMdW9K', - - 'app' => [ - /** - * your host's name, eg. http://www.yourfoodcoop.com - */ - 'cakeServerName' => 'http://localhost', - - /** - * cronjob needs to be activated too - */ - 'emailOrderReminderEnabled' => true, - - 'outputStringReplacements' => [ - 'This is a test' => 'This is another test', - ], - - /** - * valid options of array: 'cashless' or 'cash' (or both but this is not recommended) - */ - 'paymentMethods' => [ - 'cashless' - ], - - 'helloCashAtCredentials' => [ - 'username' => 'HELLO_CASH_USERNAME', - 'password' => 'HELLO_CASH_PASSWORD', - 'cashier_id' => 'HELLO_CASH_CASHIER_ID', - 'payment_type_cash' => 'Bar', - 'payment_type_cashless' => 'Kreditrechnung', - ], - - ] -]; diff --git a/config/custom_config.dev.php b/config/custom_config.dev.php index 0d89acb9cf..a97013afd2 100644 --- a/config/custom_config.dev.php +++ b/config/custom_config.dev.php @@ -100,7 +100,15 @@ */ 'paymentMethods' => [ 'cashless' - ] + ], + + 'helloCashAtCredentials' => [ + 'username' => 'HELLO_CASH_USERNAME', + 'password' => 'HELLO_CASH_PASSWORD', + 'cashier_id' => 'HELLO_CASH_CASHIER_ID', + 'payment_type_cash' => 'Bar', + 'payment_type_cashless' => 'Kreditrechnung', + ], ] ]; diff --git a/docker-compose.yml b/docker-compose.yml index 8b0ac51f98..1e8d170147 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,7 +43,7 @@ services: image: mysql:8.0 container_name: fcs-database-test restart: always - tmpfs: /var/lib/mysql:exec,size=256M + tmpfs: /var/lib/mysql:exec,size=1G #smaller size (eg. 256M) lead to failing tests ports: - '3311:3306' environment: diff --git a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditQuantityTest.php b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditQuantityTest.php index 89566b13b0..c83a6e88b3 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditQuantityTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditQuantityTest.php @@ -155,9 +155,9 @@ public function testEditOrderDetailQuantityAsSuperadminUserUsedWrongUnit() * https://github.com/foodcoopshop/foodcoopshop/issues/836 * fix is not yet implemented */ + /* public function testEditOrderDetailQuantityAsSuperadminWithHugeQuantity() { - $this->markTestSkipped(); $this->loginAsSuperadmin(); $this->OrderDetail->deleteAll([]); $this->changeConfiguration('FCS_MINIMAL_CREDIT_BALANCE', -1000); @@ -180,6 +180,7 @@ public function testEditOrderDetailQuantityAsSuperadminWithHugeQuantity() $this->assertEquals(18.32, $changedOrderDetails[0]->tax_total_amount); } + */ private function preparePricePerUnitOrder() { From 9d5a3b863a3be3ff283696d26b05978784805184 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 5 Oct 2022 20:24:39 +0200 Subject: [PATCH 151/646] copy first --- devtools/init-dev-setup.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index 6640fb166e..faeb1e227f 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash +bash ./devtools/setup-dev/set-permissions.sh +bash ./devtools/setup-dev/copy-config-files.sh + CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate -p Queue @@ -7,6 +10,4 @@ CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./ CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations seed --source Seeds/tests --seed InitTestDataSeed CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate -bash ./devtools/setup-dev/set-permissions.sh -bash ./devtools/setup-dev/copy-config-files.sh docker exec -w /var/www/html/webroot fcs-php-nginx npm install \ No newline at end of file From c365d41ed464e434f97db2675b1920963a8f7109 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 5 Oct 2022 20:53:03 +0200 Subject: [PATCH 152/646] avoid errors --- .github/workflows/ci.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3986c64034..c3804e8848 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,8 +20,13 @@ jobs: run: CURRENT_UID=$(id -u):$(id -g) docker compose up -d - name: Setup Dev Environment - run: bash ./devtools/init-dev-setup.sh - + run: | + # do not use ./devtools/init-dev-setup.sh because dev db is not needed + bash ./devtools/setup-dev/set-permissions.sh + bash ./devtools/setup-dev/copy-config-files.sh + docker compose run --rm composer install + docker exec -w /var/www/html/webroot fcs-php-nginx npm install + - name: Apply secrets run: | sed -i 's/HELLO_CASH_USERNAME/${{secrets.HELLO_CASH_USERNAME}}/' ./config/custom_config.php @@ -49,7 +54,7 @@ jobs: - name: ESLint run: | npm install -g eslint - bash devtools/eslint.sh + bash ./devtools/eslint.sh - name: PHPUnit Tests run: docker exec -w /var/www/html fcs-php-nginx php ./vendor/bin/phpunit From 1c563bf5cb1be09922693d3ce604167182f318f3 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 5 Oct 2022 20:56:47 +0200 Subject: [PATCH 153/646] permission fix --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3804e8848..2a1d4c8465 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,8 +24,8 @@ jobs: # do not use ./devtools/init-dev-setup.sh because dev db is not needed bash ./devtools/setup-dev/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh - docker compose run --rm composer install - docker exec -w /var/www/html/webroot fcs-php-nginx npm install + CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install + CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html/webroot fcs-php-nginx npm install - name: Apply secrets run: | From 6f266389a70ecbc9b1dd2ef96326918bc066fcef Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 5 Oct 2022 21:11:41 +0200 Subject: [PATCH 154/646] phpmyadmin not needed --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a1d4c8465..4c3881fcc6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,9 @@ jobs: uses: actions/checkout@v2 - name: Run Docker Compose - run: CURRENT_UID=$(id -u):$(id -g) docker compose up -d + run: | + CURRENT_UID=$(id -u):$(id -g) docker compose up php-nginx -d + CURRENT_UID=$(id -u):$(id -g) docker compose up composer -d - name: Setup Dev Environment run: | From 25458369f61adc12cb8257da2c82357409093dc3 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Thu, 6 Oct 2022 11:17:15 +0200 Subject: [PATCH 155/646] fix for available config data --- tests/TestCase/src/Lib/HelloCash/HelloCashTest.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/TestCase/src/Lib/HelloCash/HelloCashTest.php b/tests/TestCase/src/Lib/HelloCash/HelloCashTest.php index fc76c9042a..01130e5830 100644 --- a/tests/TestCase/src/Lib/HelloCash/HelloCashTest.php +++ b/tests/TestCase/src/Lib/HelloCash/HelloCashTest.php @@ -34,9 +34,10 @@ class HelloCashTest extends AppCakeTestCase public function setUp(): void { if ( - Configure::read('app.helloCashAtCredentials.username') == '' - || Configure::read('app.helloCashAtCredentials.password') == '' - || Configure::read('app.helloCashAtCredentials.cashier_id') == '' + in_array(Configure::read('app.helloCashAtCredentials.username'), [ + '', + Configure::read('app.helloCashAtCredentials.username') == 'HELLO_CASH_USERNAME', + ]) ) { $this->markTestSkipped('The credentials for HelloCash are missing.'); } From fb5d9c003b39a60892ac4ca10f7e0db4279bd414 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Fri, 7 Oct 2022 21:52:24 +0200 Subject: [PATCH 156/646] no more -0,00 credits --- src/Model/Table/CustomersTable.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Model/Table/CustomersTable.php b/src/Model/Table/CustomersTable.php index 561a0ee87f..a834be8a6f 100644 --- a/src/Model/Table/CustomersTable.php +++ b/src/Model/Table/CustomersTable.php @@ -585,7 +585,9 @@ public function getCreditBalance($customerId) $depositSum = $orderDetailTable->getSumDeposit($customerId); // rounding avoids problems with very tiny numbers (eg. 2.8421709430404E-14) - return round($paymentProductSum - $paybackProductSum + $paymentDepositSum - $productSum - $depositSum, 2); + $creditBalance = round($paymentProductSum - $paybackProductSum + $paymentDepositSum - $productSum - $depositSum, 2); + // "+ 0" converts -0,00 to 0,00 + return $creditBalance + 0; } public function getForDropdown($includeManufacturers = false, $includeOfflineCustomers = true, $conditions = []) From f9f0c048b9f9352803e234cdae34defaa3dd4740 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 10 Oct 2022 12:45:42 +0200 Subject: [PATCH 157/646] no more -0,00 --- plugins/Admin/src/Controller/CustomersController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/Admin/src/Controller/CustomersController.php b/plugins/Admin/src/Controller/CustomersController.php index 1f19be4672..d08f390eb0 100644 --- a/plugins/Admin/src/Controller/CustomersController.php +++ b/plugins/Admin/src/Controller/CustomersController.php @@ -629,7 +629,7 @@ public function creditBalanceSum() 'customer_type' => __d('admin', 'Sum_of_credits_of_deleted_members'), 'count' => 0, 'credit_balance' => $paymentProductDelta + $paymentDepositDelta, - 'payment_deposit_delta' => $paymentDepositDelta * -1 + 'payment_deposit_delta' => ($paymentDepositDelta * -1) + 0, ]; $paymentDepositDelta = $this->Payment->getManufacturerDepositMoneySum(); @@ -637,7 +637,7 @@ public function creditBalanceSum() 'customer_type' => __d('admin', 'Sum_of_deposit_compensation_payments_for_manufactures'), 'count' => 0, 'credit_balance' => 0, - 'payment_deposit_delta' => $paymentDepositDelta * -1 + 'payment_deposit_delta' => ($paymentDepositDelta * -1) + 0, ]; $this->set('customers', $customers); @@ -652,6 +652,7 @@ public function creditBalanceSum() $sums['deposit_delta'] += $customer['payment_deposit_delta'] ?? 0; $sums['product_delta'] += $customer['payment_product_delta'] ?? 0; } + $this->set('sums', $sums); $this->set('title_for_layout', __d('admin', 'Credit_and_deposit_balance')); From df251f0f2f5b1efb211bbb0b35789310b5877dbc Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 10 Oct 2022 12:50:48 +0200 Subject: [PATCH 158/646] Sticky table headers (#888) * sticky table headers * fixed header on android devices * finetuning borders * 888 * button fix * margin-fix * layout fix * keep original frontend overflow * ios --- CHANGELOG.md | 1 + plugins/Admin/webroot/css/admin.css | 3 +-- plugins/Admin/webroot/css/mobile.css | 4 ++-- plugins/Admin/webroot/js/admin.js | 6 ++++++ webroot/css/mobile-global.css | 2 +- webroot/css/table.css | 10 ++++++---- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f158d0ae3..94f9e0ec38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe ### Neue Funktionen / Verbesserungen - Superadmins können Tag und Uhrzeit der Cronjobs (z.B. die automatische Bestell-Erinnerung, Rechnungsversand) jetzt selber im Admin-Bereich (Homepage-Verwaltung / Einstellungen / neuer Tab "Cronjobs") ändern. [I#860](https://github.com/foodcoopshop/foodcoopshop/issues/860) / [PR#74](https://github.com/foodcoopshop/foodcoopshop/pull/874) - Die Konfiguration "Freitag Bestellschluss / Samstag Bestelllisten-Versand / Donnerstag Abholtag" ist jetzt möglich. [I#866](https://github.com/foodcoopshop/foodcoopshop/issues/866) / [PR#867](https://github.com/foodcoopshop/foodcoopshop/pull/867) +- Die Überschriften aller Tabellen im Admin-Bereich bleiben jetzt beim Scrollen sichtbar (nicht in iOS ). [PR#888](https://github.com/foodcoopshop/foodcoopshop/pull/888) ### For developers - New 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) and [Gitpod-Integration](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop). [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) / [PR#879](https://github.com/foodcoopshop/foodcoopshop/pull/879) / / [PR#881](https://github.com/foodcoopshop/foodcoopshop/pull/881) diff --git a/plugins/Admin/webroot/css/admin.css b/plugins/Admin/webroot/css/admin.css index 96206a4249..4b4b63fb5c 100644 --- a/plugins/Admin/webroot/css/admin.css +++ b/plugins/Admin/webroot/css/admin.css @@ -70,7 +70,6 @@ body.taxes.edit #flashMessage { margin-left: 155px; min-height: 500px; /* hack for mobile with little content */ background-color: #fff; - padding: 2px 2px 2px 1px; border-left: 2px solid #efefef; border-bottom-right-radius: 15px; position: relative; @@ -744,7 +743,7 @@ ul.nav-tabs { background: #efefef; margin-top: -2px; margin-left: -2px; - width: 1070px; + width: 1074px; padding-bottom: 1px; } ul.nav-tabs > li > a { diff --git a/plugins/Admin/webroot/css/mobile.css b/plugins/Admin/webroot/css/mobile.css index f0ce1bc7c7..484dbfee68 100644 --- a/plugins/Admin/webroot/css/mobile.css +++ b/plugins/Admin/webroot/css/mobile.css @@ -33,7 +33,6 @@ left: 0; width: 100vw; max-width: none; - padding: 3px; } .filter-container .right { margin-top: 1px; @@ -63,7 +62,7 @@ form.fcs-form .bootstrap-select, /* sic! necessary for bootstrap selects within } .sb-toggle-left { float: left; - margin: 3px 5px 0 3px; + margin: 0 5px 0 0; border-radius: 3px; padding: 2px 5px 0px 5px; background: #fff; @@ -81,6 +80,7 @@ form.fcs-form .bootstrap-select, /* sic! necessary for bootstrap selects within #container { float: left; min-width: 100%; + overflow: initial ! important; /* for sticky table headers */ } body.pages.home #container, body.pages.home #content, diff --git a/plugins/Admin/webroot/js/admin.js b/plugins/Admin/webroot/js/admin.js index 1ae9d36307..62f342d3b0 100644 --- a/plugins/Admin/webroot/js/admin.js +++ b/plugins/Admin/webroot/js/admin.js @@ -22,6 +22,7 @@ foodcoopshop.Admin = { foodcoopshop.ModalLogout.init(); this.setMenuFixed(); this.adaptContentMargin(); + this.initStickyTableHeader(); foodcoopshop.Helper.initScrolltopButton(); }, @@ -453,6 +454,11 @@ foodcoopshop.Admin = { $('#menu').css('min-height', marginTop + $('#content').height() + 4); }, + initStickyTableHeader : function() { + var newTop = $('.filter-container').height(); + $('table.list th').css('top', newTop + 11); + }, + initGenerateMemberCardsOfSelectedCustomersButton : function() { var button = $('#generateMemberCardsOfSelectedCustomersButton'); foodcoopshop.Helper.disableButton(button); diff --git a/webroot/css/mobile-global.css b/webroot/css/mobile-global.css index 137fcecfb0..1ffc8cc67c 100644 --- a/webroot/css/mobile-global.css +++ b/webroot/css/mobile-global.css @@ -35,8 +35,8 @@ text-decoration: none ! important; } #container { - overflow: hidden ! important; /* avoids iphone scrolling bug */ min-height: initial ! important; + overflow: hidden ! important; /* avoids iphone scrolling bug */ } #responsive-header .responsive-cart { float: right ! important; diff --git a/webroot/css/table.css b/webroot/css/table.css index d7f2b19bb5..6983f1b420 100644 --- a/webroot/css/table.css +++ b/webroot/css/table.css @@ -83,6 +83,12 @@ table.list td.slim { } table.list th { font-weight: 600; + position: sticky; + position: -webkit-sticky; + top: 44px; /* overriden in admin.initStickyTableHeader */ + z-index: 2; + background-color: #ebebeb; + box-shadow: inset 0 0px 0 #dfdfdf, inset 0 -1px 0 #dfdfdf; /* borders do not work on sticky elements */ } table.list th, table.list td { @@ -96,10 +102,6 @@ table.list tr.fake-th td { padding: 5px 2px; word-break: break-word; } -table.list th { - background-color: #ebebeb; - border-top: 1px solid #dfdfdf; -} table.list th, table.list tr.fake-th { line-height: 14px; From ccb114b7729228840a64bd4959802ae112c3796e Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 10 Oct 2022 12:54:09 +0200 Subject: [PATCH 159/646] vendor updates --- composer.lock | 36 ++++++++++++++++----------------- webroot/package-lock.json | 42 +++++++++++++++++++-------------------- webroot/package.json | 6 +++--- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/composer.lock b/composer.lock index 36afce3994..3141142e94 100644 --- a/composer.lock +++ b/composer.lock @@ -874,16 +874,16 @@ }, { "name": "jaybizzle/crawler-detect", - "version": "v1.2.111", + "version": "v1.2.112", "source": { "type": "git", "url": "https://github.com/JayBizzle/Crawler-Detect.git", - "reference": "d572ed4a65a70a2d2871dc5137c9c5b7e69745ab" + "reference": "2c555ce35a07a5c1c808cee7d5bb52c41a4c7b2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/d572ed4a65a70a2d2871dc5137c9c5b7e69745ab", - "reference": "d572ed4a65a70a2d2871dc5137c9c5b7e69745ab", + "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/2c555ce35a07a5c1c808cee7d5bb52c41a4c7b2f", + "reference": "2c555ce35a07a5c1c808cee7d5bb52c41a4c7b2f", "shasum": "" }, "require": { @@ -920,9 +920,9 @@ ], "support": { "issues": "https://github.com/JayBizzle/Crawler-Detect/issues", - "source": "https://github.com/JayBizzle/Crawler-Detect/tree/v1.2.111" + "source": "https://github.com/JayBizzle/Crawler-Detect/tree/v1.2.112" }, - "time": "2022-03-15T22:19:01+00:00" + "time": "2022-10-05T21:52:44+00:00" }, { "name": "laminas/laminas-diactoros", @@ -2507,16 +2507,16 @@ }, { "name": "robmorgan/phinx", - "version": "0.12.12", + "version": "0.12.13", "source": { "type": "git", "url": "https://github.com/cakephp/phinx.git", - "reference": "9a6ce1e7fdf0fa4e602ba5875b5bc9442ccaa115" + "reference": "6eb0f295e140ed2804d93396755f0ce9ada4ec07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/phinx/zipball/9a6ce1e7fdf0fa4e602ba5875b5bc9442ccaa115", - "reference": "9a6ce1e7fdf0fa4e602ba5875b5bc9442ccaa115", + "url": "https://api.github.com/repos/cakephp/phinx/zipball/6eb0f295e140ed2804d93396755f0ce9ada4ec07", + "reference": "6eb0f295e140ed2804d93396755f0ce9ada4ec07", "shasum": "" }, "require": { @@ -2587,9 +2587,9 @@ ], "support": { "issues": "https://github.com/cakephp/phinx/issues", - "source": "https://github.com/cakephp/phinx/tree/0.12.12" + "source": "https://github.com/cakephp/phinx/tree/0.12.13" }, - "time": "2022-07-09T18:53:51+00:00" + "time": "2022-10-03T04:57:40+00:00" }, { "name": "seld/cli-prompt", @@ -4866,16 +4866,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.8.6", + "version": "1.8.8", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618" + "reference": "08310ce271984587e2a4cda94e1ac66510a6ea07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c386ab2741e64cc9e21729f891b28b2b10fe6618", - "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/08310ce271984587e2a4cda94e1ac66510a6ea07", + "reference": "08310ce271984587e2a4cda94e1ac66510a6ea07", "shasum": "" }, "require": { @@ -4905,7 +4905,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.8.6" + "source": "https://github.com/phpstan/phpstan/tree/1.8.8" }, "funding": [ { @@ -4921,7 +4921,7 @@ "type": "tidelift" } ], - "time": "2022-09-23T09:54:39+00:00" + "time": "2022-10-06T12:51:57+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index 5c558ad372..fe3aa6d943 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -9,7 +9,7 @@ "license": "AGPL-3.0", "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.4", - "@ericblade/quagga2": "^1.7.4", + "@ericblade/quagga2": "^1.7.5", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.2", @@ -30,9 +30,9 @@ "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", "svelte": "^3.50.1", - "swiper": "8.4.2", + "swiper": "8.4.3", "tooltipster": "^4.2.8", - "uglify-js": "^3.17.2", + "uglify-js": "^3.17.3", "webrtc-adapter": "^8.1.2" } }, @@ -54,9 +54,9 @@ } }, "node_modules/@ericblade/quagga2": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.4.tgz", - "integrity": "sha512-7rBY0mPgV0iAIyrXUrijbitzglculdOizpj2IljvbhRoABvybZCJGXCxmnO7Vwuju7LclwRNZLPu+E0xmOFmSQ==", + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.5.tgz", + "integrity": "sha512-thdz46VgJah07u3VZ6RLgw/gs5xAkkcxj74+ir1Kb96B7B9IBuU0Ey/7geI20q4woSxcm+1XR24dJbUA7iq8lw==", "dependencies": { "@babel/polyfill": "^7.12.1", "get-pixels": "^3.3.3", @@ -1007,9 +1007,9 @@ } }, "node_modules/swiper": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.2.tgz", - "integrity": "sha512-nMD/RHVYxJxrLqjWQX2n0B94ANwpnuUv/3PUDT8Aaf+mSteFvZGFng4ypAYq70zW4svryyV+8TRlbRZ+6cgv9A==", + "version": "8.4.3", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.3.tgz", + "integrity": "sha512-+Ne/3rSZ1t28r//Upg8AdLgXJ+/nTw79GZFl6RQb2TckfnX6JTQZWWiNTT3uqP9Cyixb+OhT9fRBqAWnjM444A==", "funding": [ { "type": "patreon", @@ -1081,9 +1081,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "node_modules/uglify-js": { - "version": "3.17.2", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.2.tgz", - "integrity": "sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg==", + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz", + "integrity": "sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==", "bin": { "uglifyjs": "bin/uglifyjs" }, @@ -1158,9 +1158,9 @@ } }, "@ericblade/quagga2": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.4.tgz", - "integrity": "sha512-7rBY0mPgV0iAIyrXUrijbitzglculdOizpj2IljvbhRoABvybZCJGXCxmnO7Vwuju7LclwRNZLPu+E0xmOFmSQ==", + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.5.tgz", + "integrity": "sha512-thdz46VgJah07u3VZ6RLgw/gs5xAkkcxj74+ir1Kb96B7B9IBuU0Ey/7geI20q4woSxcm+1XR24dJbUA7iq8lw==", "requires": { "@babel/polyfill": "^7.12.1", "fsevents": "2.3.2", @@ -1892,9 +1892,9 @@ "integrity": "sha512-bS4odcsdj5D5jEg6riZuMg5NKelzPtmsCbD9RG+8umU03TeNkdWnP6pqbCm0s8UQNBkqk29w/Bdubn3C+HWSwA==" }, "swiper": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.2.tgz", - "integrity": "sha512-nMD/RHVYxJxrLqjWQX2n0B94ANwpnuUv/3PUDT8Aaf+mSteFvZGFng4ypAYq70zW4svryyV+8TRlbRZ+6cgv9A==", + "version": "8.4.3", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.3.tgz", + "integrity": "sha512-+Ne/3rSZ1t28r//Upg8AdLgXJ+/nTw79GZFl6RQb2TckfnX6JTQZWWiNTT3uqP9Cyixb+OhT9fRBqAWnjM444A==", "requires": { "dom7": "^4.0.4", "ssr-window": "^4.0.2" @@ -1941,9 +1941,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "uglify-js": { - "version": "3.17.2", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.2.tgz", - "integrity": "sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg==" + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz", + "integrity": "sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==" }, "uniq": { "version": "1.0.1", diff --git a/webroot/package.json b/webroot/package.json index 0085054cec..67f9646644 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.4", - "@ericblade/quagga2": "^1.7.4", + "@ericblade/quagga2": "^1.7.5", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.2", @@ -36,9 +36,9 @@ "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", "svelte": "^3.50.1", - "swiper": "8.4.2", + "swiper": "8.4.3", "tooltipster": "^4.2.8", - "uglify-js": "^3.17.2", + "uglify-js": "^3.17.3", "webrtc-adapter": "^8.1.2" } } From 76b0fbb0647a4335971f375245ba931376da3ad4 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 11 Oct 2022 08:49:25 +0200 Subject: [PATCH 160/646] do not use trailing slash --- config/custom_config.default.php | 1 + config/custom_config.dev.php | 1 + 2 files changed, 2 insertions(+) diff --git a/config/custom_config.default.php b/config/custom_config.default.php index e07f8818fc..2bf3659046 100644 --- a/config/custom_config.default.php +++ b/config/custom_config.default.php @@ -78,6 +78,7 @@ /** * your host's name, eg. http://www.yourfoodcoop.com + * BE AWARE: NO TRAILING SLASH! */ 'cakeServerName' => '', diff --git a/config/custom_config.dev.php b/config/custom_config.dev.php index a97013afd2..056edaddc6 100644 --- a/config/custom_config.dev.php +++ b/config/custom_config.dev.php @@ -86,6 +86,7 @@ /** * your host's name, eg. http://www.yourfoodcoop.com + * BE AWARE: NO TRAILING SLASH! */ 'cakeServerName' => 'https://localhost', From 90bd8b5f3046ec62fdedc57419981522a9c11425 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 11 Oct 2022 09:09:04 +0200 Subject: [PATCH 161/646] restructuring --- devtools/init-dev-setup.sh | 2 +- devtools/{setup-dev => installation}/init-database.sh | 8 +++++++- devtools/{setup-dev => installation}/set-permissions.sh | 0 3 files changed, 8 insertions(+), 2 deletions(-) rename devtools/{setup-dev => installation}/init-database.sh (62%) rename devtools/{setup-dev => installation}/set-permissions.sh (100%) diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index faeb1e227f..842b8ec3bb 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -bash ./devtools/setup-dev/set-permissions.sh +bash ./devtools/installation/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install diff --git a/devtools/setup-dev/init-database.sh b/devtools/installation/init-database.sh similarity index 62% rename from devtools/setup-dev/init-database.sh rename to devtools/installation/init-database.sh index 218a761a36..8901449679 100644 --- a/devtools/setup-dev/init-database.sh +++ b/devtools/installation/init-database.sh @@ -3,7 +3,13 @@ locale=$1 if [[ "$locale" == "" ]]; then - echo "locale is not set" + source ./devtools/locales.sh + localeConcat=''; + for locale in "${LOCALES[@]}" + do + localeConcat+="$locale " + done + echo "locale is not set, allowed values: $localeConcat" exit fi diff --git a/devtools/setup-dev/set-permissions.sh b/devtools/installation/set-permissions.sh similarity index 100% rename from devtools/setup-dev/set-permissions.sh rename to devtools/installation/set-permissions.sh From fd280f6ee95e170bad1555e42ecb4d49a0e11b04 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 11 Oct 2022 09:09:16 +0200 Subject: [PATCH 162/646] add new german tax 9.5% --- config/Seeds/AddTaxesGermanySeed.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/Seeds/AddTaxesGermanySeed.php b/config/Seeds/AddTaxesGermanySeed.php index b1bb3d2d99..dfa8982cc0 100644 --- a/config/Seeds/AddTaxesGermanySeed.php +++ b/config/Seeds/AddTaxesGermanySeed.php @@ -11,7 +11,8 @@ public function run() INSERT INTO `fcs_tax` VALUES (1,19.000,1,0), (2,7.000,1,0), - (3,10.700,1,0); + (3,9.500,1,0), + (4,10.700,1,0); "; $this->execute($query); } From e597c9230231d1e1367e4e6ee68f52ec931fdfa8 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 11 Oct 2022 09:22:15 +0200 Subject: [PATCH 163/646] fix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c3881fcc6..7967683028 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: Setup Dev Environment run: | # do not use ./devtools/init-dev-setup.sh because dev db is not needed - bash ./devtools/setup-dev/set-permissions.sh + bash ./devtools/installation/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html/webroot fcs-php-nginx npm install From 7019fd3d1faddacaa196e4d16d65c8ded3224198 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 11 Oct 2022 15:55:21 +0200 Subject: [PATCH 164/646] run migrations after initial seed import --- devtools/init-dev-setup.sh | 2 +- tests/bootstrap.php | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index 842b8ec3bb..b5c3590eb4 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -7,7 +7,7 @@ CURRENT_UID=$(id -u):$(id -g) docker compose run --rm composer install CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate -p Queue CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate --source Migrations/init -CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations seed --source Seeds/tests --seed InitTestDataSeed CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate +CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations seed --source Seeds/tests --seed InitTestDataSeed docker exec -w /var/www/html/webroot fcs-php-nginx npm install \ No newline at end of file diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 50b9dbae01..0b32aba041 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -17,20 +17,21 @@ // 1) import structure $migrator = new Migrator(); $migrator->runMany([ - ['plugin' => 'Queue'], - ['source' => 'Migrations' . DS . 'init'], + ['plugin' => 'Queue', 'connection' => 'test'], + ['source' => 'Migrations' . DS . 'init', 'connection' => 'test'], ]); -// 2) add test data (generated to fit after run migrations in init folder) +// 2) run new migrations (located in main folder) +//$migrator->run([], false); // causes "Going to drop all tables in this source, and re-apply migrations." $migrations = new Migrations(); +$migrations->migrate(['connection' => 'test']); + +// 3) add test data (generated to fit after run migrations in init folder) $migrations->seed([ 'connection' => 'test', 'source' => 'Seeds' . DS . 'tests', // needs to be a subfolder of config ]); -// 3) run new migrations (located in main folder) -$migrator->run([], false); - require dirname(__DIR__) . '/config/bootstrap_locale.php'; Security::setSalt(Configure::read('Security.salt_for_unit_tests')); From 795e68ba174b57c4a1e7926a8e1d73781e7f5e47 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 11 Oct 2022 16:15:37 +0200 Subject: [PATCH 165/646] vendor updates --- composer.lock | 56 +++++++++++++++++++-------------------- webroot/package-lock.json | 14 +++++----- webroot/package.json | 2 +- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/composer.lock b/composer.lock index e5769ff347..1c6cc10daf 100644 --- a/composer.lock +++ b/composer.lock @@ -926,20 +926,20 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.17.0", + "version": "2.19.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "5b32597aa46b83c8b85bb1cf9a6ed4fe7dd980c5" + "reference": "b3c7e9262b4fbec801d8df2370cdebb4f5d3a0ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/5b32597aa46b83c8b85bb1cf9a6ed4fe7dd980c5", - "reference": "5b32597aa46b83c8b85bb1cf9a6ed4fe7dd980c5", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/b3c7e9262b4fbec801d8df2370cdebb4f5d3a0ae", + "reference": "b3c7e9262b4fbec801d8df2370cdebb4f5d3a0ae", "shasum": "" }, "require": { - "php": "^7.4 || ~8.0.0 || ~8.1.0", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0", "psr/http-factory": "^1.0", "psr/http-message": "^1.0" }, @@ -958,9 +958,9 @@ "http-interop/http-factory-tests": "^0.9.0", "laminas/laminas-coding-standard": "^2.4.0", "php-http/psr7-integration-tests": "^1.1.1", - "phpunit/phpunit": "^9.5.23", + "phpunit/phpunit": "^9.5.25", "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.24.0" + "vimeo/psalm": "^4.28" }, "type": "library", "extra": { @@ -1019,34 +1019,34 @@ "type": "community_bridge" } ], - "time": "2022-08-30T17:01:46+00:00" + "time": "2022-10-10T21:28:03+00:00" }, { "name": "laminas/laminas-httphandlerrunner", - "version": "2.2.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-httphandlerrunner.git", - "reference": "eb670c5c7167cd218c61a8b4f6ab9ce339200c16" + "reference": "3c9491473b7decd8f329266a3cb6226a1f90594c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/eb670c5c7167cd218c61a8b4f6ab9ce339200c16", - "reference": "eb670c5c7167cd218c61a8b4f6ab9ce339200c16", + "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/3c9491473b7decd8f329266a3cb6226a1f90594c", + "reference": "3c9491473b7decd8f329266a3cb6226a1f90594c", "shasum": "" }, "require": { - "php": "^7.4 || ~8.0.0 || ~8.1.0", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0", "psr/http-message": "^1.0", "psr/http-message-implementation": "^1.0", "psr/http-server-handler": "^1.0" }, "require-dev": { "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-diactoros": "^2.13.0", - "phpunit/phpunit": "^9.5.21", + "laminas/laminas-diactoros": "^2.18", + "phpunit/phpunit": "^9.5.25", "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.24.0" + "vimeo/psalm": "^4.28" }, "type": "library", "extra": { @@ -1086,7 +1086,7 @@ "type": "community_bridge" } ], - "time": "2022-09-17T16:24:51+00:00" + "time": "2022-10-10T19:52:02+00:00" }, { "name": "league/climate", @@ -3705,16 +3705,16 @@ }, { "name": "cakephp/bake", - "version": "2.8.1", + "version": "2.8.2", "source": { "type": "git", "url": "https://github.com/cakephp/bake.git", - "reference": "7f7dac1dd9bb0f8c996e705e74cdec01dd600f57" + "reference": "ef021497ab517c33ecd97d2184200d8990ffc0ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/bake/zipball/7f7dac1dd9bb0f8c996e705e74cdec01dd600f57", - "reference": "7f7dac1dd9bb0f8c996e705e74cdec01dd600f57", + "url": "https://api.github.com/repos/cakephp/bake/zipball/ef021497ab517c33ecd97d2184200d8990ffc0ab", + "reference": "ef021497ab517c33ecd97d2184200d8990ffc0ab", "shasum": "" }, "require": { @@ -3758,7 +3758,7 @@ "issues": "https://github.com/cakephp/bake/issues", "source": "https://github.com/cakephp/bake" }, - "time": "2022-09-26T06:58:44+00:00" + "time": "2022-10-05T18:45:20+00:00" }, { "name": "cakephp/cakephp-codesniffer", @@ -7482,16 +7482,16 @@ }, { "name": "twig/twig", - "version": "v3.4.2", + "version": "v3.4.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "e07cdd3d430cd7e453c31b36eb5ad6c0c5e43077" + "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/e07cdd3d430cd7e453c31b36eb5ad6c0c5e43077", - "reference": "e07cdd3d430cd7e453c31b36eb5ad6c0c5e43077", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/c38fd6b0b7f370c198db91ffd02e23b517426b58", + "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58", "shasum": "" }, "require": { @@ -7542,7 +7542,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.4.2" + "source": "https://github.com/twigphp/Twig/tree/v3.4.3" }, "funding": [ { @@ -7554,7 +7554,7 @@ "type": "tidelift" } ], - "time": "2022-08-12T06:47:24+00:00" + "time": "2022-09-28T08:42:51+00:00" } ], "aliases": [], diff --git a/webroot/package-lock.json b/webroot/package-lock.json index fe3aa6d943..09712b81f8 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -29,7 +29,7 @@ "lazysizes": "^5.3.2", "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", - "svelte": "^3.50.1", + "svelte": "^3.51.0", "swiper": "8.4.3", "tooltipster": "^4.2.8", "uglify-js": "^3.17.3", @@ -999,9 +999,9 @@ "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==" }, "node_modules/svelte": { - "version": "3.50.1", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.50.1.tgz", - "integrity": "sha512-bS4odcsdj5D5jEg6riZuMg5NKelzPtmsCbD9RG+8umU03TeNkdWnP6pqbCm0s8UQNBkqk29w/Bdubn3C+HWSwA==", + "version": "3.51.0", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.51.0.tgz", + "integrity": "sha512-PBITYIrsNOuW+Dtds00gSY68raNZQn7i59Dg/fjgf6WwyawPKeBwle692coO7ILZqSO+UJe9899aDn9sMdeOHA==", "engines": { "node": ">= 8" } @@ -1887,9 +1887,9 @@ "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==" }, "svelte": { - "version": "3.50.1", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.50.1.tgz", - "integrity": "sha512-bS4odcsdj5D5jEg6riZuMg5NKelzPtmsCbD9RG+8umU03TeNkdWnP6pqbCm0s8UQNBkqk29w/Bdubn3C+HWSwA==" + "version": "3.51.0", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.51.0.tgz", + "integrity": "sha512-PBITYIrsNOuW+Dtds00gSY68raNZQn7i59Dg/fjgf6WwyawPKeBwle692coO7ILZqSO+UJe9899aDn9sMdeOHA==" }, "swiper": { "version": "8.4.3", diff --git a/webroot/package.json b/webroot/package.json index 67f9646644..010bd7bdcb 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -35,7 +35,7 @@ "lazysizes": "^5.3.2", "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", - "svelte": "^3.50.1", + "svelte": "^3.51.0", "swiper": "8.4.3", "tooltipster": "^4.2.8", "uglify-js": "^3.17.3", From 028251c20141d1c8a4c705fbde01b2987491ba02 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 11 Oct 2022 16:47:48 +0200 Subject: [PATCH 166/646] correct date format --- .../20220928063530_MarkInitialMigrationsAsMigrated.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/Migrations/prepare-for-update-from-v3.5/20220928063530_MarkInitialMigrationsAsMigrated.php b/config/Migrations/prepare-for-update-from-v3.5/20220928063530_MarkInitialMigrationsAsMigrated.php index 7422dbb06a..58adea0a72 100644 --- a/config/Migrations/prepare-for-update-from-v3.5/20220928063530_MarkInitialMigrationsAsMigrated.php +++ b/config/Migrations/prepare-for-update-from-v3.5/20220928063530_MarkInitialMigrationsAsMigrated.php @@ -1,7 +1,6 @@ 20220928063531, 'migration_name' => 'Initial', - 'start_time' => FrozenTime::now(), - 'end_time' => FrozenTime::now(), ], [ 'version' => 20220928064125, 'migration_name' => 'AlterDataOnQueuedJobsToMediumtext', - 'start_time' => FrozenTime::now(), - 'end_time' => FrozenTime::now(), ], ]); From 77c9654a5eb68b390ca0bf54e45968a8622773f9 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 11 Oct 2022 16:51:55 +0200 Subject: [PATCH 167/646] show correct last migration --- plugins/Admin/src/Controller/ConfigurationsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Admin/src/Controller/ConfigurationsController.php b/plugins/Admin/src/Controller/ConfigurationsController.php index 04712ee315..3a944a9070 100644 --- a/plugins/Admin/src/Controller/ConfigurationsController.php +++ b/plugins/Admin/src/Controller/ConfigurationsController.php @@ -175,7 +175,7 @@ public function index() $this->set('versionFoodCoopShop', $this->Configuration->getVersion()); try { - $query = 'SELECT * FROM phinxlog ORDER by version DESC LIMIT 1;'; + $query = 'SELECT * FROM phinxlog WHERE start_time IS NOT NULL ORDER by version DESC LIMIT 1;'; $lastMigration = $this->Configuration->getConnection()->query($query)->fetch('assoc'); $this->set('lastMigration', $lastMigration); } catch (\PDOException $e) { From cdb48fb709fa44ebf6b9b81d057a7b0479891dae Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 11 Oct 2022 16:57:03 +0200 Subject: [PATCH 168/646] adapt script --- devtools/installation/init-database.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/installation/init-database.sh b/devtools/installation/init-database.sh index 8901449679..6b65bd9c6d 100644 --- a/devtools/installation/init-database.sh +++ b/devtools/installation/init-database.sh @@ -15,6 +15,6 @@ fi ./bin/cake migrations migrate -p Queue ./bin/cake migrations migrate --source Migrations/init +./bin/cake migrations migrate ./bin/cake migrations seed --source Seeds/locale/$locale --seed InitDataSeed ./bin/cake migrations seed --seed InitDataSeed -./bin/cake migrations migrate From 3e61cf2827025cbfc6a434765963c47e46c6d9a0 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 12 Oct 2022 09:15:25 +0200 Subject: [PATCH 169/646] removed ordered products (nice-to-have with bad performance) --- plugins/Admin/src/Controller/CustomersController.php | 1 - plugins/Admin/templates/Customers/index.php | 8 -------- 2 files changed, 9 deletions(-) diff --git a/plugins/Admin/src/Controller/CustomersController.php b/plugins/Admin/src/Controller/CustomersController.php index d08f390eb0..bef2476ce2 100644 --- a/plugins/Admin/src/Controller/CustomersController.php +++ b/plugins/Admin/src/Controller/CustomersController.php @@ -737,7 +737,6 @@ public function index() if (Configure::read('app.htmlHelper')->paymentIsCashless()) { $customer->credit_balance = $this->Customer->getCreditBalance($customer->id_customer); } - $customer->order_detail_count = $this->OrderDetail->getCountByCustomerId($customer->id_customer); $customer->different_pickup_day_count = $this->OrderDetail->getDifferentPickupDayCountByCustomerId($customer->id_customer); $customer->last_order_date = $this->OrderDetail->getLastOrderDate($customer->id_customer); $customer->member_fee = $this->OrderDetail->getMemberFee($customer->id_customer, $year); diff --git a/plugins/Admin/templates/Customers/index.php b/plugins/Admin/templates/Customers/index.php index 3d4d47f77d..b7337dfa7f 100644 --- a/plugins/Admin/templates/Customers/index.php +++ b/plugins/Admin/templates/Customers/index.php @@ -70,7 +70,6 @@ echo '		' . $this->Paginator->sort('Customers.id_default_group', __d('admin', 'Group')) . '' . $this->Paginator->sort('Customers.email', __d('admin', 'Email')) . '' . $this->Paginator->sort('Customers.active', __d('admin', 'Status')) . ''.__d('admin', 'Ordered_products').''.__d('admin', 'Credit').'
'; - echo $this->Number->formatAsDecimal($customer->order_detail_count, 0); - $sumOrderDetailsCount += $customer->order_detail_count; - echo ''; @@ -352,7 +345,6 @@ echo '
' . $i . ' '.__d('admin', '{0,plural,=1{record} other{records}}', $i).'' . $this->Number->formatAsDecimal($sumOrderDetailsCount, 0) . ''.__d('admin', 'Credit').'' . $this->Paginator->sort('Customers.email_order_reminder_enabled', __d('admin', 'Reminder')) . '' . $this->Paginator->sort('Customers.email_order_reminder_enabled', __d('admin', 'Order_reminder')) . '' . $this->Paginator->sort('Customers.check_credit_reminder_enabled', __d('admin', 'Check_credit_reminder')) . '' . $this->Paginator->sort('Customers.newsletter_enabled', __d('admin', 'Newsletter')) . '
'; + if ($customer->check_credit_reminder_enabled) { + echo ''; + $sumCreditReminders++; + } + echo ''; if ($customer->email_order_reminder_enabled) { echo ''; - $sumEmailReminders++; + $sumOrderReminders++; } echo '' . $i . ' '.__d('admin', '{0,plural,=1{record} other{records}}', $i).'' . $sumCreditReminders . '' . $sumEmailReminders . '' . $sumOrderReminders . '' . $sumNewsletter . '
' . $i . ' '.__d('admin', '{0,plural,=1{record} other{records}}', $i).'' . $sumCreditReminders . '' . $sumFeedback . ($sumFeedbackNotApproved > 0 ? ' (' . $sumFeedbackNotApproved . ')' : ''). '
'.__d('admin', 'Software_update_version').''; - echo nl2br($this->element('latestGitCommit')); - echo __d('admin', 'Please_find_more_information_in_the_changelog_{0}.', ['Changelog']); - echo '
app.showTaxInOrderConfirmationEmail
app.paypalMeUsername
app.defaultTax Number->formatAsPercent($defaultTax->rate); ?> - active ? __d('admin', 'activated') : __d('admin', 'deactivated'); ?>'; - if ($customer->check_credit_reminder_enabled) { + if ($customer->email_order_reminder_enabled) { echo ''; - $sumCreditReminders++; + $sumOrderReminders++; } echo ''; - if ($customer->email_order_reminder_enabled) { + if ($customer->check_credit_reminder_enabled) { echo ''; - $sumOrderReminders++; + $sumCreditReminders++; } echo '
app.cakeServerNameApp.fullBaseUrl
260px
/files/images/		 260px
/files/images/
260px
/files/images/logo-pdf.jpg		 260px
/files/images/logo-pdf.jpg
150x150
/files/images/products/de-default-home_default.jpg		 150x150
/files/images/products/de-default-home_default.jpg
150x150
/files/images/manufacturers/de-default-medium_default.jpg		 150x150
/files/images/manufacturers/de-default-medium_default.jpg
150x113
/files/images/blog_posts/no-home-default.jpg		 150x113
/files/images/blog_posts/no-home-default.jpg
'; - echo __('You_can_subscribe_our_newsletter_in_the_admin_areas_menu_point_my_data.', [Configure::read('app.cakeServerName') . $this->Slug->getCustomerProfile()]); + echo __('You_can_subscribe_our_newsletter_in_the_admin_areas_menu_point_my_data.', [Configure::read('App.fullBaseUrl') . $this->Slug->getCustomerProfile()]); echo '
'; - echo __('You_can_subscribe_our_newsletter_in_the_admin_areas_menu_point_my_data.', [Configure::read('app.cakeServerName') . $this->Slug->getCustomerProfile()]); + echo __('You_can_subscribe_our_newsletter_in_the_admin_areas_menu_point_my_data.', [Configure::read('App.fullBaseUrl') . $this->Slug->getCustomerProfile()]); echo '
- - + +
- in_your_settings.', [Configure::read('app.cakeServerName') . $this->Slug->getManufacturerMyOptions()]); ?> + in_your_settings.', [Configure::read('App.fullBaseUrl') . $this->Slug->getManufacturerMyOptions()]); ?>

newsletter_enabled) && !$newsletterCustomer->newsletter_enabled) { - echo __('You_can_subscribe_our_newsletter_in_the_admin_areas_menu_point_my_data.', [Configure::read('app.cakeServerName') . $this->Slug->getCustomerProfile()]); + echo __('You_can_subscribe_our_newsletter_in_the_admin_areas_menu_point_my_data.', [Configure::read('App.fullBaseUrl') . $this->Slug->getCustomerProfile()]); echo '

'; } ?> @@ -60,7 +60,7 @@ echo Configure::read('appDb.FCS_APP_NAME').'
'; echo Configure::read('appDb.FCS_APP_ADDRESS').'
'; echo ''.Configure::read('appDb.FCS_APP_EMAIL').'
'; - echo ''.$this->MyHtml->getHostWithoutProtocol(Configure::read('app.cakeServerName')).''; + echo ''.$this->MyHtml->getHostWithoutProtocol(Configure::read('App.fullBaseUrl')).''; ?> user()) { ?>

: diff --git a/tests/TestCase/src/Controller/CartsControllerTest.php b/tests/TestCase/src/Controller/CartsControllerTest.php index d1f03c5de4..54430f210f 100644 --- a/tests/TestCase/src/Controller/CartsControllerTest.php +++ b/tests/TestCase/src/Controller/CartsControllerTest.php @@ -647,7 +647,7 @@ public function testIsSubscribeNewsletterLinkAddedToMail() $this->loginAsSuperadmin(); $this->fillCart(); $this->finishCart(1, 1); - $this->assertMailContainsAt(0, 'Du kannst unseren Newsletter im Admin-Bereich unter "Meine Daten" abonnieren.'); + $this->assertMailContainsAt(0, 'Du kannst unseren Newsletter im Admin-Bereich unter "Meine Daten" abonnieren.'); } public function testIsSubscribeNewsletterLinkNotAddedToMail() diff --git a/tests/TestCase/src/Controller/SelfServiceControllerTest.php b/tests/TestCase/src/Controller/SelfServiceControllerTest.php index a249387629..f3ee09a15d 100644 --- a/tests/TestCase/src/Controller/SelfServiceControllerTest.php +++ b/tests/TestCase/src/Controller/SelfServiceControllerTest.php @@ -414,7 +414,7 @@ private function getSelfServicePostOptions() 'headers' => [ 'X_REQUESTED_WITH' => 'XMLHttpRequest', 'ACCEPT' => 'application/json', - 'REFERER' => Configure::read('app.cakeServerName') . '/' . __('route_self_service'), + 'REFERER' => Configure::read('App.fullBaseUrl') . '/' . __('route_self_service'), ], ]); } @@ -429,7 +429,7 @@ private function finishSelfServiceCart($generalTermsAndConditionsAccepted, $canc ]; $this->configRequest([ 'headers' => [ - 'REFERER' => Configure::read('app.cakeServerName') . '/' . __('route_self_service'), + 'REFERER' => Configure::read('App.fullBaseUrl') . '/' . __('route_self_service'), ], ]); $this->post( diff --git a/webroot/js/helper.js b/webroot/js/helper.js index 40ed9a0718..1ee62728f2 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -734,8 +734,8 @@ foodcoopshop.Helper = { }, - setCakeServerName: function (cakeServerName) { - this.cakeServerName = cakeServerName; + setFullBaseUrl: function (fullBaseUrl) { + this.fullBaseUrl = fullBaseUrl; }, setIsManufacturer: function (isManufacturer) { From 621fc7ee37b3f105adca62f0945bc563169afcb4 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 18 Oct 2022 09:16:08 +0200 Subject: [PATCH 199/646] use App.fullBaseUrl --- tests/TestCase/AppCakeTestCase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/TestCase/AppCakeTestCase.php b/tests/TestCase/AppCakeTestCase.php index 8ed0512a73..e2b7b44727 100644 --- a/tests/TestCase/AppCakeTestCase.php +++ b/tests/TestCase/AppCakeTestCase.php @@ -144,7 +144,7 @@ protected function assertAccessDeniedFlashMessage() { protected function assertRedirectToLoginPage() { - $this->assertRegExpWithUnquotedString('http://localhost' . $this->Slug->getLogin(), $this->_response->getHeaderLine('Location')); + $this->assertRegExpWithUnquotedString(Configure::read('App.fullBaseUrl') . $this->Slug->getLogin(), $this->_response->getHeaderLine('Location')); } protected function assertJsonOk() @@ -158,7 +158,7 @@ protected function assertJsonOk() */ protected function assertNotPerfectlyImplementedAccessRestricted() { - $this->assertEquals('http://localhost/', $this->_response->getHeaderLine('Location')); + $this->assertEquals(Configure::read('App.fullBaseUrl') . '/' , $this->_response->getHeaderLine('Location')); } /** From 16623ffab25df484117edba6c04084e29208fa2c Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 18 Oct 2022 11:08:05 +0200 Subject: [PATCH 200/646] add automated checks for declare(strict_types=1) --- composer.json | 3 +- composer.lock | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++- phpstan.neon | 5 ++++ 3 files changed, 86 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8159016ccc..4a7c8b0a95 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,8 @@ "cakephp/cakephp-codesniffer": "^4.0", "phpunit/phpunit": "^9.0", "phpstan/phpstan": "^1.0", - "cakephp/bake": "^2.8" + "cakephp/bake": "^2.8", + "ergebnis/phpstan-rules": "^1.0" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index e2dd95175a..ad96f50c05 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d80325e875209b0320a2b99feafb79cd", + "content-hash": "33b9d6ab775ae3fb572162836ca3eed6", "packages": [ { "name": "cakephp/cakephp", @@ -4638,6 +4638,84 @@ ], "time": "2022-03-03T08:28:38+00:00" }, + { + "name": "ergebnis/phpstan-rules", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/ergebnis/phpstan-rules.git", + "reference": "ebeced30d7e50324a94a83c19a59d75816e8fbb4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/ebeced30d7e50324a94a83c19a59d75816e8fbb4", + "reference": "ebeced30d7e50324a94a83c19a59d75816e8fbb4", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "nikic/php-parser": "^4.2.3", + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.0.0" + }, + "require-dev": { + "doctrine/orm": "^2.10.2", + "ergebnis/composer-normalize": "^2.15.0", + "ergebnis/license": "^1.1.0", + "ergebnis/php-cs-fixer-config": "^2.14.0", + "ergebnis/test-util": "^1.5.0", + "infection/infection": "~0.15.3", + "nette/di": "^3.0.11", + "phpstan/phpstan-deprecation-rules": "^1.0.0", + "phpstan/phpstan-strict-rules": "^1.0.0", + "phpunit/phpunit": "^8.5.21", + "psalm/plugin-phpunit": "~0.16.1", + "psr/container": "^1.0.0", + "vimeo/psalm": "^4.12.0", + "zendframework/zend-servicemanager": "^2.0.0" + }, + "type": "phpstan-extension", + "extra": { + "phpstan": { + "includes": [ + "rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "Ergebnis\\PHPStan\\Rules\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Andreas Möller", + "email": "am@localheinz.com" + } + ], + "description": "Provides additional rules for phpstan/phpstan.", + "homepage": "https://github.com/ergebnis/phpstan-rules", + "keywords": [ + "PHPStan", + "phpstan-extreme-rules", + "phpstan-rules" + ], + "support": { + "issues": "https://github.com/ergebnis/phpstan-rules/issues", + "source": "https://github.com/ergebnis/phpstan-rules" + }, + "funding": [ + { + "url": "https://github.com/localheinz", + "type": "github" + } + ], + "time": "2021-11-08T15:37:09+00:00" + }, { "name": "jasny/twig-extensions", "version": "v1.3.0", diff --git a/phpstan.neon b/phpstan.neon index d6700425b8..3625b08000 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -4,5 +4,10 @@ parameters: - php paths: - src + - templates - plugins/Admin/src + - plugins/Admin/templates - plugins/Network/src + - plugins/Network/templates +rules: + - Ergebnis\PHPStan\Rules\Files\DeclareStrictTypesRule From 20cc151a21b525108523e4091fcbc07c5e74f762 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 18 Oct 2022 11:48:15 +0200 Subject: [PATCH 201/646] add declare strict types --- config/Locale/de_DE/date.php | 2 ++ config/Locale/en_US/date.php | 2 ++ config/app.php | 1 + config/app_config.php | 2 ++ config/app_queue.php | 2 ++ config/bootstrap_cli.php | 2 ++ config/bootstrap_locale.php | 2 ++ config/credentials.default.php | 2 ++ config/custom_config.default.php | 2 ++ config/custom_config.dev.php | 2 ++ config/elfinder/php/connector.minimal.php | 2 ++ config/localized_config.php | 2 ++ config/paths.php | 2 ++ config/requirements.php | 2 ++ config/routes.php | 1 + plugins/Admin/config/routes.php | 2 ++ .../Admin/src/Controller/ActionLogsController.php | 2 ++ .../Admin/src/Controller/AdminAppController.php | 1 + .../Admin/src/Controller/AttributesController.php | 2 ++ .../Admin/src/Controller/BlogPostsController.php | 2 ++ .../Admin/src/Controller/CategoriesController.php | 2 ++ .../src/Controller/ConfigurationsController.php | 2 ++ .../Admin/src/Controller/CronjobsController.php | 2 ++ .../Admin/src/Controller/CustomersController.php | 2 ++ .../Admin/src/Controller/DepositsController.php | 2 ++ .../Admin/src/Controller/FeedbacksController.php | 2 ++ .../Admin/src/Controller/HelloCashController.php | 1 + .../Admin/src/Controller/InvoicesController.php | 1 + plugins/Admin/src/Controller/ListsController.php | 1 + .../src/Controller/ManufacturersController.php | 1 + .../src/Controller/OrderDetailsController.php | 1 + plugins/Admin/src/Controller/PagesController.php | 1 + .../Admin/src/Controller/PaymentsController.php | 1 + .../Admin/src/Controller/ProductsController.php | 1 + .../Admin/src/Controller/ReportsController.php | 1 + .../Admin/src/Controller/SlidersController.php | 1 + .../Admin/src/Controller/StatisticsController.php | 2 ++ plugins/Admin/src/Controller/TaxesController.php | 1 + plugins/Admin/src/Controller/ToolsController.php | 1 + plugins/Admin/templates/ActionLogs/index.php | 2 ++ plugins/Admin/templates/Attributes/edit.php | 2 ++ plugins/Admin/templates/Attributes/index.php | 2 ++ plugins/Admin/templates/BlogPosts/edit.php | 2 ++ plugins/Admin/templates/BlogPosts/index.php | 2 ++ plugins/Admin/templates/Categories/edit.php | 2 ++ plugins/Admin/templates/Categories/index.php | 2 ++ plugins/Admin/templates/Configurations/edit.php | 2 ++ plugins/Admin/templates/Configurations/index.php | 2 ++ .../templates/Configurations/send_test_email.php | 2 ++ plugins/Admin/templates/Cronjobs/edit.php | 2 ++ plugins/Admin/templates/Cronjobs/index.php | 2 ++ .../Admin/templates/Customers/change_password.php | 2 ++ .../templates/Customers/credit_balance_sum.php | 2 ++ plugins/Admin/templates/Customers/edit.php | 2 ++ plugins/Admin/templates/Customers/index.php | 2 ++ plugins/Admin/templates/Deposits/detail.php | 2 ++ plugins/Admin/templates/Deposits/index.php | 2 ++ .../Admin/templates/Deposits/overview_diagram.php | 2 ++ plugins/Admin/templates/Feedbacks/form.php | 2 ++ plugins/Admin/templates/Invoices/index.php | 2 ++ plugins/Admin/templates/Lists/order_lists.php | 2 ++ plugins/Admin/templates/Manufacturers/edit.php | 2 ++ .../templates/Manufacturers/edit_options.php | 2 ++ plugins/Admin/templates/Manufacturers/index.php | 2 ++ .../OrderDetails/edit_purchase_price.php | 2 ++ .../OrderDetails/iframe_instant_order.php | 2 ++ .../OrderDetails/iframe_self_service_order.php | 2 ++ plugins/Admin/templates/OrderDetails/index.php | 2 ++ plugins/Admin/templates/OrderDetails/profit.php | 2 ++ plugins/Admin/templates/Pages/edit.php | 2 ++ plugins/Admin/templates/Pages/home.php | 2 ++ plugins/Admin/templates/Pages/index.php | 2 ++ plugins/Admin/templates/Payments/edit.php | 2 ++ plugins/Admin/templates/Payments/product.php | 2 ++ .../Products/detect_missing_product_images.php | 2 ++ plugins/Admin/templates/Products/index.php | 2 ++ plugins/Admin/templates/Reports/payments.php | 2 ++ plugins/Admin/templates/Sliders/edit.php | 2 ++ plugins/Admin/templates/Sliders/index.php | 2 ++ plugins/Admin/templates/Statistics/index.php | 2 ++ plugins/Admin/templates/Taxes/edit.php | 2 ++ plugins/Admin/templates/Taxes/index.php | 2 ++ .../element/addDepositPaymentOverlay.php | 2 ++ .../templates/element/addInstantOrderButton.php | 2 ++ .../element/addSelfServiceOrderButton.php | 2 ++ .../Admin/templates/element/categoryTreeRows.php | 2 ++ .../Admin/templates/element/copyEmailButton.php | 2 ++ .../generateMemberCardsOfSelectedCustomers.php | 2 ++ plugins/Admin/templates/element/dateFields.php | 2 ++ .../templates/element/highlightRowAfterEdit.php | 2 ++ .../templates/element/invoice/taxSumTable.php | 1 + .../element/manufacturer/bankDetails.php | 2 ++ .../element/manufacturer/companyDetails.php | 1 + plugins/Admin/templates/element/menu.php | 2 ++ .../element/navTabs/configurationNavTabs.php | 2 ++ .../templates/element/navTabs/reportNavTabs.php | 2 ++ .../button/allProductsPickedUp.php | 2 ++ .../button/backToDepositAccount.php | 2 ++ .../changePickupDayOfSelectedOrderDetails.php | 2 ++ .../button/deleteSelectedOrderDetails.php | 2 ++ .../element/orderDetailList/button/email.php | 2 ++ .../button/generateOrderDetailsAsPdf.php | 2 ++ .../orderDetailList/button/multiplePickupDays.php | 2 ++ .../element/orderDetailList/data/amount.php | 2 ++ .../element/orderDetailList/data/cancelButton.php | 2 ++ .../element/orderDetailList/data/customer.php | 2 ++ .../element/orderDetailList/data/deposit.php | 2 ++ .../templates/element/orderDetailList/data/id.php | 2 ++ .../element/orderDetailList/data/invoiceLink.php | 2 ++ .../element/orderDetailList/data/mainObject.php | 2 ++ .../element/orderDetailList/data/orderState.php | 2 ++ .../element/orderDetailList/data/pickupDay.php | 2 ++ .../element/orderDetailList/data/price.php | 2 ++ .../orderDetailList/data/productsPickedUp.php | 2 ++ .../element/orderDetailList/data/quantity.php | 2 ++ .../element/orderDetailList/header/default.php | 2 ++ .../orderDetailList/header/groupByCustomer.php | 2 ++ .../header/groupByManufacturer.php | 2 ++ .../orderDetailList/header/groupByProduct.php | 2 ++ .../element/orderDetailList/pickupDayFilter.php | 2 ++ plugins/Admin/templates/element/pageTreeRows.php | 2 ++ .../element/payment/addTypeListUploadHeader.php | 2 ++ .../element/payment/addTypeManualHeader.php | 2 ++ .../Admin/templates/element/payment/csvUpload.php | 2 ++ .../element/payment/personalTransactionCode.php | 2 ++ .../Admin/templates/element/pdf/order_list.php | 2 ++ .../element/pdf/prepare_generate_member_cards.php | 2 ++ ...llingPriceWithSurchargeForSelectedProducts.php | 2 ++ .../productList/button/deleteSelectedProducts.php | 2 ++ .../editDeliveryRhythmForSelectedProducts.php | 2 ++ .../generateProductCardsOfSelectedProducts.php | 2 ++ .../productList/data/addAttributeButton.php | 2 ++ .../templates/element/productList/data/amount.php | 2 ++ .../element/productList/data/deliveryRhythm.php | 2 ++ .../element/productList/data/deposit.php | 2 ++ .../templates/element/productList/data/id.php | 2 ++ .../templates/element/productList/data/image.php | 2 ++ .../templates/element/productList/data/isNew.php | 2 ++ .../element/productList/data/isStockProduct.php | 2 ++ .../element/productList/data/manufacturerName.php | 2 ++ .../templates/element/productList/data/name.php | 2 ++ .../element/productList/data/preview.php | 2 ++ .../templates/element/productList/data/price.php | 2 ++ .../element/productList/data/purchasePrice.php | 2 ++ .../templates/element/productList/data/status.php | 2 ++ .../element/productList/data/surcharge.php | 2 ++ .../templates/element/productList/data/tax.php | 2 ++ .../templates/element/rowMarker/rowMarker.php | 2 ++ .../templates/element/rowMarker/rowMarkerAll.php | 2 ++ .../html/accounting_information_invoices_sent.php | 2 ++ .../templates/email/html/check_credit_balance.php | 2 ++ .../email/html/credit_csv_upload_successful.php | 2 ++ .../templates/email/html/email_order_reminder.php | 2 ++ .../email/html/order_detail_amount_changed.php | 2 ++ .../email/html/order_detail_customer_changed.php | 2 ++ .../templates/email/html/order_detail_deleted.php | 2 ++ .../email/html/order_detail_feedback_add.php | 2 ++ .../html/order_detail_pickup_day_changed.php | 2 ++ .../email/html/order_detail_price_changed.php | 2 ++ .../email/html/order_detail_quantity_changed.php | 2 ++ .../email/html/payment_status_changed.php | 2 ++ .../templates/email/html/pickup_reminder.php | 2 ++ .../send_cancellation_invoice_to_customer.php | 2 ++ .../templates/email/html/send_delivery_note.php | 2 ++ .../email/html/send_invoice_to_customer.php | 2 ++ .../email/html/send_invoice_to_manufacturer.php | 2 ++ .../templates/email/html/send_order_list.php | 2 ++ plugins/Admin/templates/layout/default.php | 2 ++ .../Admin/templates/pdf/invoice_to_customer.php | 2 ++ .../templates/pdf/invoice_to_manufacturer.php | 2 ++ plugins/Admin/templates/pdf/member_cards.php | 2 ++ plugins/Admin/templates/pdf/my_member_card.php | 2 ++ plugins/Admin/templates/pdf/order_details.php | 2 ++ .../templates/pdf/order_list_by_customer.php | 2 ++ .../Admin/templates/pdf/order_list_by_product.php | 2 ++ plugins/Admin/templates/pdf/product_cards.php | 2 ++ .../Controller/ConfigurationsControllerTest.php | 2 ++ .../src/Controller/FeedbacksControllerTest.php | 2 ++ .../src/Controller/InvoicesControllerTest.php | 1 + .../src/Controller/ListsControllerTest.php | 1 + .../Controller/ManufacturersControllerTest.php | 2 ++ .../OrderDetailsControllerAddFeedbackTest.php | 2 ++ .../OrderDetailsControllerCancellationTest.php | 2 ++ .../OrderDetailsControllerEditAmountTest.php | 2 ++ .../OrderDetailsControllerEditCustomerTest.php | 2 ++ .../OrderDetailsControllerEditNameTest.php | 2 ++ .../OrderDetailsControllerEditPickupDayTest.php | 2 ++ .../OrderDetailsControllerEditPriceTest.php | 2 ++ ...rderDetailsControllerEditPurchasePriceTest.php | 2 ++ .../OrderDetailsControllerEditQuantityTest.php | 2 ++ .../src/Controller/OrderDetailsControllerTest.php | 2 ++ .../src/Controller/PaymentsControllerTest.php | 1 + .../src/Controller/ProductsControllerTest.php | 2 ++ .../src/Model/Table/CartProductsTableTest.php | 1 + .../src/Model/Table/InvoicesTableTest.php | 1 + .../src/Model/Table/OrderDetailsTableTest.php | 1 + .../Model/Table/ProductAttributesTableTest.php | 1 + .../src/Model/Table/ProductsTableTest.php | 1 + .../Table/PurchasePriceProductsTableTest.php | 1 + .../TestCase/src/Model/Table/UnitsTableTest.php | 1 + plugins/Network/config/routes.php | 2 ++ plugins/Network/src/Controller/ApiController.php | 1 + .../src/Controller/SyncDomainsController.php | 1 + .../Network/src/Controller/SyncsController.php | 1 + .../Network/src/Model/Table/SyncDomainsTable.php | 3 +-- .../src/Model/Table/SyncManufacturersTable.php | 2 ++ .../Network/src/Model/Table/SyncProductsTable.php | 1 + plugins/Network/src/View/Helper/NetworkHelper.php | 2 ++ plugins/Network/templates/SyncDomains/edit.php | 2 ++ plugins/Network/templates/Syncs/product_data.php | 2 ++ plugins/Network/templates/Syncs/products.php | 2 ++ .../Network/templates/element/syncLoginForm.php | 2 ++ plugins/Network/templates/element/tabs.php | 2 ++ .../TestCase/src/Controller/ApiControllerTest.php | 2 ++ .../src/Controller/SyncDomainsControllerTest.php | 2 ++ .../src/Controller/SyncsControllerTest.php | 2 ++ src/Assets/AssetsProvider.php | 2 ++ src/Auth/BarCodeAuthenticate.php | 2 ++ src/Controller/AppController.php | 1 + src/Controller/BlogPostsController.php | 1 + src/Controller/CartsController.php | 1 + src/Controller/CategoriesController.php | 1 + src/Controller/Component/AppAuthComponent.php | 1 + src/Controller/Component/CartComponent.php | 1 + src/Controller/Component/SanitizeComponent.php | 2 ++ src/Controller/Component/StringComponent.php | 2 ++ src/Controller/CronController.php | 1 + src/Controller/CustomersController.php | 1 + src/Controller/ErrorController.php | 1 + src/Controller/FeedbacksController.php | 1 + src/Controller/FrontendController.php | 1 + src/Controller/LocalizedController.php | 2 ++ src/Controller/ManufacturersController.php | 1 + src/Controller/PagesController.php | 1 + src/Controller/ProductsController.php | 1 + src/Controller/SelfServiceController.php | 1 + src/Lib/Catalog/Catalog.php | 2 ++ src/Lib/Csv/BankingReader.php | 2 ++ src/Lib/Csv/BankingReaderInterface.php | 2 ++ src/Lib/Csv/GlsBankBankingReader.php | 2 ++ src/Lib/Csv/RaiffeisenBankingReader.php | 2 ++ src/Lib/Csv/SparkasseBankingReader.php | 2 ++ src/Lib/Csv/VolksbankBankingReader.php | 2 ++ src/Lib/DeliveryNote/GenerateDeliveryNote.php | 2 ++ src/Lib/DeliveryRhythm/DeliveryRhythm.php | 2 ++ .../Exception/ConfigFileMissingException.php | 2 ++ .../Error/Exception/InvalidParameterException.php | 2 ++ .../Error/Exception/NotCompatibleException.php | 2 ++ src/Lib/HelloCash/HelloCash.php | 2 ++ src/Lib/HelloCash/HelloCashApiException.php | 2 ++ src/Lib/Invoice/GenerateInvoiceToCustomer.php | 2 ++ src/Lib/Invoice/SendInvoiceToCustomer.php | 2 ++ src/Lib/OutputFilter/OutputFilter.php | 2 ++ .../config/de_DE/dorfladenOnlineConfig.php | 2 ++ .../OutputFilter/config/de_DE/geschaeftConfig.php | 2 ++ .../OutputFilter/config/de_DE/hofladenConfig.php | 2 ++ .../config/de_DE/hofladenOnlineConfig.php | 2 ++ .../config/de_DE/memberClientConfig.php | 2 ++ src/Lib/Pdf/AppTcpdf.php | 2 ++ src/Lib/Pdf/BarCodeTcpdf.php | 2 ++ src/Lib/Pdf/CustomerInvoiceBaseTcpdf.php | 2 ++ src/Lib/Pdf/CustomerInvoiceTcpdf.php | 2 ++ src/Lib/Pdf/CustomerInvoiceTcpdfInterface.php | 2 ++ ...stomerInvoiceWithTaxBasedOnInvoiceSumTcpdf.php | 2 ++ src/Lib/Pdf/FooterTrait.php | 1 + src/Lib/Pdf/ListTcpdf.php | 2 ++ src/Lib/Pdf/TaxSumTableTrait.php | 1 + .../GeneralTermsAndConditionsPdfWriter.php | 2 ++ ...InformationAboutRightOfWithdrawalPdfWriter.php | 2 ++ src/Lib/PdfWriter/InvoiceToCustomerPdfWriter.php | 2 ++ ...oCustomerWithTaxBasedOnInvoiceSumPdfWriter.php | 2 ++ .../PdfWriter/InvoiceToManufacturerPdfWriter.php | 2 ++ src/Lib/PdfWriter/MemberCardsPdfWriter.php | 2 ++ src/Lib/PdfWriter/MyMemberCardPdfWriter.php | 2 ++ src/Lib/PdfWriter/OrderConfirmationPdfWriter.php | 2 ++ src/Lib/PdfWriter/OrderDetailsPdfWriter.php | 2 ++ .../PdfWriter/OrderListByCustomerPdfWriter.php | 2 ++ src/Lib/PdfWriter/OrderListByProductPdfWriter.php | 2 ++ src/Lib/PdfWriter/OrderListPdfWriter.php | 2 ++ src/Lib/PdfWriter/PdfWriter.php | 2 ++ src/Lib/PdfWriter/ProductCardsPdfWriter.php | 2 ++ src/Lib/PdfWriter/SetSumTrait.php | 2 ++ src/Lib/PdfWriter/TermsOfUsePdfWriter.php | 2 ++ src/Lib/RemoteFile/RemoteFile.php | 2 ++ src/Log/Engine/FileAndEmailLog.php | 1 + src/Mailer/AppMailer.php | 1 + src/Model/Entity/Cronjob.php | 2 ++ src/Model/Entity/Customer.php | 2 ++ src/Model/Entity/Invoice.php | 2 ++ src/Model/Table/ActionLogsTable.php | 1 + src/Model/Table/AddressCustomersTable.php | 1 + src/Model/Table/AddressManufacturersTable.php | 1 + src/Model/Table/AddressesTable.php | 1 + src/Model/Table/AppTable.php | 1 + src/Model/Table/AttributesTable.php | 1 + src/Model/Table/BarcodeProductAttributesTable.php | 1 + src/Model/Table/BarcodeProductsTable.php | 1 + src/Model/Table/BlogPostsTable.php | 1 + src/Model/Table/CartProductUnitsTable.php | 1 + src/Model/Table/CartProductsTable.php | 1 + src/Model/Table/CartsTable.php | 1 + src/Model/Table/CategoriesTable.php | 1 + src/Model/Table/CategoryProductsTable.php | 1 + src/Model/Table/ConfigurationsTable.php | 1 + src/Model/Table/CronjobLogsTable.php | 1 + src/Model/Table/CronjobsTable.php | 1 + src/Model/Table/CustomersTable.php | 1 + src/Model/Table/DepositProductAttributesTable.php | 1 + src/Model/Table/DepositProductsTable.php | 1 + src/Model/Table/FeedbacksTable.php | 1 + src/Model/Table/ImagesTable.php | 1 + src/Model/Table/InvoiceTaxesTable.php | 1 + src/Model/Table/InvoicesTable.php | 1 + src/Model/Table/ManufacturersTable.php | 1 + src/Model/Table/OrderDetailFeedbacksTable.php | 1 + .../Table/OrderDetailPurchasePricesTable.php | 1 + src/Model/Table/OrderDetailUnitsTable.php | 1 + src/Model/Table/OrderDetailsTable.php | 1 + src/Model/Table/PagesTable.php | 1 + src/Model/Table/PaymentsTable.php | 1 + src/Model/Table/PickupDaysTable.php | 1 + .../Table/ProductAttributeCombinationsTable.php | 1 + src/Model/Table/ProductAttributeTable.php | 1 + src/Model/Table/ProductAttributesTable.php | 1 + src/Model/Table/ProductsTable.php | 1 + .../Table/PurchasePriceProductAttributesTable.php | 1 + src/Model/Table/PurchasePriceProductsTable.php | 1 + src/Model/Table/SlidersTable.php | 1 + src/Model/Table/StockAvailablesTable.php | 1 + src/Model/Table/StorageLocationsTable.php | 1 + src/Model/Table/TaxesTable.php | 1 + src/Model/Table/UnitProductAttributesTable.php | 1 + src/Model/Table/UnitProductsTable.php | 1 + src/Model/Table/UnitsTable.php | 1 + .../Traits/ProductAndAttributeEntityTrait.php | 1 + .../Traits/ProductCacheClearAfterDeleteTrait.php | 1 + .../Traits/ProductCacheClearAfterSaveTrait.php | 1 + src/Network/AppSession.php | 2 ++ src/ORM/AppMarshaller.php | 2 ++ src/Queue/Task/AppEmailTask.php | 1 + .../Task/GenerateInvoiceForManufacturerTask.php | 2 ++ src/Queue/Task/GenerateOrderListTask.php | 2 ++ src/Queue/Task/UpdateActionLogTrait.php | 1 + src/Shell/AppShell.php | 1 + src/Shell/BackupDatabaseShell.php | 2 ++ src/Shell/ChangeWeeklyPickupDayByOneDayShell.php | 2 ++ src/Shell/CheckCreditBalanceShell.php | 2 ++ src/Shell/EmailOrderReminderShell.php | 2 ++ src/Shell/PickupReminderShell.php | 2 ++ src/Shell/SavedLocalizedJsAsStaticFileShell.php | 2 ++ src/Shell/SendDeliveryNotesShell.php | 2 ++ src/Shell/SendInvoicesToCustomersShell.php | 2 ++ src/Shell/SendInvoicesToManufacturersShell.php | 2 ++ src/Shell/SendOrderListsShell.php | 2 ++ src/Shell/TestCronjobShell.php | 2 ++ ...tCronjobWithInvalidParameterExceptionShell.php | 2 ++ src/View/AjaxView.php | 1 + src/View/AppView.php | 1 + src/View/Helper/ConfigurationHelper.php | 1 + src/View/Helper/MenuHelper.php | 1 + src/View/Helper/MyHtmlHelper.php | 3 ++- src/View/Helper/MyNumberHelper.php | 3 ++- src/View/Helper/MyTimeHelper.php | 1 + src/View/Helper/PricePerUnitHelper.php | 1 + src/View/Helper/SlugHelper.php | 1 + src/View/Widget/MyBasicWidget.php | 2 ++ templates/BlogPosts/detail.php | 2 ++ templates/BlogPosts/index.php | 2 ++ templates/Carts/detail.php | 2 ++ templates/Carts/order_successful.php | 2 ++ templates/Categories/detail.php | 2 ++ .../Customers/accept_updated_terms_of_use.php | 2 ++ templates/Customers/login.php | 2 ++ templates/Customers/new_password_request.php | 2 ++ templates/Customers/registration_successful.php | 2 ++ templates/Error/error400.php | 2 ++ templates/Error/error500.php | 2 ++ templates/Error/errorjson.php | 2 ++ templates/Feedbacks/index.php | 8 +++----- templates/Localized/render_as_js_file.php | 2 ++ templates/Manufacturers/detail.php | 2 ++ templates/Manufacturers/index.php | 2 ++ templates/Pages/detail.php | 2 ++ templates/Pages/home.php | 1 + templates/Pages/list_of_allergens.php | 2 ++ templates/Pages/privacy_policy.php | 2 ++ templates/Pages/terms_of_use.php | 2 ++ templates/Products/detail.php | 2 ++ templates/SelfService/index.php | 2 ++ templates/element/acceptUpdatedTermsOfUseForm.php | 2 ++ templates/element/addScript.php | 2 ++ templates/element/autoPrintInvoice.php | 2 ++ templates/element/blogPosts.php | 2 ++ templates/element/cart.php | 2 ++ .../element/cart/cancellationTermsCheckbox.php | 2 ++ .../cart/generalTermsAndConditionsCheckbox.php | 2 ++ templates/element/cart/orderButton.php | 2 ++ templates/element/cart/paymentInfoText.php | 2 ++ .../element/cart/pickupDayCommentTextareas.php | 2 ++ templates/element/cart/pickupPlaceInfoText.php | 2 ++ .../cart/promiseToPickUpProductsCheckbox.php | 2 ++ templates/element/cart/selectPickupDay.php | 2 ++ .../element/cart/variableMemberFeeInfoText.php | 2 ++ templates/element/catalog/amountWrapper.php | 2 ++ templates/element/catalog/cartButton.php | 2 ++ templates/element/catalog/columns/column1.php | 2 ++ templates/element/catalog/columns/column2.php | 2 ++ templates/element/catalog/columns/column3.php | 2 ++ .../element/catalog/hiddenProductIdField.php | 2 ++ ...ProductsInOrdersWithDeliveryRhythmInfoText.php | 2 ++ templates/element/catalog/notAvailableInfo.php | 2 ++ templates/element/catalog/product.php | 2 ++ .../element/catalog/productWithAttributes.php | 2 ++ .../element/catalog/productWithoutAttributes.php | 2 ++ .../quantityInUnitsInputFieldForSelfService.php | 2 ++ templates/element/customThemeStyleSheet.php | 2 ++ templates/element/email/greeting.php | 2 ++ templates/element/email/orderedProductsTable.php | 2 ++ templates/element/email/profileLinks.php | 2 ++ templates/element/email/tableFoot.php | 2 ++ templates/element/email/tableHead.php | 2 ++ templates/element/feedback/quote.php | 2 ++ templates/element/fileUploadForm.php | 2 ++ templates/element/flash/error.php | 2 ++ templates/element/flash/success.php | 2 ++ templates/element/foodCoopShopInstancesMap.php | 2 ++ templates/element/footer.php | 2 ++ templates/element/globalNoDeliveryDayBox.php | 2 ++ templates/element/headerIcons.php | 2 ++ templates/element/helpIcon.php | 2 ++ templates/element/imageUploadForm.php | 2 ++ templates/element/infoBox.php | 2 ++ templates/element/jsNamespace.php | 2 ++ templates/element/layout/customHeader.php | 2 ++ templates/element/layout/footer.php | 2 ++ templates/element/layout/header.php | 2 ++ .../directSelling/generalTermsAndConditions.php | 2 ++ .../legal/de_DE/directSelling/termsOfUse.php | 2 ++ .../directSelling/termsOfUseForManufacturers.php | 2 ++ templates/element/legal/de_DE/listOfAllergens.php | 2 ++ templates/element/legal/de_DE/privacyPolicy.php | 2 ++ .../de_DE/retail/generalTermsAndConditions.php | 2 ++ .../element/legal/de_DE/retail/termsOfUse.php | 2 ++ .../de_DE/retail/termsOfUseForManufacturers.php | 2 ++ .../legal/de_DE/rightOfWithdrawalTerms.php | 2 ++ .../directSelling/generalTermsAndConditions.php | 2 ++ .../legal/en_US/directSelling/termsOfUse.php | 2 ++ .../directSelling/termsOfUseForManufacturers.php | 2 ++ templates/element/legal/en_US/listOfAllergens.php | 2 ++ templates/element/legal/en_US/privacyPolicy.php | 2 ++ .../en_US/retail/generalTermsAndConditions.php | 2 ++ .../element/legal/en_US/retail/termsOfUse.php | 2 ++ .../en_US/retail/termsOfUseForManufacturers.php | 2 ++ .../legal/en_US/rightOfWithdrawalTerms.php | 2 ++ templates/element/localizedJavascript.php | 2 ++ templates/element/logo.php | 2 ++ templates/element/mainMenu.php | 2 ++ templates/element/printIcon.php | 2 ++ templates/element/productSearch.php | 2 ++ templates/element/renderCss.php | 2 ++ templates/element/renderJs.php | 2 ++ templates/element/script.php | 2 ++ templates/element/scrollToTopButton.php | 2 ++ templates/element/selfService/addDeposit.php | 15 +++++++++++++++ templates/element/selfService/paymentType.php | 2 ++ templates/element/sidebar.php | 2 ++ templates/element/slider.php | 2 ++ templates/element/stockProductInListInfo.php | 2 ++ templates/element/userMenu.php | 2 ++ templates/email/html/customer_activated.php | 2 ++ .../email/html/customer_registered_active.php | 2 ++ .../email/html/customer_registered_inactive.php | 2 ++ .../html/customer_registered_notification.php | 2 ++ templates/email/html/debug.php | 2 ++ templates/email/html/email_address_activated.php | 2 ++ .../email/html/instant_order_notification.php | 2 ++ .../html/new_password_request_successful.php | 2 ++ templates/email/html/order_successful.php | 2 ++ .../email/html/order_successful_self_service.php | 2 ++ templates/email/html/send_test_email_template.php | 2 ++ ...stock_available_limit_reached_notification.php | 2 ++ templates/jpg/profile_image.php | 2 ++ templates/layout/ajax.php | 2 ++ templates/layout/default.php | 2 ++ templates/layout/email/html/default.php | 2 ++ templates/layout/error.php | 2 ++ templates/layout/gif/default.php | 2 ++ templates/layout/jpg/default.php | 2 ++ templates/layout/js/default.php | 2 ++ templates/layout/pdf/default.php | 2 ++ templates/layout/pdf/self_service.php | 2 ++ templates/layout/png/default.php | 2 ++ templates/layout/self_service.php | 2 ++ templates/pdf/general_terms_and_conditions.php | 2 ++ .../pdf/information_about_right_of_withdrawal.php | 2 ++ templates/pdf/order_confirmation.php | 2 ++ templates/pdf/terms_of_use.php | 2 ++ templates/png/profile_image.php | 2 ++ tests/TestCase/AppCakeTestCase.php | 1 + 499 files changed, 901 insertions(+), 9 deletions(-) diff --git a/config/Locale/de_DE/date.php b/config/Locale/de_DE/date.php index 88852a7687..1549f968f5 100644 --- a/config/Locale/de_DE/date.php +++ b/config/Locale/de_DE/date.php @@ -1,4 +1,6 @@ $feedback->privatized_name . $additionalMetaData, ]); } -} - - -?> - +} \ No newline at end of file diff --git a/templates/Localized/render_as_js_file.php b/templates/Localized/render_as_js_file.php index e81a0885da..ab2c2a3fd5 100644 --- a/templates/Localized/render_as_js_file.php +++ b/templates/Localized/render_as_js_file.php @@ -1,4 +1,6 @@ + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ + if (!$this->Html->paymentIsCashless() || !$appAuth->user() || $appAuth->isSelfServiceCustomer()) { return; } diff --git a/templates/element/selfService/paymentType.php b/templates/element/selfService/paymentType.php index afc15c3264..1cf496fe3a 100644 --- a/templates/element/selfService/paymentType.php +++ b/templates/element/selfService/paymentType.php @@ -1,4 +1,6 @@ assertMatchesRegularExpression('`' . preg_quote($unquotedString) . '`', $response, $msg); } From 8fb5d04554485a373d4f72c58320ce3f326805cf Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 18 Oct 2022 11:53:46 +0200 Subject: [PATCH 202/646] use correct type --- src/Model/Table/ProductsTable.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index 72df1d0146..2a66bd48bc 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -233,7 +233,7 @@ public function isOwner($productId, $manufacturerId) public function getProductIdAndAttributeId($productId): array { $attributeId = 0; - $explodedProductId = explode('-', $productId); + $explodedProductId = explode('-', (string) $productId); if (count($explodedProductId) == 2) { $productId = $explodedProductId[0]; $attributeId = $explodedProductId[1]; From e00997ebf5f31d395404a4ff0c414d1f6036db54 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 18 Oct 2022 12:03:03 +0200 Subject: [PATCH 203/646] use correct type --- src/Controller/Component/CartComponent.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Controller/Component/CartComponent.php b/src/Controller/Component/CartComponent.php index 800ebf8587..06088f4bf2 100644 --- a/src/Controller/Component/CartComponent.php +++ b/src/Controller/Component/CartComponent.php @@ -585,12 +585,12 @@ private function prepareOrderDetailPurchasePrices($ids, $product, $cartProduct) foreach ($product->product_attributes as $attribute) { if ($attribute->id_product_attribute == $ids['attributeId']) { if (!empty($attribute->unit_product_attribute) && $attribute->unit_product_attribute->price_per_unit_enabled) { - $totalPurchasePriceTaxIncl = $attribute->unit_product_attribute->purchase_price_incl_per_unit ?? 0; + $totalPurchasePriceTaxIncl = (float) $attribute->unit_product_attribute->purchase_price_incl_per_unit ?? 0; $totalPurchasePriceTaxIncl = round($totalPurchasePriceTaxIncl * $cartProduct['productQuantityInUnits'] / $attribute->unit_product_attribute->amount, 2); $totalPurchasePriceTaxExcl = $this->Product->getNetPrice($totalPurchasePriceTaxIncl, $purchasePriceTaxRate); $totalPurchasePriceTaxExcl = round($totalPurchasePriceTaxExcl, 2); } else { - $totalPurchasePriceTaxExcl = $attribute->purchase_price_product_attribute->price ?? 0; + $totalPurchasePriceTaxExcl = (float) $attribute->purchase_price_product_attribute->price ?? 0; $totalPurchasePriceTaxExcl = round($totalPurchasePriceTaxExcl, 2); $totalPurchasePriceTaxIncl = $this->Product->getGrossPrice($totalPurchasePriceTaxExcl, $purchasePriceTaxRate); $totalPurchasePriceTaxIncl *= $amount; @@ -602,12 +602,12 @@ private function prepareOrderDetailPurchasePrices($ids, $product, $cartProduct) } else { // main product if (!empty($product->unit_product) && $product->unit_product->price_per_unit_enabled) { - $totalPurchasePriceTaxIncl = $product->unit_product->purchase_price_incl_per_unit ?? 0; + $totalPurchasePriceTaxIncl = (float) $product->unit_product->purchase_price_incl_per_unit ?? 0; $totalPurchasePriceTaxIncl = round($totalPurchasePriceTaxIncl * $cartProduct['productQuantityInUnits'] / $product->unit_product->amount, 2); $totalPurchasePriceTaxExcl = $this->Product->getNetPrice($totalPurchasePriceTaxIncl, $purchasePriceTaxRate); $totalPurchasePriceTaxExcl = round($totalPurchasePriceTaxExcl, 2); } else { - $totalPurchasePriceTaxExcl = $product->purchase_price_product->price ?? 0; + $totalPurchasePriceTaxExcl = (float) $product->purchase_price_product->price ?? 0; $totalPurchasePriceTaxExcl = round($totalPurchasePriceTaxExcl, 2); $totalPurchasePriceTaxIncl = $this->Product->getGrossPrice($totalPurchasePriceTaxExcl, $purchasePriceTaxRate); $totalPurchasePriceTaxIncl *= $amount; From 32d98db4001f6268f00e4fcc0b214526a9acc070 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 18 Oct 2022 12:10:19 +0200 Subject: [PATCH 204/646] use correct type --- src/Controller/Component/CartComponent.php | 16 ++++++++-------- src/View/Widget/MyBasicWidget.php | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Controller/Component/CartComponent.php b/src/Controller/Component/CartComponent.php index 06088f4bf2..4d1278ee79 100644 --- a/src/Controller/Component/CartComponent.php +++ b/src/Controller/Component/CartComponent.php @@ -585,13 +585,13 @@ private function prepareOrderDetailPurchasePrices($ids, $product, $cartProduct) foreach ($product->product_attributes as $attribute) { if ($attribute->id_product_attribute == $ids['attributeId']) { if (!empty($attribute->unit_product_attribute) && $attribute->unit_product_attribute->price_per_unit_enabled) { - $totalPurchasePriceTaxIncl = (float) $attribute->unit_product_attribute->purchase_price_incl_per_unit ?? 0; - $totalPurchasePriceTaxIncl = round($totalPurchasePriceTaxIncl * $cartProduct['productQuantityInUnits'] / $attribute->unit_product_attribute->amount, 2); + $totalPurchasePriceTaxIncl = $attribute->unit_product_attribute->purchase_price_incl_per_unit ?? 0; + $totalPurchasePriceTaxIncl = round((float) $totalPurchasePriceTaxIncl * $cartProduct['productQuantityInUnits'] / $attribute->unit_product_attribute->amount, 2); $totalPurchasePriceTaxExcl = $this->Product->getNetPrice($totalPurchasePriceTaxIncl, $purchasePriceTaxRate); $totalPurchasePriceTaxExcl = round($totalPurchasePriceTaxExcl, 2); } else { - $totalPurchasePriceTaxExcl = (float) $attribute->purchase_price_product_attribute->price ?? 0; - $totalPurchasePriceTaxExcl = round($totalPurchasePriceTaxExcl, 2); + $totalPurchasePriceTaxExcl = $attribute->purchase_price_product_attribute->price ?? 0; + $totalPurchasePriceTaxExcl = round((float) $totalPurchasePriceTaxExcl, 2); $totalPurchasePriceTaxIncl = $this->Product->getGrossPrice($totalPurchasePriceTaxExcl, $purchasePriceTaxRate); $totalPurchasePriceTaxIncl *= $amount; $totalPurchasePriceTaxExcl *= $amount; @@ -602,13 +602,13 @@ private function prepareOrderDetailPurchasePrices($ids, $product, $cartProduct) } else { // main product if (!empty($product->unit_product) && $product->unit_product->price_per_unit_enabled) { - $totalPurchasePriceTaxIncl = (float) $product->unit_product->purchase_price_incl_per_unit ?? 0; - $totalPurchasePriceTaxIncl = round($totalPurchasePriceTaxIncl * $cartProduct['productQuantityInUnits'] / $product->unit_product->amount, 2); + $totalPurchasePriceTaxIncl = $product->unit_product->purchase_price_incl_per_unit ?? 0; + $totalPurchasePriceTaxIncl = round((float) $totalPurchasePriceTaxIncl * $cartProduct['productQuantityInUnits'] / $product->unit_product->amount, 2); $totalPurchasePriceTaxExcl = $this->Product->getNetPrice($totalPurchasePriceTaxIncl, $purchasePriceTaxRate); $totalPurchasePriceTaxExcl = round($totalPurchasePriceTaxExcl, 2); } else { - $totalPurchasePriceTaxExcl = (float) $product->purchase_price_product->price ?? 0; - $totalPurchasePriceTaxExcl = round($totalPurchasePriceTaxExcl, 2); + $totalPurchasePriceTaxExcl = $product->purchase_price_product->price ?? 0; + $totalPurchasePriceTaxExcl = round((float) $totalPurchasePriceTaxExcl, 2); $totalPurchasePriceTaxIncl = $this->Product->getGrossPrice($totalPurchasePriceTaxExcl, $purchasePriceTaxRate); $totalPurchasePriceTaxIncl *= $amount; $totalPurchasePriceTaxExcl *= $amount; diff --git a/src/View/Widget/MyBasicWidget.php b/src/View/Widget/MyBasicWidget.php index fa66a29e8f..470daf3b6e 100644 --- a/src/View/Widget/MyBasicWidget.php +++ b/src/View/Widget/MyBasicWidget.php @@ -51,7 +51,7 @@ public function render(array $data, ContextInterface $context): string // since HtmlPurifier converts all database updates to htmlspecialchars (eg. & => &, > => <) // they need to be reconverted for being displayed properly in form inputs if (!is_null($data['value'])) { - $data['value'] = html_entity_decode($data['value']); + $data['value'] = html_entity_decode((string) $data['value']); } return $this->_templates->format('input', [ From 5b927b0490d45239b5145e29882832fcab2419e4 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 18 Oct 2022 12:16:57 +0200 Subject: [PATCH 205/646] use correct argument type --- src/Controller/AppController.php | 2 +- src/Controller/LocalizedController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php index d94f3694f6..3ef4eaeead 100644 --- a/src/Controller/AppController.php +++ b/src/Controller/AppController.php @@ -158,7 +158,7 @@ public function afterFilter(EventInterface $event) { parent::afterFilter($event); if (Configure::check('app.outputStringReplacements')) { - $newOutput = OutputFilter::replace($this->response->getBody(), Configure::read('app.outputStringReplacements')); + $newOutput = OutputFilter::replace($this->response->getBody()->__toString(), Configure::read('app.outputStringReplacements')); $this->response = $this->response->withStringBody($newOutput); } } diff --git a/src/Controller/LocalizedController.php b/src/Controller/LocalizedController.php index bfb0388c79..28d81745f3 100644 --- a/src/Controller/LocalizedController.php +++ b/src/Controller/LocalizedController.php @@ -377,7 +377,7 @@ public function afterFilter(EventInterface $event) { parent::afterFilter($event); if (Configure::check('app.outputStringReplacements')) { - $newOutput = OutputFilter::replace($this->response->getBody(), Configure::read('app.outputStringReplacements')); + $newOutput = OutputFilter::replace($this->response->getBody()->__toString(), Configure::read('app.outputStringReplacements')); $this->response = $this->response->withStringBody($newOutput); } } From b0ab22b54e962d17fec494d47829419b2f6117ab Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 18 Oct 2022 16:13:59 +0200 Subject: [PATCH 206/646] use correct type --- .../src/Controller/InvoicesControllerTest.php | 2 +- src/Controller/CustomersController.php | 2 +- src/Lib/Csv/BankingReader.php | 2 +- src/Lib/Csv/GlsBankBankingReader.php | 1 - src/Lib/Csv/RaiffeisenBankingReader.php | 1 - src/Lib/Csv/SparkasseBankingReader.php | 1 - src/Lib/Csv/VolksbankBankingReader.php | 1 - src/Model/Table/CronjobsTable.php | 2 +- src/Model/Table/InvoicesTable.php | 6 ++--- src/Model/Table/ProductsTable.php | 9 +++++--- src/View/Helper/MyNumberHelper.php | 3 +-- .../src/Lib/HelloCash/HelloCashTest.php | 2 +- .../src/Model/Table/CronjobsTableTest.php | 22 +++++++++---------- 13 files changed, 26 insertions(+), 28 deletions(-) diff --git a/plugins/Admin/tests/TestCase/src/Controller/InvoicesControllerTest.php b/plugins/Admin/tests/TestCase/src/Controller/InvoicesControllerTest.php index 5f255274bb..795f385969 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/InvoicesControllerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/InvoicesControllerTest.php @@ -124,7 +124,7 @@ public function testCancel() 'invoiceId' => $invoice->id, ] ); - $response = json_decode($this->_response); + $response = json_decode($this->_response->getBody()->__toString()); $this->runAndAssertQueue(); $invoices = $this->Invoice->find('all', [ diff --git a/src/Controller/CustomersController.php b/src/Controller/CustomersController.php index cfdaf1302f..188cb32ffe 100644 --- a/src/Controller/CustomersController.php +++ b/src/Controller/CustomersController.php @@ -307,7 +307,7 @@ public function login() !empty($customer)) { $customer = $this->Customer->get($customer['id_customer']); if ($customer->auto_login_hash == '') { - $customer->auto_login_hash = Security::hash(rand()); + $customer->auto_login_hash = Security::hash((string) rand()); $this->Customer->save($customer); } $cookie = (new Cookie('remember_me')) diff --git a/src/Lib/Csv/BankingReader.php b/src/Lib/Csv/BankingReader.php index 2afd4fb7e1..32b6692061 100644 --- a/src/Lib/Csv/BankingReader.php +++ b/src/Lib/Csv/BankingReader.php @@ -99,7 +99,7 @@ public function checkStructure(): bool $structureIsOk |= $this->checkStructureForRecord($record); } - return $structureIsOk; + return (bool) $structureIsOk; } } diff --git a/src/Lib/Csv/GlsBankBankingReader.php b/src/Lib/Csv/GlsBankBankingReader.php index 683a1cea5c..369bd56fd0 100644 --- a/src/Lib/Csv/GlsBankBankingReader.php +++ b/src/Lib/Csv/GlsBankBankingReader.php @@ -65,7 +65,6 @@ public function equalizeStructure(array $records): array return $preparedRecords; } - } ?> \ No newline at end of file diff --git a/src/Lib/Csv/RaiffeisenBankingReader.php b/src/Lib/Csv/RaiffeisenBankingReader.php index 0b5896fb98..18fafb72c8 100644 --- a/src/Lib/Csv/RaiffeisenBankingReader.php +++ b/src/Lib/Csv/RaiffeisenBankingReader.php @@ -69,7 +69,6 @@ public function equalizeStructure(array $records): array return $preparedRecords; } - } ?> \ No newline at end of file diff --git a/src/Lib/Csv/SparkasseBankingReader.php b/src/Lib/Csv/SparkasseBankingReader.php index db729a2846..187eb0e83f 100644 --- a/src/Lib/Csv/SparkasseBankingReader.php +++ b/src/Lib/Csv/SparkasseBankingReader.php @@ -72,7 +72,6 @@ public function equalizeStructure(array $records): array return $preparedRecords; } - } ?> \ No newline at end of file diff --git a/src/Lib/Csv/VolksbankBankingReader.php b/src/Lib/Csv/VolksbankBankingReader.php index ad6612cf4d..fcf8ac06b7 100644 --- a/src/Lib/Csv/VolksbankBankingReader.php +++ b/src/Lib/Csv/VolksbankBankingReader.php @@ -67,7 +67,6 @@ public function equalizeStructure(array $records): array return $preparedRecords; } - } ?> \ No newline at end of file diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 6183f34447..32b8c54019 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -212,7 +212,7 @@ public function run() { if (empty($this->cronjobRunDay)) { - $this->cronjobRunDay = Configure::read('app.timeHelper')->getTimeObjectUTC(date(Configure::read('DateFormat.DatabaseWithTimeAlt')))->toUnixString(); + $this->cronjobRunDay = (int) Configure::read('app.timeHelper')->getTimeObjectUTC(date(Configure::read('DateFormat.DatabaseWithTimeAlt')))->toUnixString(); } $this->CronjobLogs->deleteOldLogs($this->cronjobRunDay); diff --git a/src/Model/Table/InvoicesTable.php b/src/Model/Table/InvoicesTable.php index be33df9f4c..92e4ba53c2 100644 --- a/src/Model/Table/InvoicesTable.php +++ b/src/Model/Table/InvoicesTable.php @@ -423,7 +423,7 @@ public function getNextInvoiceNumberForCustomer($currentYear, $lastInvoice) } } - $newIncreasingInvoiceNumber = $this->formatInvoiceNumberWithLeadingZeros($increasingNumberOfLastInvoice, 6); + $newIncreasingInvoiceNumber = $this->formatInvoiceNumberWithLeadingZeros((string) $increasingNumberOfLastInvoice, 6); $newInvoiceNumber = $invoicePrefix . $currentYear . '-' . $newIncreasingInvoiceNumber; return $newInvoiceNumber; @@ -436,14 +436,14 @@ public function getNextInvoiceNumberForManufacturer($invoices) if (! empty($invoices)) { $invoiceNumber = (int) $invoices[0]->invoice_number + 1; } - $newInvoiceNumber = $this->formatInvoiceNumberWithLeadingZeros($invoiceNumber, 4); + $newInvoiceNumber = $this->formatInvoiceNumberWithLeadingZeros((string) $invoiceNumber, 4); return $newInvoiceNumber; } /** * turns eg 24 into 0024 */ - private function formatInvoiceNumberWithLeadingZeros($invoiceNumber, $zeroCount) + private function formatInvoiceNumberWithLeadingZeros(string $invoiceNumber, int $zeroCount): string { return str_pad($invoiceNumber, $zeroCount, '0', STR_PAD_LEFT); } diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index 2a66bd48bc..aad45d49e5 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -759,7 +759,10 @@ public function getProductsForBackend($appAuth, $productIds, $manufacturerId, $a $quantityIsZeroFilterOn = false; $priceIsZeroFilterOn = false; foreach ($conditions as $condition) { - if (!is_array($condition) && preg_match('/'.$this->getIsQuantityMinFilterSetCondition().'/', $condition)) { + if (is_int($condition) || !is_array($condition)) { + continue; + } + if (preg_match('/'.$this->getIsQuantityMinFilterSetCondition().'/', $condition)) { $this->getAssociation('ProductAttributes')->setConditions( [ 'StockAvailables.quantity < 3' @@ -767,7 +770,7 @@ public function getProductsForBackend($appAuth, $productIds, $manufacturerId, $a ); $quantityIsZeroFilterOn = true; } - if (!is_array($condition) && preg_match('/'.$this->getIsPriceZeroCondition().'/', $condition)) { + if (preg_match('/'.$this->getIsPriceZeroCondition().'/', $condition)) { $this->ProductAttributes->setConditions( [ 'ProductAttributes.price' => 0 @@ -1101,7 +1104,7 @@ public function getProductsForBackend($appAuth, $productIds, $manufacturerId, $a if (Configure::read('appDb.FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED')) { $attributeId = $attribute->id_product_attribute ?? 0; - $preparedProduct['system_bar_code'] = $product->system_bar_code . Configure::read('app.numberHelper')->addLeadingZerosToNumber($attributeId, 4); + $preparedProduct['system_bar_code'] = $product->system_bar_code . Configure::read('app.numberHelper')->addLeadingZerosToNumber((string) $attributeId, 4); $preparedProduct['image'] = $product->image; if (!empty($attribute->unit_product_attribute) && $attribute->unit_product_attribute->price_per_unit_enabled) { $preparedProduct['nameForBarcodePdf'] = $product->name . ': ' . $productName; diff --git a/src/View/Helper/MyNumberHelper.php b/src/View/Helper/MyNumberHelper.php index 7a837a6eeb..81415e472b 100644 --- a/src/View/Helper/MyNumberHelper.php +++ b/src/View/Helper/MyNumberHelper.php @@ -24,9 +24,8 @@ class MyNumberHelper extends NumberHelper { /** * turns eg 245 into 00245 - * @return string */ - public function addLeadingZerosToNumber($number, $digits) + public function addLeadingZerosToNumber(string $number, int $digits): string { return str_pad($number, $digits, '0', STR_PAD_LEFT); } diff --git a/tests/TestCase/src/Lib/HelloCash/HelloCashTest.php b/tests/TestCase/src/Lib/HelloCash/HelloCashTest.php index 01130e5830..67ed9bd9dc 100644 --- a/tests/TestCase/src/Lib/HelloCash/HelloCashTest.php +++ b/tests/TestCase/src/Lib/HelloCash/HelloCashTest.php @@ -196,7 +196,7 @@ public function testCancelInvoice() 'invoiceId' => $invoice->id, ] ); - $response = json_decode($this->_response); + $response = json_decode($this->_response->getBody()->__toString()); $this->runAndAssertQueue(); $invoice = $this->Invoice->find('all', [ diff --git a/tests/TestCase/src/Model/Table/CronjobsTableTest.php b/tests/TestCase/src/Model/Table/CronjobsTableTest.php index 99ceea7af0..e65ab65def 100644 --- a/tests/TestCase/src/Model/Table/CronjobsTableTest.php +++ b/tests/TestCase/src/Model/Table/CronjobsTableTest.php @@ -179,7 +179,7 @@ public function testEditMonthlyOk() public function testRunSunday() { $time = '2018-10-21 23:00:00'; - $this->Cronjob->cronjobRunDay = $this->Time->getTimeObjectUTC($time)->toUnixString(); + $this->Cronjob->cronjobRunDay = (int) $this->Time->getTimeObjectUTC($time)->toUnixString(); $executedCronjobs = $this->Cronjob->run(); $this->assertEquals($executedCronjobs[0]['created'], $time); @@ -191,7 +191,7 @@ public function testRunSunday() public function testRunMonday() { $time = '2018-10-22 23:00:00'; - $this->Cronjob->cronjobRunDay = $this->Time->getTimeObjectUTC($time)->toUnixString(); + $this->Cronjob->cronjobRunDay = (int) $this->Time->getTimeObjectUTC($time)->toUnixString(); $executedCronjobs = $this->Cronjob->run(); $this->assertEquals(2, count($executedCronjobs)); $this->assertEquals($executedCronjobs[0]['time_interval'], 'day'); @@ -202,7 +202,7 @@ public function testRunMonday() public function testPreviousCronjobLogFailure() { $time = '2018-10-22 23:00:00'; - $this->Cronjob->cronjobRunDay = $this->Time->getTimeObjectUTC($time)->toUnixString(); + $this->Cronjob->cronjobRunDay = (int) $this->Time->getTimeObjectUTC($time)->toUnixString(); $this->Cronjob->CronjobLogs->save( $this->Cronjob->CronjobLogs->newEntity( [ @@ -222,7 +222,7 @@ public function testPreviousCronjobLogFailure() public function testPreviousCronjobLogRunning() { $time = '2018-10-22 23:00:00'; - $this->Cronjob->cronjobRunDay = $this->Time->getTimeObjectUTC($time)->toUnixString(); + $this->Cronjob->cronjobRunDay = (int) $this->Time->getTimeObjectUTC($time)->toUnixString(); $this->Cronjob->CronjobLogs->save( $this->Cronjob->CronjobLogs->newEntity( [ @@ -241,7 +241,7 @@ public function testPreviousCronjobLogRunning() public function testCronjobNotYetExecutedWithinTimeInterval() { $time = '2018-10-23 22:30:01'; - $this->Cronjob->cronjobRunDay = $this->Time->getTimeObjectUTC($time)->toUnixString(); + $this->Cronjob->cronjobRunDay = (int) $this->Time->getTimeObjectUTC($time)->toUnixString(); $this->Cronjob->CronjobLogs->save( $this->Cronjob->CronjobLogs->newEntity( [ @@ -259,7 +259,7 @@ public function testCronjobNotYetExecutedWithinTimeInterval() public function testCronjobAlreadyExecutedWithinTimeInterval() { - $this->Cronjob->cronjobRunDay = $this->Time->getTimeObjectUTC('2018-10-23 22:29:59')->toUnixString(); + $this->Cronjob->cronjobRunDay = (int) $this->Time->getTimeObjectUTC('2018-10-23 22:29:59')->toUnixString(); $this->Cronjob->CronjobLogs->save( $this->Cronjob->CronjobLogs->newEntity( [ @@ -276,7 +276,7 @@ public function testCronjobAlreadyExecutedWithinTimeInterval() public function testCronjobWithInvalidParameterException() { $time = '2018-10-23 22:31:00'; - $this->Cronjob->cronjobRunDay = $this->Time->getTimeObjectUTC($time)->toUnixString(); + $this->Cronjob->cronjobRunDay = (int) $this->Time->getTimeObjectUTC($time)->toUnixString(); $this->Cronjob->save( $this->Cronjob->patchEntity( $this->Cronjob->get(1), @@ -293,7 +293,7 @@ public function testCronjobWithInvalidParameterException() public function testCronjobAlreadyExecutedOnCurrentDay() { - $this->Cronjob->cronjobRunDay = $this->Time->getTimeObjectUTC('2018-10-25 22:30:02')->toUnixString(); + $this->Cronjob->cronjobRunDay = (int) $this->Time->getTimeObjectUTC('2018-10-25 22:30:02')->toUnixString(); $this->Cronjob->CronjobLogs->save( $this->Cronjob->CronjobLogs->newEntity( [ @@ -309,7 +309,7 @@ public function testCronjobAlreadyExecutedOnCurrentDay() public function testRunMonthlyBeforeNotBeforeTime() { - $this->Cronjob->cronjobRunDay = $this->Time->getTimeObjectUTC('2018-10-11 07:29:00')->toUnixString(); + $this->Cronjob->cronjobRunDay = (int) $this->Time->getTimeObjectUTC('2018-10-11 07:29:00')->toUnixString(); $this->Cronjob->save( $this->Cronjob->patchEntity( $this->Cronjob->get(1), @@ -325,7 +325,7 @@ public function testRunMonthlyBeforeNotBeforeTime() public function testRunMonthlyAfterNotBeforeTime() { $time = '2018-10-11 07:31:00'; - $this->Cronjob->cronjobRunDay = $this->Time->getTimeObjectUTC($time)->toUnixString(); + $this->Cronjob->cronjobRunDay = (int) $this->Time->getTimeObjectUTC($time)->toUnixString(); $this->Cronjob->save( $this->Cronjob->patchEntity( $this->Cronjob->get(1), @@ -342,7 +342,7 @@ public function testRunMonthlyAfterNotBeforeTime() public function testRunMonthlyLastDayOfMonthAfterNotBeforeTime() { $time = '2018-11-30 07:31:00'; - $this->Cronjob->cronjobRunDay = $this->Time->getTimeObjectUTC($time)->toUnixString(); + $this->Cronjob->cronjobRunDay = (int) $this->Time->getTimeObjectUTC($time)->toUnixString(); $this->Cronjob->updateAll( [ 'active' => APP_OFF, From 7d52b115dc9c1acacf98a68166cea0cb8f716700 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 18 Oct 2022 16:33:02 +0200 Subject: [PATCH 207/646] use correct type --- .../Admin/src/Controller/OrderDetailsController.php | 4 ++-- .../src/Controller/PaymentsControllerTest.php | 12 ++++++------ src/Model/Table/PaymentsTable.php | 5 ++++- src/View/Helper/MyNumberHelper.php | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/plugins/Admin/src/Controller/OrderDetailsController.php b/plugins/Admin/src/Controller/OrderDetailsController.php index d724e431e7..070aa5170d 100644 --- a/plugins/Admin/src/Controller/OrderDetailsController.php +++ b/plugins/Admin/src/Controller/OrderDetailsController.php @@ -395,11 +395,11 @@ public function editPurchasePrice($orderDetailId) $this->Product = $this->getTableLocator()->get('Products'); $grossPrice = $this->Product->getGrossPrice( - round($orderDetail->order_detail_purchase_price->total_price_tax_excl, 2), + round((float) $orderDetail->order_detail_purchase_price->total_price_tax_excl, 2), $orderDetail->order_detail_purchase_price->tax_rate, ); - $unitPriceExcl = round($orderDetail->order_detail_purchase_price->total_price_tax_excl, 2) / $orderDetail->product_amount; + $unitPriceExcl = round((float) $orderDetail->order_detail_purchase_price->total_price_tax_excl, 2) / $orderDetail->product_amount; $unitTaxAmount = $this->Product->getUnitTax( $grossPrice, $unitPriceExcl, diff --git a/plugins/Admin/tests/TestCase/src/Controller/PaymentsControllerTest.php b/plugins/Admin/tests/TestCase/src/Controller/PaymentsControllerTest.php index 0a7cd3cb17..1203508913 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/PaymentsControllerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/PaymentsControllerTest.php @@ -43,21 +43,21 @@ public function testAddPaymentLoggedOut() $this->assertResponseCode(403); } - public function testAddPaymentParameterPriceOk() + public function testAddPaymentParameterAmountOk() { $this->loginAsCustomer(); $jsonDecodedContent = $this->addPayment(Configure::read('test.customerId'), '65,03', 'product'); $this->assertEquals(65.03, $jsonDecodedContent->amount); } - public function testAddPaymentParameterPriceWithWhitespaceOk() + public function testAddPaymentParameterAmountWithWhitespaceOk() { $this->loginAsCustomer(); $jsonDecodedContent = $this->addPayment(Configure::read('test.customerId'), ' 24,88 ', 'product'); $this->assertEquals(24.88, $jsonDecodedContent->amount); } - public function testAddPaymentParameterPriceNegative() + public function testAddPaymentParameterAmountNegative() { $this->loginAsCustomer(); $jsonDecodedContent = $this->addPayment(Configure::read('test.customerId'), '-10', 'product'); @@ -65,7 +65,7 @@ public function testAddPaymentParameterPriceNegative() $this->assertRegExpWithUnquotedString('Der Betrag muss größer als 0 sein', $jsonDecodedContent->msg); } - public function testAddPaymentParameterPriceAlmostZero() + public function testAddPaymentParameterAmountAlmostZero() { $this->loginAsCustomer(); $jsonDecodedContent = $this->addPayment(Configure::read('test.customerId'), '0,003', 'product'); @@ -73,7 +73,7 @@ public function testAddPaymentParameterPriceAlmostZero() $this->assertRegExpWithUnquotedString('Der Betrag muss größer als 0 sein', $jsonDecodedContent->msg); } - public function testAddPaymentParameterPriceZero() + public function testAddPaymentParameterAmountZero() { $this->loginAsCustomer(); $jsonDecodedContent = $this->addPayment(Configure::read('test.customerId'), '0', 'product'); @@ -81,7 +81,7 @@ public function testAddPaymentParameterPriceZero() $this->assertRegExpWithUnquotedString('Der Betrag muss größer als 0 sein', $jsonDecodedContent->msg); } - public function testAddPaymentParameterPriceWrongNumber() + public function testAddPaymentParameterAmountWrongNumber() { $this->loginAsCustomer(); $jsonDecodedContent = $this->addPayment(Configure::read('test.customerId'), '10,--', 'product'); diff --git a/src/Model/Table/PaymentsTable.php b/src/Model/Table/PaymentsTable.php index e663cf825f..c524449f22 100644 --- a/src/Model/Table/PaymentsTable.php +++ b/src/Model/Table/PaymentsTable.php @@ -57,8 +57,11 @@ public function validationAdd(Validator $validator) $validator->allowEmptyDate('date_add'); $validator->add('date_add', 'allowed-only-today-or-before', [ 'rule' => function ($value, $context) { + if ($value == 0) { + return true; + } $formattedValue = date(Configure::read('DateFormat.DatabaseAlt'), strtotime($value)); - if ($formattedValue >Configure::read('app.timeHelper')->getCurrentDateForDatabase()) { + if ($formattedValue > Configure::read('app.timeHelper')->getCurrentDateForDatabase()) { return false; } return true; diff --git a/src/View/Helper/MyNumberHelper.php b/src/View/Helper/MyNumberHelper.php index 81415e472b..b111e29585 100644 --- a/src/View/Helper/MyNumberHelper.php +++ b/src/View/Helper/MyNumberHelper.php @@ -107,7 +107,7 @@ public function formatAsDecimal($amount, $decimals = 2, $removeTrailingZeros = f public function parseFloatRespectingLocale($double) { if (I18n::getLocale() == 'de_DE') { - $double = str_replace(',', '.', $double); // then replace decimal places + $double = str_replace(',', '.', (string) $double); // then replace decimal places } if (!is_numeric($double)) { return false; From d6baabe343adc546b53379d8111b5b8e5b31fd81 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 18 Oct 2022 18:35:42 +0200 Subject: [PATCH 208/646] missing comma --- plugins/Admin/src/Controller/ProductsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Admin/src/Controller/ProductsController.php b/plugins/Admin/src/Controller/ProductsController.php index cd2d879e06..61ed38e707 100644 --- a/plugins/Admin/src/Controller/ProductsController.php +++ b/plugins/Admin/src/Controller/ProductsController.php @@ -711,7 +711,7 @@ public function editDeliveryRhythm() $product2update = [ 'delivery_rhythm_count' => $deliveryRhythmCount, - 'delivery_rhythm_type' => $deliveryRhythmType + 'delivery_rhythm_type' => $deliveryRhythmType, ]; $isFirstDeliveryDayMandatory = in_array($deliveryRhythmTypeCombined, ['0-individual', '2-week', '4-week']); From 9d12a1201da903a658f3b5ed88c38d8a60240e0e Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 18 Oct 2022 18:36:09 +0200 Subject: [PATCH 209/646] define types --- tests/TestCase/AppCakeTestCase.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/TestCase/AppCakeTestCase.php b/tests/TestCase/AppCakeTestCase.php index 08b33b277a..6b0fee7b6b 100644 --- a/tests/TestCase/AppCakeTestCase.php +++ b/tests/TestCase/AppCakeTestCase.php @@ -324,7 +324,14 @@ protected function changeProductPrice($productId, $price, $pricePerUnitEnabled = return $this->getJsonDecodedContent(); } - protected function changeProductDeliveryRhythm($productId, $deliveryRhythmType, $deliveryRhythmFirstDeliveryDay = '', $deliveryRhythmOrderPossibleUntil = '', $deliveryRhythmSendOrderListWeekday = '', $deliveryRhythmSendOrderListDay = '') + protected function changeProductDeliveryRhythm( + int $productId, + string $deliveryRhythmType, + string $deliveryRhythmFirstDeliveryDay = '', + string $deliveryRhythmOrderPossibleUntil = '', + string $deliveryRhythmSendOrderListWeekday = '', + string $deliveryRhythmSendOrderListDay = '' + ) { $this->ajaxPost('/admin/products/editDeliveryRhythm', [ 'productIds' => [$productId], From aed10fba6f6b56c7cadce3dd80211776ca4359ff Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Tue, 18 Oct 2022 18:55:51 +0200 Subject: [PATCH 210/646] correct types --- .../tests/TestCase/src/Controller/ProductsControllerTest.php | 4 ++-- .../tests/TestCase/src/Model/Table/OrderDetailsTableTest.php | 4 ++-- .../tests/TestCase/src/Controller/ApiControllerTest.php | 2 +- src/View/Helper/MyTimeHelper.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php b/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php index 053b4da928..7dd98ba221 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php @@ -409,7 +409,7 @@ public function testEditDeliveryRhythmOkIndividual() public function testEditDeliveryRhythmIndividualInvalidSendOrderListDay() { $this->loginAsSuperadmin(); - $response = $this->changeProductDeliveryRhythm(346, '0-individual', '2018-08-31', '2018-08-28', 2, '2019-01-01'); + $response = $this->changeProductDeliveryRhythm(346, '0-individual', '2018-08-31', '2018-08-28', '2', '2019-01-01'); $this->assertRegExpWithUnquotedString('Das Datum für den Bestellisten-Versand muss zwischen Bestellbar-bis-Datum und dem Liefertag liegen.', $response->msg); $this->assertJsonError(); } @@ -433,7 +433,7 @@ public function testEditDeliveryRhythmOkWithDatabaseAsserts() public function testEditDeliveryRhythmWeeklyInvalidSendOrderListsWeekday() { $this->loginAsSuperadmin(); - $response = $this->changeProductDeliveryRhythm(346, '1-week', '', '', 15); + $response = $this->changeProductDeliveryRhythm(346, '1-week', '', '', '15'); $this->assertRegExpWithUnquotedString('Bitte gib eine Zahl zwischen 0 und 6 an.', $response->msg); $this->assertJsonError(); } diff --git a/plugins/Admin/tests/TestCase/src/Model/Table/OrderDetailsTableTest.php b/plugins/Admin/tests/TestCase/src/Model/Table/OrderDetailsTableTest.php index 4cf4a58ba2..660f1721a5 100644 --- a/plugins/Admin/tests/TestCase/src/Model/Table/OrderDetailsTableTest.php +++ b/plugins/Admin/tests/TestCase/src/Model/Table/OrderDetailsTableTest.php @@ -53,7 +53,7 @@ private function assertGetDepositTax($gross, $amount, $expected) { $result = $this->OrderDetail->getDepositTax($gross, $amount); $result = number_format($result, 2); - $expected = number_format($result, 2); + $expected = number_format($expected, 2); $this->assertEquals($result, $expected); } @@ -61,7 +61,7 @@ private function assertGetDepositNet($gross, $amount, $expected) { $result = $this->OrderDetail->getDepositNet($gross, $amount); $result = number_format($result, 2); - $expected = number_format($result, 2); + $expected = number_format($expected, 2); $this->assertEquals($result, $expected); } diff --git a/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php b/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php index 4b4f5bd8b8..be9b138dea 100644 --- a/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php +++ b/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php @@ -68,7 +68,7 @@ public function testGetProductsAsManufacturer() '2020-01-17', '"{{serverName}}"', ], - $this->_response + $this->_response->getBody()->__toString(), ); $this->assertSameAsFile('products-for-demo-vegetable-manufacturer.json', $preparedResponse); diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index 60052889d0..7e35a44cec 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -390,7 +390,7 @@ public function formatToDateShort($dbString) public function formatToDbFormatDate($dateString) { $timestamp = strtotime($dateString); - $result = date(Configure::read('DateFormat.DatabaseAlt'), $timestamp); + $result = date(Configure::read('DateFormat.DatabaseAlt'), (int) $timestamp); return $result; } From bc77d5998583a97e2917ae07c91c9c70dc61012d Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 19 Oct 2022 07:44:34 +0200 Subject: [PATCH 211/646] bold table heading --- webroot/css/table.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webroot/css/table.css b/webroot/css/table.css index 72683aaa4a..86ad682e4a 100644 --- a/webroot/css/table.css +++ b/webroot/css/table.css @@ -82,7 +82,7 @@ table.list td.slim { line-height: 15px; } table.list th { - font-weight: normal; + font-weight: 600; position: sticky; position: -webkit-sticky; top: 44px; /* overriden in admin.initStickyTableHeader */ From 4602e6683cb10f6197e37656c478c36c236f5dae Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 19 Oct 2022 07:48:26 +0200 Subject: [PATCH 212/646] strict typing --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94f9e0ec38..a74ea7557e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,8 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe - Die Überschriften aller Tabellen im Admin-Bereich bleiben jetzt beim Scrollen sichtbar (nicht in iOS ). [PR#888](https://github.com/foodcoopshop/foodcoopshop/pull/888) ### For developers -- New 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) and [Gitpod-Integration](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop). [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) / [PR#879](https://github.com/foodcoopshop/foodcoopshop/pull/879) / / [PR#881](https://github.com/foodcoopshop/foodcoopshop/pull/881) +- New 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) and [Gitpod-Integration](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop). [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) / [PR#879](https://github.com/foodcoopshop/foodcoopshop/pull/879) / [PR#881](https://github.com/foodcoopshop/foodcoopshop/pull/881) +- Enable strict typing in every php file to improve code quality. [I#872](https://github.com/foodcoopshop/foodcoopshop/issues/872) / [PR#893](https://github.com/foodcoopshop/foodcoopshop/pull/893) # v3.5.0 From 9c1c061e5204a329b619fe5b7c7f6bb588550485 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 19 Oct 2022 08:15:49 +0200 Subject: [PATCH 213/646] correct type --- src/Shell/SavedLocalizedJsAsStaticFileShell.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shell/SavedLocalizedJsAsStaticFileShell.php b/src/Shell/SavedLocalizedJsAsStaticFileShell.php index a744affaeb..fcc0b5db9f 100644 --- a/src/Shell/SavedLocalizedJsAsStaticFileShell.php +++ b/src/Shell/SavedLocalizedJsAsStaticFileShell.php @@ -41,7 +41,7 @@ public function main() { $this->get('/js/localized-javascript.js'); $jsFile = new File(WWW_ROOT . '/cache/localized-javascript-static.js'); - $jsFile->write($this->_response); + $jsFile->write($this->_response->getBody()->__toString()); } } From 3074ea14153486555b4865fc28e2fafe6469b3e3 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 19 Oct 2022 09:17:59 +0200 Subject: [PATCH 214/646] remove legacy code --- plugins/Admin/src/Controller/OrderDetailsController.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/Admin/src/Controller/OrderDetailsController.php b/plugins/Admin/src/Controller/OrderDetailsController.php index 070aa5170d..b020394b80 100644 --- a/plugins/Admin/src/Controller/OrderDetailsController.php +++ b/plugins/Admin/src/Controller/OrderDetailsController.php @@ -813,12 +813,8 @@ private function prepareGroupedOrderDetails($orderDetails, $groupBy) $productName = []; $customerName = []; foreach ($orderDetails as $orderDetail) { - $orderDetail->quantityInUnitsNotYetChanged = false; + $orderDetail->quantityInUnitsNotYetChanged = true; if (!empty($orderDetail->order_detail_unit)) { - // quantity comparison can be removed in v4. it was replaced by mark_as_saved in v3.1. default value needs to be set to true then - if (round($orderDetail->order_detail_unit->product_quantity_in_units, 3) == round($orderDetail->order_detail_unit->quantity_in_units * $orderDetail->product_amount, 3)) { - $orderDetail->quantityInUnitsNotYetChanged = true; - } if ($orderDetail->order_detail_unit->mark_as_saved) { $orderDetail->quantityInUnitsNotYetChanged = false; } From 122883d53494679a9833404bcb4d922db67dca11 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 19 Oct 2022 09:32:58 +0200 Subject: [PATCH 215/646] correct type --- .../Admin/src/Controller/OrderDetailsController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/Admin/src/Controller/OrderDetailsController.php b/plugins/Admin/src/Controller/OrderDetailsController.php index b020394b80..71d996b69a 100644 --- a/plugins/Admin/src/Controller/OrderDetailsController.php +++ b/plugins/Admin/src/Controller/OrderDetailsController.php @@ -371,7 +371,7 @@ public function editPurchasePrice($orderDetailId) } if (empty($this->getRequest()->getData())) { - $orderDetail->order_detail_purchase_price->total_price_tax_excl = round($orderDetail->order_detail_purchase_price->total_price_tax_excl, 2); + $orderDetail->order_detail_purchase_price->total_price_tax_excl = round((float) $orderDetail->order_detail_purchase_price->total_price_tax_excl, 2); $this->set('orderDetail', $orderDetail); return; } @@ -516,8 +516,8 @@ public function profit() foreach($orderDetails as $orderDetail) { $orderDetails[$i]->purchase_price_ok = false; if (!empty($orderDetail->order_detail_purchase_price)) { - $roundedPurchasePrice = round($orderDetail->order_detail_purchase_price->total_price_tax_excl, 2); - $roundedSellingPrice = round($orderDetail->total_price_tax_excl, 2); + $roundedPurchasePrice = round((float) $orderDetail->order_detail_purchase_price->total_price_tax_excl, 2); + $roundedSellingPrice = round((float) $orderDetail->total_price_tax_excl, 2); $roundedProfit = round($roundedSellingPrice - $roundedPurchasePrice, 2); if ($roundedPurchasePrice >= 0) { $orderDetails[$i]->purchase_price_ok = true; @@ -1082,7 +1082,7 @@ public function editProductQuantity() $objectOrderDetailUnit = clone $oldOrderDetail->order_detail_unit; if (!$doNotChangePrice) { - $newProductPrice = round($oldOrderDetail->order_detail_unit->price_incl_per_unit / $oldOrderDetail->order_detail_unit->unit_amount * $productQuantity, 2); + $newProductPrice = round((float) $oldOrderDetail->order_detail_unit->price_incl_per_unit / $oldOrderDetail->order_detail_unit->unit_amount * $productQuantity, 2); if ($oldOrderDetail->order_detail_unit->product_quantity_in_units > 0) { $toleranceFactor = 100; $oldToNewQuantityRelation = $productQuantity / $oldOrderDetail->order_detail_unit->product_quantity_in_units; @@ -1100,7 +1100,7 @@ public function editProductQuantity() } } if (!empty($oldOrderDetail->order_detail_purchase_price)) { - $productPurchasePrice = round($oldOrderDetail->order_detail_unit->purchase_price_incl_per_unit / $oldOrderDetail->order_detail_unit->unit_amount * $productQuantity, 2); + $productPurchasePrice = round((float) $oldOrderDetail->order_detail_unit->purchase_price_incl_per_unit / $oldOrderDetail->order_detail_unit->unit_amount * $productQuantity, 2); $this->changeOrderDetailPurchasePrice($oldOrderDetail->order_detail_purchase_price, $productPurchasePrice, $object->product_amount); } $newOrderDetail = $this->changeOrderDetailPriceDepositTax($object, $newProductPrice, $object->product_amount); From a467deaddc0780e962a4599beb246eb26ea6c51b Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 19 Oct 2022 09:40:12 +0200 Subject: [PATCH 216/646] change quantity fix --- plugins/Admin/src/Controller/OrderDetailsController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Admin/src/Controller/OrderDetailsController.php b/plugins/Admin/src/Controller/OrderDetailsController.php index 71d996b69a..5cfdc0c33e 100644 --- a/plugins/Admin/src/Controller/OrderDetailsController.php +++ b/plugins/Admin/src/Controller/OrderDetailsController.php @@ -813,8 +813,9 @@ private function prepareGroupedOrderDetails($orderDetails, $groupBy) $productName = []; $customerName = []; foreach ($orderDetails as $orderDetail) { - $orderDetail->quantityInUnitsNotYetChanged = true; + $orderDetail->quantityInUnitsNotYetChanged = false; if (!empty($orderDetail->order_detail_unit)) { + $orderDetail->quantityInUnitsNotYetChanged = true; if ($orderDetail->order_detail_unit->mark_as_saved) { $orderDetail->quantityInUnitsNotYetChanged = false; } From e618dfaff767e906be9d047de41d4f0789c9999a Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 19 Oct 2022 11:57:36 +0200 Subject: [PATCH 217/646] action log cannot handle productAttributeIds, use productId instead --- plugins/Admin/src/Controller/ProductsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Admin/src/Controller/ProductsController.php b/plugins/Admin/src/Controller/ProductsController.php index 61ed38e707..f7568a0b53 100644 --- a/plugins/Admin/src/Controller/ProductsController.php +++ b/plugins/Admin/src/Controller/ProductsController.php @@ -528,7 +528,7 @@ public function editProductAttribute() '' . $oldProduct->name . '', '' . $oldProduct->manufacturer->name . '', ]); - $this->ActionLog->customSave('product_attribute_deleted', $this->AppAuth->getUserId(), $productAttributeId, 'products', $actionLogMessage); + $this->ActionLog->customSave('product_attribute_deleted', $this->AppAuth->getUserId(), $productId, 'products', $actionLogMessage); $this->getRequest()->getSession()->write('highlightedRowId', $productId); } else { try { @@ -554,7 +554,7 @@ public function editProductAttribute() '' . $oldProduct->name . '', '' . $oldProduct->manufacturer->name . '', ]); - $this->ActionLog->customSave('product_attribute_changed', $this->AppAuth->getUserId(), $productAttributeId, 'products', $actionLogMessage); + $this->ActionLog->customSave('product_attribute_changed', $this->AppAuth->getUserId(), $productId, 'products', $actionLogMessage); $this->getRequest()->getSession()->write('highlightedRowId', $productId . '-' . $productAttributeId); } $this->Flash->success($actionLogMessage); From 829d8bfb63a2fa0a33699ad274a42c316d11edc0 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 19 Oct 2022 18:10:57 +0200 Subject: [PATCH 218/646] hello cash api adaptions: error message was changed --- src/Lib/HelloCash/HelloCash.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Lib/HelloCash/HelloCash.php b/src/Lib/HelloCash/HelloCash.php index c3101d3ab3..f849d94dd4 100644 --- a/src/Lib/HelloCash/HelloCash.php +++ b/src/Lib/HelloCash/HelloCash.php @@ -349,7 +349,7 @@ protected function createOrUpdateUser($customerId) $helloCashUser = $this->decodeApiResponseAndCheckForErrors($response); // check if associated user_id_registrierkasse is still available within hello cash) - if ($helloCashUser != 'User not found') { + if (!empty($helloCashUser->user_id)) { $data = array_merge($data, [ 'user_id' => $customer->user_id_registrierkasse, ]); @@ -387,9 +387,10 @@ protected function decodeApiResponseAndCheckForErrors($response) $decodedResponse = json_decode($response->getStringBody()); - // An error occurred: Invalid Basic authentication: Benutzername oder Passwort falsch if (!empty($decodedResponse->error)) { - throw new HelloCashApiException($decodedResponse->error); + if ($decodedResponse->error == 'An error occurred: Invalid Basic authentication: Benutzername oder Passwort falsch') { + throw new HelloCashApiException($decodedResponse->error); + } } if ($decodedResponse === 'An Error occurred') { From 85be3ce20ffbd326814e527c20c3853df29f9f26 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Fri, 21 Oct 2022 12:57:24 +0200 Subject: [PATCH 219/646] fixed wrong types --- plugins/Admin/src/Controller/PaymentsController.php | 4 +++- tests/TestCase/src/Controller/PagesControllerTest.php | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/Admin/src/Controller/PaymentsController.php b/plugins/Admin/src/Controller/PaymentsController.php index 475c0273c2..f6cf76d791 100644 --- a/plugins/Admin/src/Controller/PaymentsController.php +++ b/plugins/Admin/src/Controller/PaymentsController.php @@ -593,8 +593,10 @@ private function preparePayments() if (! empty($orderDetailsGroupedByMonth)) { foreach ($orderDetailsGroupedByMonth as $orderDetail) { $monthAndYear = explode('-', $orderDetail['MonthAndYear']); + $monthAndYear[0] = (int) $monthAndYear[0]; + $monthAndYear[1] = (int) $monthAndYear[1]; $frozenDateFrom = FrozenDate::create($monthAndYear[0], $monthAndYear[1], 1); - $lastDayOfMonth = Configure::read('app.timeHelper')->getLastDayOfGivenMonth($orderDetail['MonthAndYear']); + $lastDayOfMonth = (int) Configure::read('app.timeHelper')->getLastDayOfGivenMonth($orderDetail['MonthAndYear']); $frozenDateTo = FrozenDate::create($monthAndYear[0], $monthAndYear[1], $lastDayOfMonth); $payments[] = [ 'dateRaw' => $frozenDateFrom, diff --git a/tests/TestCase/src/Controller/PagesControllerTest.php b/tests/TestCase/src/Controller/PagesControllerTest.php index 06e9752981..4d53b01ee6 100644 --- a/tests/TestCase/src/Controller/PagesControllerTest.php +++ b/tests/TestCase/src/Controller/PagesControllerTest.php @@ -85,6 +85,7 @@ public function testAllSuperadminUrls() $this->Slug->getReport('product'), $this->Slug->getReport('payback'), $this->Slug->getReport('deposit'), + $this->Slug->getMyCreditBalance(), $this->Slug->getPaymentEdit(1), $this->Slug->getBlogPostListAdmin(), $this->Slug->getBlogPostAdd(), From 68ebe2a57021a357d6a5bc0eb4e575956ad992a7 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Fri, 21 Oct 2022 13:10:00 +0200 Subject: [PATCH 220/646] show correct spinner for add-to-cart-button, even if logged out --- templates/element/cart.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/element/cart.php b/templates/element/cart.php index bd273f6396..281ceab0fb 100644 --- a/templates/element/cart.php +++ b/templates/element/cart.php @@ -17,14 +17,14 @@ use Cake\Core\Configure; -if (!$appAuth->user() || $appAuth->isManufacturer()) { - return; -} - $this->element('addScript', ['script' => Configure::read('app.jsNamespace').".Cart.setCartButtonIcon('".$cartButtonIcon."');" ]); +if (!$appAuth->user() || $appAuth->isManufacturer()) { + return; +} + if ($appAuth->Cart->getProducts() !== null) { $this->element('addScript', ['script' => Configure::read('app.jsNamespace').".Cart.initCartProducts('".addslashes(json_encode($appAuth->Cart->getProducts()))."');" From b8bfd30d914f200857b07b42d6fd1d5f2243caed Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 23 Oct 2022 19:47:32 +0200 Subject: [PATCH 221/646] permissions --- devtools/installation/init-database.sh | 0 devtools/installation/set-permissions.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 devtools/installation/init-database.sh mode change 100644 => 100755 devtools/installation/set-permissions.sh diff --git a/devtools/installation/init-database.sh b/devtools/installation/init-database.sh old mode 100644 new mode 100755 diff --git a/devtools/installation/set-permissions.sh b/devtools/installation/set-permissions.sh old mode 100644 new mode 100755 From 36babdc1894a207706aa4674da859e1350fbb590 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Wed, 19 Oct 2022 10:57:42 +0200 Subject: [PATCH 222/646] access control --- plugins/Admin/src/Controller/ManufacturersController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/Admin/src/Controller/ManufacturersController.php b/plugins/Admin/src/Controller/ManufacturersController.php index e866393605..805acfd2fc 100644 --- a/plugins/Admin/src/Controller/ManufacturersController.php +++ b/plugins/Admin/src/Controller/ManufacturersController.php @@ -46,6 +46,8 @@ public function isAuthorized($user) break; case 'edit': case 'editOptions': + case 'getOrderListByProduct': + case 'getOrderListByCustomer': return $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin(); break; case 'getDeliveryNote': From 0efae736160c4b34f6e1cac092953f009cb9c73f Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 23 Oct 2022 19:49:07 +0200 Subject: [PATCH 223/646] permissions --- devtools/installation/init-database.sh | 0 devtools/installation/set-permissions.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 devtools/installation/init-database.sh mode change 100755 => 100644 devtools/installation/set-permissions.sh diff --git a/devtools/installation/init-database.sh b/devtools/installation/init-database.sh old mode 100755 new mode 100644 diff --git a/devtools/installation/set-permissions.sh b/devtools/installation/set-permissions.sh old mode 100755 new mode 100644 From b41ae883ac92d4342b3b7745038d3cad5abcab63 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 23 Oct 2022 19:49:16 +0200 Subject: [PATCH 224/646] access control --- plugins/Admin/src/Controller/ManufacturersController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/Admin/src/Controller/ManufacturersController.php b/plugins/Admin/src/Controller/ManufacturersController.php index 805acfd2fc..c366394a13 100644 --- a/plugins/Admin/src/Controller/ManufacturersController.php +++ b/plugins/Admin/src/Controller/ManufacturersController.php @@ -48,6 +48,7 @@ public function isAuthorized($user) case 'editOptions': case 'getOrderListByProduct': case 'getOrderListByCustomer': + case 'getInvoice': return $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin(); break; case 'getDeliveryNote': From 21815cfd5689660e0fcbfe2ffc69d1166eec31cc Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Sun, 23 Oct 2022 19:49:48 +0200 Subject: [PATCH 225/646] code cleaning --- plugins/Admin/src/Controller/CronjobsController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/Admin/src/Controller/CronjobsController.php b/plugins/Admin/src/Controller/CronjobsController.php index c301dd25da..0a1f1f7b5a 100644 --- a/plugins/Admin/src/Controller/CronjobsController.php +++ b/plugins/Admin/src/Controller/CronjobsController.php @@ -3,7 +3,6 @@ namespace Admin\Controller; -use Cake\Core\Configure; use Cake\Http\Exception\NotFoundException; use Cake\ORM\Query; From 317ba6907d7fecf111e81d575b9fd6de359a996a Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 24 Oct 2022 07:14:21 +0200 Subject: [PATCH 226/646] fix if cart contained products with delivery-rhythm-triggered-delivery-break --- src/Model/Table/CartsTable.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Model/Table/CartsTable.php b/src/Model/Table/CartsTable.php index 8d46183431..67de91490a 100644 --- a/src/Model/Table/CartsTable.php +++ b/src/Model/Table/CartsTable.php @@ -189,8 +189,13 @@ public function getCart($appAuth, $cartType): array $productData['manufacturerLink'] = $manufacturerLink; $nextDeliveryDay = DeliveryRhythm::getNextDeliveryDayForProduct($cartProduct->product, $appAuth); - $nextDeliveryDay = strtotime($nextDeliveryDay); - $productData['nextDeliveryDay'] = Configure::read('app.timeHelper')->getDateFormattedWithWeekday($nextDeliveryDay); + if ($nextDeliveryDay == 'delivery-rhythm-triggered-delivery-break') { + $dateFormattedWithWeekday = __('Delivery_break'); + } else { + $nextDeliveryDay = strtotime($nextDeliveryDay); + $dateFormattedWithWeekday = Configure::read('app.timeHelper')->getDateFormattedWithWeekday($nextDeliveryDay); + } + $productData['nextDeliveryDay'] = $dateFormattedWithWeekday; $preparedCart['CartProducts'][] = $productData; From 0960f62037d4b1efa861a3e2b3881ed92d3062af Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 24 Oct 2022 10:18:50 +0200 Subject: [PATCH 227/646] changed db-dev-data volume --- config/docker-dev/database-dev/data/.gitignore | 2 -- docker-compose.yml | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 config/docker-dev/database-dev/data/.gitignore diff --git a/config/docker-dev/database-dev/data/.gitignore b/config/docker-dev/database-dev/data/.gitignore deleted file mode 100644 index c96a04f008..0000000000 --- a/config/docker-dev/database-dev/data/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index e0f316d6dd..304938e160 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,7 +35,7 @@ services: MYSQL_ALLOW_EMPTY_PASSWORD: true MYSQL_TCP_PORT: 3310 volumes: - - ./config/docker-dev/database-dev/data:/var/lib/mysql + - db-dev-data:/var/lib/mysql networks: - fcs @@ -87,5 +87,8 @@ services: networks: - fcs +volumes: + db-dev-data: + networks: fcs: From 150893145dc11d7692435691e3327009d1891706 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 24 Oct 2022 16:09:54 +0200 Subject: [PATCH 228/646] not needed --- docker-compose.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 304938e160..d0c49a7537 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,16 +18,15 @@ services: - "8001:80" depends_on: - database-dev - - database-test networks: - fcs - + database-dev: image: mysql:8.0 container_name: fcs-database-dev restart: always ports: - - '3310:3306' + - '3310:3306' environment: MYSQL_USER: user MYSQL_PASSWORD: secret @@ -38,14 +37,14 @@ services: - db-dev-data:/var/lib/mysql networks: - fcs - + database-test: image: mysql:8.0 container_name: fcs-database-test restart: always tmpfs: /var/lib/mysql:exec,size=1G #smaller size (eg. 256M) lead to failing tests ports: - - '3311:3306' + - '3311:3306' environment: MYSQL_USER: user MYSQL_PASSWORD: secret @@ -57,12 +56,12 @@ services: phpmyadmin-dev: depends_on: - - database-dev + - database-dev image: phpmyadmin/phpmyadmin container_name: fcs-phpmyadmin-dev restart: always ports: - - '8080:80' + - '8080:80' environment: PMA_HOST: database-dev PMA_USER: root @@ -70,15 +69,15 @@ services: UPLOAD_LIMIT: 300M networks: - fcs - + phpmyadmin-test: depends_on: - - database-test + - database-test image: phpmyadmin/phpmyadmin container_name: fcs-phpmyadmin-test restart: always ports: - - '8081:80' + - '8081:80' environment: PMA_HOST: database-test PMA_USER: root @@ -90,5 +89,6 @@ services: volumes: db-dev-data: + networks: fcs: From 64aab87bd94f0ca413144aed5c288e091c954a14 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 24 Oct 2022 16:30:19 +0200 Subject: [PATCH 229/646] database-test --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index d0c49a7537..e21db02104 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,6 +18,7 @@ services: - "8001:80" depends_on: - database-dev + - database-test networks: - fcs From 23e3705b4e51cbe95a6cc6a3c5f89b05944595d1 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 24 Oct 2022 17:07:20 +0200 Subject: [PATCH 230/646] type fix --- plugins/Admin/templates/Cronjobs/index.php | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/plugins/Admin/templates/Cronjobs/index.php b/plugins/Admin/templates/Cronjobs/index.php index cd8d4ee3bf..e8f60fc630 100644 --- a/plugins/Admin/templates/Cronjobs/index.php +++ b/plugins/Admin/templates/Cronjobs/index.php @@ -1,4 +1,5 @@ element('addScript', [ 'script' => +$this->element('addScript', [ + 'script' => Configure::read('app.jsNamespace') . ".Admin.init(); " . - Configure::read('app.jsNamespace') . ".Admin.selectMainMenuAdmin('".__d('admin', 'Website_administration')."', '".__d('admin', 'Configurations')."'); + Configure::read('app.jsNamespace') . ".Admin.selectMainMenuAdmin('" . __d('admin', 'Website_administration') . "', '" . __d('admin', 'Configurations') . "'); " ]); @@ -31,7 +33,7 @@

element('printIcon'); + echo $this->element('printIcon'); ?>
@@ -59,11 +61,11 @@ $i = 0; foreach ($cronjobs as $cronjob) { - $i ++; + $i++; $rowClass = [ 'data' ]; - if (! $cronjob->active) { + if (!$cronjob->active) { $rowClass[] = 'deactivated'; $rowClass[] = 'line-through'; } @@ -105,7 +107,8 @@ echo $this->Time->getWeekdayName( $this->Time->formatAsWeekday( strtotime('next ' . $cronjob->weekday), // trick to get eg. 6 from Saturday - )); + ) + ); } echo '
' . $i . ' '.__d('admin', '{0,plural,=1{record} other{records}}', $i).'' . $i . ' ' . __d('admin', '{0,plural,=1{record} other{records}}', $i) . '
'; -?> +?> \ No newline at end of file From 1a5976bb6e04cf5e956dede0d62f654592d2b249 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 25 Oct 2022 09:14:54 +0200 Subject: [PATCH 231/646] switch to alpine distro --- config/docker-dev/php-nginx/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/docker-dev/php-nginx/Dockerfile b/config/docker-dev/php-nginx/Dockerfile index d373442279..8f74809d97 100644 --- a/config/docker-dev/php-nginx/Dockerfile +++ b/config/docker-dev/php-nginx/Dockerfile @@ -1,5 +1,5 @@ FROM node:18 AS node -FROM webdevops/php-nginx:8.1 +FROM webdevops/php-nginx:8.1-alpine #https://stackoverflow.com/questions/44447821/how-to-create-a-docker-image-for-php-and-node COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules @@ -7,9 +7,9 @@ COPY --from=node /usr/local/bin/node /usr/local/bin/node RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm +RUN apk update && \ + apk add npm gettext && \ + npm install -g npm-check-updates + #avoid permission error on gitpod on running npm install RUN npm config set cache /var/www/html/tmp --global - -RUN apt-get update && \ - apt-get install gettext-base && apt-get install gettext && \ - npm install -g npm-check-updates From 9569c12bea2d7c71dfcb9c6c16f0eaef271d3da7 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 25 Oct 2022 09:28:47 +0200 Subject: [PATCH 232/646] restructuring docker compose --- config/docker-dev/php-nginx/Dockerfile => Dockerfile | 0 config/docker-dev/php-nginx/php-ini-overrides.ini | 2 -- docker-compose.yml | 7 ++++--- 3 files changed, 4 insertions(+), 5 deletions(-) rename config/docker-dev/php-nginx/Dockerfile => Dockerfile (100%) delete mode 100644 config/docker-dev/php-nginx/php-ini-overrides.ini diff --git a/config/docker-dev/php-nginx/Dockerfile b/Dockerfile similarity index 100% rename from config/docker-dev/php-nginx/Dockerfile rename to Dockerfile diff --git a/config/docker-dev/php-nginx/php-ini-overrides.ini b/config/docker-dev/php-nginx/php-ini-overrides.ini deleted file mode 100644 index cbc3705d75..0000000000 --- a/config/docker-dev/php-nginx/php-ini-overrides.ini +++ /dev/null @@ -1,2 +0,0 @@ -upload_max_filesize = 200M -post_max_size = 200M \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index e21db02104..bffe930d48 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,15 +5,16 @@ version: '3' services: php-nginx: - build: ./config/docker-dev/php-nginx + build: . container_name: fcs-php-nginx restart: always user: ${CURRENT_UID} environment: - - WEB_DOCUMENT_ROOT=/var/www/html/webroot + WEB_DOCUMENT_ROOT: /var/www/html/webroot + PHP_UPLOAD_MAX_FILESIZE: 200M + PHP_POST_MAX_SIZE: 200M volumes: - ./:/var/www/html - - ./config/docker-dev/php-nginx/php-ini-overrides.ini:/usr/local/etc/php/conf.d/99-overrides.ini ports: - "8001:80" depends_on: From 06658e64ef65c25ba4182bde21cb32537a8f65da Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 25 Oct 2022 11:41:40 +0200 Subject: [PATCH 233/646] remove whitespace --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index bffe930d48..9617fb6c57 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -91,6 +91,5 @@ services: volumes: db-dev-data: - networks: fcs: From 8889cc5539bc750ba01873b7b4b503f7720b6035 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 25 Oct 2022 12:25:44 +0200 Subject: [PATCH 234/646] vendor updates --- composer.lock | 55 ++++++++++++++++---------------- webroot/package-lock.json | 66 ++++++++++++++------------------------- webroot/package.json | 4 +-- 3 files changed, 53 insertions(+), 72 deletions(-) diff --git a/composer.lock b/composer.lock index ad96f50c05..4d5555ee92 100644 --- a/composer.lock +++ b/composer.lock @@ -112,16 +112,16 @@ }, { "name": "cakephp/chronos", - "version": "2.3.0", + "version": "2.3.1", "source": { "type": "git", "url": "https://github.com/cakephp/chronos.git", - "reference": "3ecd6e7ae191c676570cd1bed51fd561de4606dd" + "reference": "1075511e200c2333793f4625829e40607a4d1cc9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/chronos/zipball/3ecd6e7ae191c676570cd1bed51fd561de4606dd", - "reference": "3ecd6e7ae191c676570cd1bed51fd561de4606dd", + "url": "https://api.github.com/repos/cakephp/chronos/zipball/1075511e200c2333793f4625829e40607a4d1cc9", + "reference": "1075511e200c2333793f4625829e40607a4d1cc9", "shasum": "" }, "require": { @@ -152,22 +152,21 @@ }, { "name": "The CakePHP Team", - "homepage": "http://cakephp.org" + "homepage": "https://cakephp.org" } ], "description": "A simple API extension for DateTime.", - "homepage": "http://cakephp.org", + "homepage": "https://cakephp.org", "keywords": [ "date", "datetime", "time" ], "support": { - "irc": "irc://irc.freenode.org/cakephp", "issues": "https://github.com/cakephp/chronos/issues", "source": "https://github.com/cakephp/chronos" }, - "time": "2021-10-17T02:44:05+00:00" + "time": "2022-10-21T08:22:45+00:00" }, { "name": "cakephp/migrations", @@ -5132,16 +5131,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.11.0", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "7d1e81213b0c7eb8d5a9f524456cbc2778ed5c65" + "reference": "33aefcdab42900e36366d0feab6206e2dd68f947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/7d1e81213b0c7eb8d5a9f524456cbc2778ed5c65", - "reference": "7d1e81213b0c7eb8d5a9f524456cbc2778ed5c65", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/33aefcdab42900e36366d0feab6206e2dd68f947", + "reference": "33aefcdab42900e36366d0feab6206e2dd68f947", "shasum": "" }, "require": { @@ -5171,22 +5170,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.11.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.13.0" }, - "time": "2022-10-14T13:32:28+00:00" + "time": "2022-10-21T09:57:39+00:00" }, { "name": "phpstan/phpstan", - "version": "1.8.9", + "version": "1.8.11", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2" + "reference": "46e223dd68a620da18855c23046ddb00940b4014" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2", - "reference": "3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/46e223dd68a620da18855c23046ddb00940b4014", + "reference": "46e223dd68a620da18855c23046ddb00940b4014", "shasum": "" }, "require": { @@ -5216,7 +5215,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.8.9" + "source": "https://github.com/phpstan/phpstan/tree/1.8.11" }, "funding": [ { @@ -5232,7 +5231,7 @@ "type": "tidelift" } ], - "time": "2022-10-13T13:40:18+00:00" + "time": "2022-10-24T15:45:13+00:00" }, { "name": "phpunit/php-code-coverage", @@ -6945,28 +6944,28 @@ }, { "name": "slevomat/coding-standard", - "version": "8.6.0", + "version": "8.6.2", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "d4175d8bf1246f4bf8be04ab688fbdc6fed18ece" + "reference": "080f592b16f021a3a8e43d95ca8f57b87ddcf4e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/d4175d8bf1246f4bf8be04ab688fbdc6fed18ece", - "reference": "d4175d8bf1246f4bf8be04ab688fbdc6fed18ece", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/080f592b16f021a3a8e43d95ca8f57b87ddcf4e6", + "reference": "080f592b16f021a3a8e43d95ca8f57b87ddcf4e6", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", "php": "^7.2 || ^8.0", - "phpstan/phpdoc-parser": ">=1.11.0 <1.12.0", + "phpstan/phpdoc-parser": ">=1.11.0 <1.14.0", "squizlabs/php_codesniffer": "^3.7.1" }, "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.10|1.8.9", + "phpstan/phpstan": "1.4.10|1.8.10", "phpstan/phpstan-deprecation-rules": "1.0.0", "phpstan/phpstan-phpunit": "1.0.0|1.1.1", "phpstan/phpstan-strict-rules": "1.4.4", @@ -6994,7 +6993,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.6.0" + "source": "https://github.com/slevomat/coding-standard/tree/8.6.2" }, "funding": [ { @@ -7006,7 +7005,7 @@ "type": "tidelift" } ], - "time": "2022-10-16T10:31:02+00:00" + "time": "2022-10-22T15:42:49+00:00" }, { "name": "squizlabs/php_codesniffer", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index 8e8156bd88..cb106bb67e 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -9,7 +9,7 @@ "license": "AGPL-3.0", "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.4", - "@ericblade/quagga2": "^1.7.5", + "@ericblade/quagga2": "^1.7.6", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.2", @@ -32,7 +32,7 @@ "svelte": "^3.52.0", "swiper": "8.4.4", "tooltipster": "^4.2.8", - "uglify-js": "^3.17.3", + "uglify-js": "^3.17.4", "webrtc-adapter": "^8.2.0" } }, @@ -54,15 +54,13 @@ } }, "node_modules/@ericblade/quagga2": { - "version": "1.7.5", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.5.tgz", - "integrity": "sha512-thdz46VgJah07u3VZ6RLgw/gs5xAkkcxj74+ir1Kb96B7B9IBuU0Ey/7geI20q4woSxcm+1XR24dJbUA7iq8lw==", + "version": "1.7.6", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.6.tgz", + "integrity": "sha512-4+A1AonUwkoy9qr5S+N0z9owCN3lAxjy15Bh6I0Vl/mW8+hhYxhGieHgUq7bGplrwtZEnVyM4vp4b3ZxcCB69g==", "dependencies": { "@babel/polyfill": "^7.12.1", "get-pixels": "^3.3.3", - "gl-mat2": "^1.0.1", - "gl-vec2": "^1.3.0", - "gl-vec3": "^1.1.3", + "gl-matrix": "^3.4.3", "lodash": "^4.17.21", "ndarray": "^1.0.19", "ndarray-linear-interpolate": "^1.0.0" @@ -502,17 +500,10 @@ "assert-plus": "^1.0.0" } }, - "node_modules/gl-mat2": { - "version": "1.0.1", - "integrity": "sha1-FCUFcwpcL+Hp8l2ezj0NbMJxCjA=" - }, - "node_modules/gl-vec2": { - "version": "1.3.0", - "integrity": "sha512-YiqaAuNsheWmUV0Sa8k94kBB0D6RWjwZztyO+trEYS8KzJ6OQB/4686gdrf59wld4hHFIvaxynO3nRxpk1Ij/A==" - }, - "node_modules/gl-vec3": { - "version": "1.1.3", - "integrity": "sha512-jduKUqT0SGH02l8Yl+mV1yVsDfYgQAJyXGxkJQGyxPLHRiW25DwVIRPt6uvhrEMHftJfqhqKthRcyZqNEl9Xdw==" + "node_modules/gl-matrix": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz", + "integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==" }, "node_modules/glob": { "version": "7.2.3", @@ -1081,9 +1072,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "node_modules/uglify-js": { - "version": "3.17.3", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz", - "integrity": "sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==", + "version": "3.17.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", + "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", "bin": { "uglifyjs": "bin/uglifyjs" }, @@ -1158,16 +1149,14 @@ } }, "@ericblade/quagga2": { - "version": "1.7.5", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.5.tgz", - "integrity": "sha512-thdz46VgJah07u3VZ6RLgw/gs5xAkkcxj74+ir1Kb96B7B9IBuU0Ey/7geI20q4woSxcm+1XR24dJbUA7iq8lw==", + "version": "1.7.6", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.6.tgz", + "integrity": "sha512-4+A1AonUwkoy9qr5S+N0z9owCN3lAxjy15Bh6I0Vl/mW8+hhYxhGieHgUq7bGplrwtZEnVyM4vp4b3ZxcCB69g==", "requires": { "@babel/polyfill": "^7.12.1", "fsevents": "2.3.2", "get-pixels": "^3.3.3", - "gl-mat2": "^1.0.1", - "gl-vec2": "^1.3.0", - "gl-vec3": "^1.1.3", + "gl-matrix": "^3.4.3", "lodash": "^4.17.21", "ndarray": "^1.0.19", "ndarray-linear-interpolate": "^1.0.0" @@ -1498,17 +1487,10 @@ "assert-plus": "^1.0.0" } }, - "gl-mat2": { - "version": "1.0.1", - "integrity": "sha1-FCUFcwpcL+Hp8l2ezj0NbMJxCjA=" - }, - "gl-vec2": { - "version": "1.3.0", - "integrity": "sha512-YiqaAuNsheWmUV0Sa8k94kBB0D6RWjwZztyO+trEYS8KzJ6OQB/4686gdrf59wld4hHFIvaxynO3nRxpk1Ij/A==" - }, - "gl-vec3": { - "version": "1.1.3", - "integrity": "sha512-jduKUqT0SGH02l8Yl+mV1yVsDfYgQAJyXGxkJQGyxPLHRiW25DwVIRPt6uvhrEMHftJfqhqKthRcyZqNEl9Xdw==" + "gl-matrix": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz", + "integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==" }, "glob": { "version": "7.2.3", @@ -1941,9 +1923,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "uglify-js": { - "version": "3.17.3", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz", - "integrity": "sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==" + "version": "3.17.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", + "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==" }, "uniq": { "version": "1.0.1", diff --git a/webroot/package.json b/webroot/package.json index 4f2f38809e..3d0bd8ca06 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.4", - "@ericblade/quagga2": "^1.7.5", + "@ericblade/quagga2": "^1.7.6", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.2", @@ -38,7 +38,7 @@ "svelte": "^3.52.0", "swiper": "8.4.4", "tooltipster": "^4.2.8", - "uglify-js": "^3.17.3", + "uglify-js": "^3.17.4", "webrtc-adapter": "^8.2.0" } } From 17e3b54f295cdeec6a81321d6bf818e5a2c0febf Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 26 Oct 2022 20:03:45 +0200 Subject: [PATCH 235/646] fix if float is passed --- src/View/Helper/MyNumberHelper.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/View/Helper/MyNumberHelper.php b/src/View/Helper/MyNumberHelper.php index b111e29585..afba489e8e 100644 --- a/src/View/Helper/MyNumberHelper.php +++ b/src/View/Helper/MyNumberHelper.php @@ -41,7 +41,12 @@ public function getStringAsFloat($string) return -1; } - $float = trim($string); + // sometimes a float is passed to this function, but trim only accepts strings + $float = $string; + if (is_string($string)) { + $float = trim($string); + } + $float = $this->parseFloatRespectingLocale($float); if ($float === false) { From 6b4f0e49edd4d3525c1b68025ed9931eb2f472b8 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 26 Oct 2022 20:17:54 +0200 Subject: [PATCH 236/646] use node-alpine --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8f74809d97..d941f04f30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18 AS node +FROM node:18-alpine AS node FROM webdevops/php-nginx:8.1-alpine #https://stackoverflow.com/questions/44447821/how-to-create-a-docker-image-for-php-and-node From 738ff2b8df9b2547a77fee0b1d8fad30a680975c Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 26 Oct 2022 21:20:00 +0200 Subject: [PATCH 237/646] add alias for php-nginx service --- docker-compose.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9617fb6c57..b82cb656ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,10 @@ services: - database-dev - database-test networks: - - fcs + default: + aliases: + - foodcoopshop.test + fcs: database-dev: image: mysql:8.0 From e2265b0dd4f13802cbe316efcd6fe993806f8be5 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 26 Oct 2022 21:23:13 +0200 Subject: [PATCH 238/646] add comment --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index b82cb656ec..41979f6492 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,6 +23,7 @@ services: networks: default: aliases: + # add "127.0.0.1 foodcoopshop.test" to your hosts file to use http://foodcoopshop.test:8001 - foodcoopshop.test fcs: From 31f43e2a438637181eba98d15727b52ab3afb3d0 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 27 Oct 2022 12:51:52 +0200 Subject: [PATCH 239/646] code cleaning --- plugins/Admin/webroot/js/admin.js | 1 - webroot/js/helper.js | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/plugins/Admin/webroot/js/admin.js b/plugins/Admin/webroot/js/admin.js index 62f342d3b0..32b8607b09 100644 --- a/plugins/Admin/webroot/js/admin.js +++ b/plugins/Admin/webroot/js/admin.js @@ -16,7 +16,6 @@ foodcoopshop.Admin = { init: function () { this.initFilter(); this.improveTableLayout(); - foodcoopshop.Helper.initJqueryUiIcons(); foodcoopshop.Helper.showContent(); foodcoopshop.Helper.initMenu(); foodcoopshop.ModalLogout.init(); diff --git a/webroot/js/helper.js b/webroot/js/helper.js index 1ee62728f2..237eebf0d3 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -783,17 +783,6 @@ foodcoopshop.Helper = { return imageSrc.replace(/\?.{3}/g, ''); }, - initJqueryUiIcons: function () { - $('li.ui-state-default').hover( - function () { - $(this).addClass('ui-state-hover'); - }, - function () { - $(this).removeClass('ui-state-hover'); - } - ); - }, - showContent: function () { // do not use jquery .animate() or .show() here, if loaded in iframe and firefox, this does not work // only css('display') works @@ -947,10 +936,6 @@ foodcoopshop.Helper = { }, obj || self); }, - getRandomCode: function () { - return Math.floor(Math.random() * 981151510); - }, - removeFlashMessage: function () { $('#flashMessage').remove(); }, From cc86903f7621ce4404e353663297604a6452384c Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 27 Oct 2022 19:03:03 +0200 Subject: [PATCH 240/646] local history --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 489cef0c21..293a7cdb61 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ Thumbs.db nbproject/* # Visual Studio Code .vscode +.history/ # Sass preprocessor .sass-cache/ From 9eda8c92f20ec6ff33db10d6e6f868d73995ae64 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 27 Oct 2022 21:12:20 +0200 Subject: [PATCH 241/646] improved if clauses --- ...ellingPriceWithSurchargeForSelectedProducts.php | 14 +++++--------- .../productList/button/deleteSelectedProducts.php | 12 ++++++------ .../editDeliveryRhythmForSelectedProducts.php | 12 ++++++------ .../generateProductCardsOfSelectedProducts.php | 14 +++++--------- 4 files changed, 22 insertions(+), 30 deletions(-) diff --git a/plugins/Admin/templates/element/productList/button/calculateSellingPriceWithSurchargeForSelectedProducts.php b/plugins/Admin/templates/element/productList/button/calculateSellingPriceWithSurchargeForSelectedProducts.php index e2ae5b8896..6658e4e207 100644 --- a/plugins/Admin/templates/element/productList/button/calculateSellingPriceWithSurchargeForSelectedProducts.php +++ b/plugins/Admin/templates/element/productList/button/calculateSellingPriceWithSurchargeForSelectedProducts.php @@ -16,15 +16,11 @@ */ use Cake\Core\Configure; -if (!Configure::read('appDb.FCS_PURCHASE_PRICE_ENABLED') || $appAuth->isManufacturer()) { +if (!Configure::read('appDb.FCS_PURCHASE_PRICE_ENABLED') || $appAuth->isManufacturer() || empty($products)) { return false; } -if (!empty($products)) { - $this->element('addScript', [ - 'script' => Configure::read('app.jsNamespace').".ModalProductCalculateSellingPriceWithSurcharge.init();" - ]); - echo ' ' . __d('admin', 'Calculate_selling_price_with_surcharge_for_selected_products') . ''; -} - -?> \ No newline at end of file +$this->element('addScript', [ + 'script' => Configure::read('app.jsNamespace') . ".ModalProductCalculateSellingPriceWithSurcharge.init();" +]); +echo ' ' . __d('admin', 'Calculate_selling_price_with_surcharge_for_selected_products') . ''; diff --git a/plugins/Admin/templates/element/productList/button/deleteSelectedProducts.php b/plugins/Admin/templates/element/productList/button/deleteSelectedProducts.php index d66a52b78e..5953f32ac5 100644 --- a/plugins/Admin/templates/element/productList/button/deleteSelectedProducts.php +++ b/plugins/Admin/templates/element/productList/button/deleteSelectedProducts.php @@ -16,11 +16,11 @@ */ use Cake\Core\Configure; -if (!empty($products)) { - $this->element('addScript', [ - 'script' => Configure::read('app.jsNamespace').".ModalProductDelete.init();" - ]); - echo ' ' . __d('admin', 'Delete_selected_products') . ''; +if (empty($products)) { + return false; } -?> \ No newline at end of file +$this->element('addScript', [ + 'script' => Configure::read('app.jsNamespace') . ".ModalProductDelete.init();" +]); +echo ' ' . __d('admin', 'Delete_selected_products') . ''; diff --git a/plugins/Admin/templates/element/productList/button/editDeliveryRhythmForSelectedProducts.php b/plugins/Admin/templates/element/productList/button/editDeliveryRhythmForSelectedProducts.php index 60a6de7b10..6f99cb0ab9 100644 --- a/plugins/Admin/templates/element/productList/button/editDeliveryRhythmForSelectedProducts.php +++ b/plugins/Admin/templates/element/productList/button/editDeliveryRhythmForSelectedProducts.php @@ -16,11 +16,11 @@ */ use Cake\Core\Configure; -if (!empty($products)) { - $this->element('addScript', [ - 'script' => Configure::read('app.jsNamespace').".ModalProductDeliveryRhythmEdit.initBulk();" - ]); - echo ' ' . __d('admin', 'Edit_delivery_rhythm_for_selected_products') . ''; +if (empty($products)) { + return false; } -?> \ No newline at end of file +$this->element('addScript', [ + 'script' => Configure::read('app.jsNamespace') . ".ModalProductDeliveryRhythmEdit.initBulk();" +]); +echo ' ' . __d('admin', 'Edit_delivery_rhythm_for_selected_products') . ''; diff --git a/plugins/Admin/templates/element/productList/button/generateProductCardsOfSelectedProducts.php b/plugins/Admin/templates/element/productList/button/generateProductCardsOfSelectedProducts.php index 64772527b5..4d0ed042b0 100644 --- a/plugins/Admin/templates/element/productList/button/generateProductCardsOfSelectedProducts.php +++ b/plugins/Admin/templates/element/productList/button/generateProductCardsOfSelectedProducts.php @@ -16,15 +16,11 @@ */ use Cake\Core\Configure; -if ($appAuth->isManufacturer()) { +if ($appAuth->isManufacturer() || empty($products) || !Configure::read('appDb.FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED')) { return false; } -if (Configure::read('appDb.FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED')) { - $this->element('addScript', [ - 'script' => Configure::read('app.jsNamespace').".Admin.initGenerateProductCardsOfSelectedProductsButton();" - ]); - echo ' ' . __d('admin', 'Generate_product_cards') . ''; -} - -?> \ No newline at end of file +$this->element('addScript', [ + 'script' => Configure::read('app.jsNamespace') . ".Admin.initGenerateProductCardsOfSelectedProductsButton();" +]); +echo ' ' . __d('admin', 'Generate_product_cards') . ''; From b07a5696fef55828c22eba359096f2cfbadcbeb2 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 27 Oct 2022 21:47:32 +0200 Subject: [PATCH 242/646] fix for extracting strings --- devtools/update-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/update-translations.sh b/devtools/update-translations.sh index 761d30544a..3b5baca0ec 100644 --- a/devtools/update-translations.sh +++ b/devtools/update-translations.sh @@ -5,7 +5,7 @@ source $(dirname $0)/locales.sh #get and merge translations for main app #to extract core strings change --extract-core to "yes" -bash bin/cake i18n extract --output resources\\locales --paths config,src,templates --overwrite --extract-core no --merge no --no-location --exclude plugins +bash bin/cake i18n extract --output resources/locales --paths config,src,templates --overwrite --extract-core no --merge no --no-location --exclude plugins for locale in "${LOCALES[@]}" do msgmerge resources/locales/$locale/cake.po resources/locales/cake.pot --output-file=resources/locales/$locale/cake.po --width=1000 From 30ca433240fc2170553828b92dc2d70f343e03e2 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 27 Oct 2022 21:54:55 +0200 Subject: [PATCH 243/646] never access null object --- .../webroot/js/modal/modal-product-delivery-rhythm-edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Admin/webroot/js/modal/modal-product-delivery-rhythm-edit.js b/plugins/Admin/webroot/js/modal/modal-product-delivery-rhythm-edit.js index a63c43bac4..1dd53d5ffb 100644 --- a/plugins/Admin/webroot/js/modal/modal-product-delivery-rhythm-edit.js +++ b/plugins/Admin/webroot/js/modal/modal-product-delivery-rhythm-edit.js @@ -119,7 +119,7 @@ foodcoopshop.ModalProductDeliveryRhythmEdit = { select.append($('#rhythmtypes').html()); select.on('change', function() { var elementToShow = 'default'; - if ($(this).val().match('individual')) { + if ($(this).val() !== null && $(this).val().match('individual')) { elementToShow = 'individual'; } $(modalSelector + ' .dynamic-element').hide(); From 86af7e8a33ab5fcc2bb6cac1024944329a2aaef0 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 27 Oct 2022 22:32:30 +0200 Subject: [PATCH 244/646] add button for bulk changing of product status --- config/asset_compress.ini | 1 + .../Admin/resources/locales/de_DE/admin.mo | Bin 70808 -> 70903 bytes .../Admin/resources/locales/de_DE/admin.po | 7 +- plugins/Admin/resources/locales/default.pot | 5 +- .../Admin/resources/locales/en_US/admin.mo | Bin 66199 -> 66283 bytes .../Admin/resources/locales/en_US/admin.po | 7 +- .../src/Controller/ProductsController.php | 32 +++++ plugins/Admin/templates/Products/index.php | 5 +- .../button/editStatusForSelectedProducts.php | 28 +++++ .../modal/modal-product-status-edit-bulk.js | 113 ++++++++++++++++++ resources/locales/de_DE/default.mo | Bin 75599 -> 75863 bytes resources/locales/de_DE/default.po | 34 ++++-- resources/locales/default.pot | 29 +++-- resources/locales/en_US/default.mo | Bin 71169 -> 71425 bytes resources/locales/en_US/default.po | 34 ++++-- src/Controller/LocalizedController.php | 4 + 16 files changed, 266 insertions(+), 33 deletions(-) create mode 100644 plugins/Admin/templates/element/productList/button/editStatusForSelectedProducts.php create mode 100644 plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js diff --git a/config/asset_compress.ini b/config/asset_compress.ini index 5e1d04f792..c3aca27029 100644 --- a/config/asset_compress.ini +++ b/config/asset_compress.ini @@ -101,6 +101,7 @@ files[] = plugin:Admin:js/modal/modal-product-price-edit.js files[] = plugin:Admin:js/modal/modal-product-purchase-price-edit.js files[] = plugin:Admin:js/modal/modal-product-quantity-edit.js files[] = plugin:Admin:js/modal/modal-product-status-edit.js +files[] = plugin:Admin:js/modal/modal-product-status-edit-bulk.js files[] = plugin:Admin:js/modal/modal-product-status-new-edit.js files[] = plugin:Admin:js/modal/modal-product-tax-edit.js files[] = plugin:Admin:js/admin.js diff --git a/plugins/Admin/resources/locales/de_DE/admin.mo b/plugins/Admin/resources/locales/de_DE/admin.mo index 47cd7e58af4d46aef4ad5bb3a898b98a74f52bf3..b1df892c8301f9a84eb224024fa0333d60bda690 100644 GIT binary patch delta 17021 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 I&GlRV9|M>k9RL6T delta 16997 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 onze1\n" "Language: de_DE\n" @@ -2085,6 +2085,9 @@ msgstr "Ausgewählte Produkte löschen" msgid "Edit_delivery_rhythm_for_selected_products" msgstr "Lieferrhythmus für ausgewählte Produkte bearbeiten" +msgid "Edit_status_for_selected_products" +msgstr "Status für ausgewählte Produkte bearbeiten" + msgid "Generate_product_cards" msgstr "Produktkarten generieren" diff --git a/plugins/Admin/resources/locales/default.pot b/plugins/Admin/resources/locales/default.pot index 3135298be7..061c675da4 100644 --- a/plugins/Admin/resources/locales/default.pot +++ b/plugins/Admin/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-10-13 10:55+0200\n" +"POT-Creation-Date: 2022-10-27 21:22+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -2075,6 +2075,9 @@ msgstr "" msgid "Edit_delivery_rhythm_for_selected_products" msgstr "" +msgid "Edit_status_for_selected_products" +msgstr "" + msgid "Generate_product_cards" msgstr "" diff --git a/plugins/Admin/resources/locales/en_US/admin.mo b/plugins/Admin/resources/locales/en_US/admin.mo index 9a4b211aa9735c823326e2bc8e06eba3d8f2690f..498a04a0067f5682bb130a1d08417615ef0a5432 100644 GIT binary patch delta 17004 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\n" "Language: en_US\n" @@ -2082,6 +2082,9 @@ msgstr "Delete selected products" msgid "Edit_delivery_rhythm_for_selected_products" msgstr "Edit delivery rhythm for selected products" +msgid "Edit_status_for_selected_products" +msgstr "Edit status for selected products" + msgid "Generate_product_cards" msgstr "Generate product cards" diff --git a/plugins/Admin/src/Controller/ProductsController.php b/plugins/Admin/src/Controller/ProductsController.php index f7568a0b53..2c6cfab0d1 100644 --- a/plugins/Admin/src/Controller/ProductsController.php +++ b/plugins/Admin/src/Controller/ProductsController.php @@ -1724,6 +1724,38 @@ public function changeNewStatus($productId, $status) $this->redirect($this->referer()); } + public function changeStatusBulk() + { + + $this->RequestHandler->renderAs($this, 'json'); + + $this->loadComponent('Sanitize'); + $this->setRequest($this->getRequest()->withParsedBody($this->Sanitize->trimRecursive($this->getRequest()->getData()))); + $this->setRequest($this->getRequest()->withParsedBody($this->Sanitize->stripTagsAndPurifyRecursive($this->getRequest()->getData()))); + + $productIds = $this->request->getData('productIds'); + $status = (int) $this->request->getData('status'); + + $data = []; + foreach($productIds as $productId) { + $productId = (int) $productId; + $data[] = [$productId => $status]; + } + + try { + $this->Product->changeStatus($data); + + $this->set([ + 'status' => 1, + 'msg' => __d('admin', 'Saving_successful.'), + ]); + $this->viewBuilder()->setOption('serialize', ['status', 'msg']); + } catch (InvalidParameterException $e) { + return $this->sendAjaxError($e); + } + + } + public function changeStatus($productId, $status) { diff --git a/plugins/Admin/templates/Products/index.php b/plugins/Admin/templates/Products/index.php index 04a5915e73..2fb9237b16 100644 --- a/plugins/Admin/templates/Products/index.php +++ b/plugins/Admin/templates/Products/index.php @@ -347,9 +347,8 @@ echo $this->element('productList/button/deleteSelectedProducts'); echo $this->element('productList/button/calculateSellingPriceWithSurchargeForSelectedProducts'); echo $this->element('productList/button/generateProductCardsOfSelectedProducts'); - echo $this->element('productList/button/editDeliveryRhythmForSelectedProducts', [ - 'products' => $products - ]); + echo $this->element('productList/button/editStatusForSelectedProducts'); + echo $this->element('productList/button/editDeliveryRhythmForSelectedProducts'); echo ''; ?> diff --git a/plugins/Admin/templates/element/productList/button/editStatusForSelectedProducts.php b/plugins/Admin/templates/element/productList/button/editStatusForSelectedProducts.php new file mode 100644 index 0000000000..57819e0aac --- /dev/null +++ b/plugins/Admin/templates/element/productList/button/editStatusForSelectedProducts.php @@ -0,0 +1,28 @@ + + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ + +use Cake\Core\Configure; + +if (empty($products)) { + return false; +} + +$this->element('addScript', [ + 'script' => Configure::read('app.jsNamespace') . ".ModalProductStatusEditBulk.init();" +]); +echo ' ' . __d('admin', 'Edit_status_for_selected_products') . ''; diff --git a/plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js b/plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js new file mode 100644 index 0000000000..9ee7eea729 --- /dev/null +++ b/plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js @@ -0,0 +1,113 @@ +/** + * FoodCoopShop - The open source software for your foodcoop + * + * Licensed under the GNU Affero General Public License version 3 + * For full copyright and license information, please see LICENSE + * Redistributions of files must retain the above copyright notice. + * + * @since FoodCoopShop 3.1.0 + * @license https://opensource.org/licenses/AGPL-3.0 + * @author Mario Rothauer + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ +foodcoopshop.ModalProductStatusEditBulk = { + + init : function() { + + var modalSelector = '#modal-product-status-edit-bulk'; + + var button = $('#editStatusForSelectedProducts'); + foodcoopshop.Helper.disableButton(button); + + $('table.list').find('input.row-marker[type="checkbox"]').on('click', function () { + foodcoopshop.Admin.updateObjectSelectionActionButton(button); + }); + + button.on('click', function () { + + var productIds = foodcoopshop.Admin.getSelectedProductIds(); + + var html = ''; + var infoText = ''; + + if (productIds.length == 1) { + infoText = foodcoopshop.LocalizedJs.admin.YouSelectedOneProduct; + } else { + infoText = foodcoopshop.LocalizedJs.admin.YouSelected0Products.replace(/\{0\}/, '' + productIds.length + ''); + } + infoText += '
'; + + var products = []; + for (var i in productIds) { + products.push($('tr#product-' + productIds[i] + ' span.product-name').html()); + } + html += '
  • ' + products.join('
  • ') + '
'; + + var buttons = [ + foodcoopshop.Modal.createButton(['btn-success'], foodcoopshop.LocalizedJs.admin.Activate, 'fa-fw fas fa-check'), + foodcoopshop.Modal.createButton(['btn-danger'], foodcoopshop.LocalizedJs.admin.Deactivate, 'fa-fw fas fa-minus-circle'), + foodcoopshop.Modal.createButton(['btn-outline-light'], foodcoopshop.LocalizedJs.helper.cancel, null, true) + ]; + + foodcoopshop.Modal.appendModalToDom( + modalSelector, + foodcoopshop.LocalizedJs.admin.ChangeStatus, + html, + buttons, + ); + + foodcoopshop.Modal.bindSuccessButton(modalSelector, function() { + foodcoopshop.ModalProductStatusEditBulk.getSuccessHandler(modalSelector, 1); + }); + + $(modalSelector + ' .modal-footer .btn-danger').on('click', function() { + foodcoopshop.Helper.addSpinnerToButton($(this), 'fa-minus-circle'); + foodcoopshop.Helper.disableButton($(this)); + foodcoopshop.ModalProductStatusEditBulk.getSuccessHandler(modalSelector, 0); + }); + + $(modalSelector).on('hidden.bs.modal', function (e) { + foodcoopshop.ModalProductStatusEditBulk.getCloseHandler(modalSelector); + }); + foodcoopshop.ModalProductStatusEditBulk.getOpenHandler(modalSelector); + + }); + + }, + + getCloseHandler : function(modalSelector) { + $(modalSelector).remove(); + }, + + getSuccessHandler : function(modalSelector, status) { + + var productIds = foodcoopshop.Admin.getSelectedProductIds(); + + foodcoopshop.Helper.ajaxCall( + '/admin/products/changeStatusBulk/', + { + productIds: productIds, + status: status, + }, + { + onOk: function (data) { + document.location.reload(); + }, + onError: function (data) { + var message = '

'; + message += foodcoopshop.LocalizedJs.admin.ErrorsOccurredWhileProductStatusWasChanged; + message += ':

'; + message = message + data.msg; + foodcoopshop.Modal.appendFlashMessage(modalSelector, message); + foodcoopshop.Modal.resetButtons(modalSelector); + } + } + ); + }, + + getOpenHandler : function(modalSelector) { + new bootstrap.Modal(document.getElementById(modalSelector.replace(/#/, ''))).show(); + } + +}; \ No newline at end of file diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index 14cc541e55884a71ba19f3f9b10850b5d8d32932..6d4e045ca12c340e0be8670da12a713b14b02523 100644 GIT binary patch delta 19821 zcmYk?2YgOv!^iOxiHH%2AVd~9M<9_E(`nkV`_|12C=K4BL1b)Ro4*NMy zz0%5coF4TYry};m7+iz#cpNk1E6j=+>pM02TEIT*9n8b{ zPDm3XSR6gr0=1%HsGV4f>S#Nv-Z`6oj=4#PH8m4YM%8-HT8{ahjeWK6|ioNHZ)8AxwMO>7@#!fWWk2N;OK@9^qjZfh*&B3%-72^*vO?T^`T z494Po)Xuv5h=daP4b$RN)WEN>I;LxD-tYRT33NiOv>)cgN$8KCU}pRbHLK5e+;6HSkpAVmkAYHqIT?mey!*2I`1fad*^;Qc)|Mg1U5z zQ2lH~5AH%u{1R&7w^4V%>7f2N|5zfLc>-$Yl~5fwzy$1qI)eG=huf{YQ3LJAba)Ka z{tRk`*HAn37`4NJ9nBqzK~1O@2D?O>6H&u%s1*#xaGZ)k_!+9hZK$0%g1UUyP#vY~ zWR55ss-J?Wb|o<$YoOW+}!mNTNEMf%BnOSPFHyDxwBz zgPK4O)Q$~7?c`Kc{Y5tYDQW?mFa*CvP3UZA_FoMikfBTT8a4B@UCdjN9W_vH)CA)& zH&#VWq%&$IqfkdN4mH3G>oU|O+=6<`E~EOpiJHKpF6_Ss4D4!Ni%8TF)IwEkkD6c~ z>j+f+si;f07*&6rE#GfFiCXb*sEPlLsvnSI`U^wtTtSzJ1}cH-s48lJ)~GG)iE20y zb?e93^i0$MpI~wP5_M;ON8Ro;-5e(o<4_CefNI|l{qQ}T@47_Nk}(stCG$`d*nry7 zJ*WwOkLviGP5X2=XC8!_cnoTyWw035MQ!~^n_h)#|1%awr-!$_>%S=x}BCrVQDyZ^-sCF|@E8mOi_XpG+xqxwc|L+mWPexcT z$4QTsP&-fu8)6%*iEB|Se2D(&+uL-U0kw0Xs0kIrXe^Ja-w8F~Ae)|us<%Mu{a-;u zN3aQXHrs6aYb-%}KNiMk*Z`yZn0kXy0}Mmmg(+AA7o)zMS1}D%=xf?lMvXHY^W$SK@SODu{ zFs7o8Y{CHcUju$jh8nCxt?(Pvt^NV^qj44W9zRE|Ab6nJ%3_#-bV>BZ${2vvQFo*P zYGKV$6KRK8urI1V*Ci56WC5zd=cp~;VAH#7dOvE$KcXgl3-!r;j2a;QAk!`jYR4i` z<#{nHmO@RiE^5LJZMoZqNM;kIYZR-=vMmo(9m2>_%h-gdlqmCc}b;ikJiZdI->^ai&@b{4LBEddsm=V_yZ>6 zOVmV*4>RqWVKLI(a5yf+J{U}*B96jJ_zimSHM&VeqTV$fH$|P*cr1l$QD=6|mixVD zj;1*3E;P020jMpVW%E~JDCzwei{~*X`i?MfRRo5SP8`Ah=OR*%3=P~Jm7a;Z18Yzp zo+B8Cf1(G&N1BzFLrtVDhU2@ae&%Bi+>Pqz40`Ypmd0$OO#KF<*nfTLdXW)9;i?B4Ac?r#QJy#i(@Iq(QDoZwemOPE_BJzOt+#| z@FQxg?%0ZH#+Zpjpvudm>bFK+qJgOI#W3r5)Wl|?-i}?Ux8NXZ0;f^0?+w&M+^l0w zNAajHUlOW8Wz=ig2z9otPy_cxz1I^lH*Q2t_&DmlzlGY7jN{Bv6hploEzuu4+H`kh z$6aRtkw^+=U_o4m8t@EycfyvZ8E*#kpzVgN=>H47+++Ob5`!t1(3v=tpuTiX}aa4PCO-HwIvcTB*LY32)7 z4U3T;joOiosCL&e5re0jg;d2nq&s0t9FG<85=NsNKEqs=idc<|_SgnjU@3f!>Y(II z^Io^YexyfXYrKbQS7VlWYo?(lx(*BDFQ~U6{cO|TgJnopN8W7L8AC*`o9`TU0i#hX zn1Ic3JH}$*2c}*!s>4>Ov+R$>@Jo!tYgh+^=9=5z28)v(g}StxQE$g_jL`dkpGXlh zGR!j{pwg&xXNO;wIGVb^$e^SEwC`Utrp|Mi1$4Q2D=N zImUM~EHo>tiTO!)M_t01sMlsaX2A)U#pX4N#df5VQD?XSwWX)9I^IXUc1a(Z+g=)j zNLR%`Y>Ik&I$X*XISQ9Fv?)P%oAP2ee}$Ja~Pe>DtPYC6n;dav`MDilIBNJ5=iS&YE$7>^TBmvgf% z{{?k~=|490i(we)wy22?MU_uN_49>GB$CKc)XHw7&iWqa!Ze>4BT+|`j2gHh=EhN| zBU^$V+=C79H=AE%nR!hcp>|*`HpiP-6y36)ni=*+?uj!IHBj#5CcgwGl5U8)G~=)p zZp6A6u)^$AGptX#JtpIN48fb275~9(m}#X+=Rqzh|Ncj$B?UcEGvANuD0r1wX?qMO zJsq_ptFZtcz(D*1HNoeY2jf07^&6nJxEK23WYmPFp?3IVOt1IkoMiJqMpw6g2NAt~hfx!` zf?D}Q48W(TiT#J#!nAA5*5*Xzmq67ki}kP?Y5{Xl6I*V}*Ptf28P)%;HSE7S+(Skh zJcVj-##X#!)7NeJUDOKhqwYl7wPwrnpcYUcwdLJVcV!@^$LXj`y#O_VFHjTSx|aR- zp1rN`6KV(UptkNMYM|`v%*qom1LbzC3y+H^v7I25&G6Hwocg{YNo#Y}h-RsIXA{$HpGy|(#*UzoH9 zRnIL-L<3a8OxP0hVpr7bGZ{x9LA7N!G<^$wbF~IE&KlM_% zk5LoN_?0mlRj({+CmLG2Vyxc(cZulzT#5Pd0BXRysDZL>HRbtHM^YWN;?AhcIl-1M zv-x{bm+Y!dzeG(aa+~R|1nMYjp{oJf5GjCtZH4)$8Lvi7WH)BRo2UuAKut8qb~CXG zsGVttn%G#>k*z@0-;e6&S5&|0c9=UBzJvYukWqmQ-Qo_Yop=w`aFMOJ4LzhUpz6Iq zb(DRlxnzY<3#f=Xy6%`0Cu2!mhPqSdP!oNH`OveA{ntP>c9|J>K^2Tet?+Zy79YnT zyotAqqg)I*2Hs|5u*;7i5Et$jZ+o%Yxf`O?MVNf=`RwslSvq%dKirz z(N%*9L^Oe!sDVB}e_V>0aV6>ux1cW1cc?pZ1vQapsCvGK&A=hn{HOuTpmwMwYC%J+ zlMb{0Dp*LyMBIwn>as^nN3~HMw?j>!4^BrH)h^Tb<_Ka@3uuk`u^no~6R;@GLoMte zM&Suej}N|Q|23oMWN6?FM@_|?s3V9*<(I&8SQRy)x~O(-Q1yD_1RRCBoN0bAzl!0g zqlmHTWYk+z88wj>E|C&MhN8A=J*LI)QLoDh)K*_cHGG6|7;wxCPy)5`3YZtGpeB@J z)5B2h7o#TrC2A-4q3XG(ZRDmcc!oOT3_qFyW2~i7TiO6s-X68G;g}Jpqqg)z%!JEP zmw6*<;6tc|ok8u~Ma-c0{|_RX(Nk;sWDYPbnA;}Z--zZ2%jLQoTm zM1M>`?PxLvVRO{LDX0k##gcme#}Nr4V<+l6@IC4bucAJsFR(0zo;2@w6D&n~Iws*k zOvHb%02V&QU$)p3b!RgFWR55l14!q>f*6gFjPKO58ND!u^j!4d4x7G!I;+=M4uemd zGp&!>;;tBs@1fr7X_yB$q9$+(wPP2sHQvU0Smg}+pOwfgBC5Co)8IPPYqSA1@LANB z-NF!jgc{iYtQj~0vyqNR9Z40`SvRt_Kpjb2tb$#z1b%jw{a-=kG8uk2=4Z3AiKwGk zf*tTH?2XyZnF)@;zNE*a+Wn0+@hR#ORyc3k*Fr6zBkCvzp(Z#JwbM(^v;V5FpNz_Q z8i!!^3+Ak*VRq831^WkRH7N19bh+beA=H!>C7$%}t+y(V|_CmGqhnnzEn?J&} z8B!G|pk_D)b!H1tmu8jC-+&r$H!j1AHa+5!`JgO9UMpuO>ZlId^f}Z*uc40oG3G=! z;Ig^hc~EE84mHCrs0sD3_CZZ#0BV4DQ5{Y|b+`aEv9+jq4KMuCe#cQu{DO{bkqb_qw2569Jm9ub0<+d`J2tZkGdOa ze>MFDVR^m(*@);iHbI@?6fA(tQ7bu$8u&UUVd!t>{jGz#1F5K;nU9*#$EdSjZqsYg z`!=C=?kwtPu3)%Jn;P zWIk%^KSg~>H((r|LXGztU7cabHFGvGsD_16D=LMJu#(N6gBoBdY66>31MEYs_(#lz zXHo6{LLI?#)B@67HxrJ;L8MDwXaBY3YshGV2e1%^-Z0c#x1l(yU3096!!ZJPU?iT!-1x|*L++XWi=o;zLS0HXm55%O#aIqEqdIti zMKSQc`Ozqk+OmaM9&e*AQT{*8KxI%XZ*9|~&_j9&YUSV9^50Mk^?l%7pzA~v(H*FW zX|XkC#17WpsIwe~8E_M7C%#5q#xqz3Z(#!F{mWd&W*A7iE$Z_1viW0B{ZGMAz5nxw z#F4QM)zNwEfm#1HJ1`QpW$Q5>PhbH4i~i{U&=`n`q_bfH)S?nZA^zw1y( zaR#;HPtkpcNbpm$C4EqLVL0mY%|;Ed-g*qR_4hCu}gNTeFLt8o<)nE~7Yd2vI+>Y7sg!P8ae~#)f%RlC=DS{ffHilqR z)JnVA{4wZDdMauHGyh@#wbG?z$eox2&!Q%DA2p$;s15_4n;#_)Y6lWfm#jKw!KSEw zQfzuGs-L;2i7v6}ov4X^>k_F-4c+pU@~gpnW*wlF%zyw-Hn}C1+Ste z67$jwn25oo%VJKfhdP23)I@t*-BCo;;Vje{ED#E+cyL-DCokhW zpAZShZ?O{oidu1$zmIoCZLmD)NvIFWK`f4sQFowFIv?-WHpVE@Ls9t)P&={*i{V|= z0>T5#MBAXNEy|8GO7yG7YdS>6zFSkD>>QW;7FTggS~j zsQgQq8(*Q0G@Sqbs{Ce{3x{O#alKnSn+$E?HmrzuQ7eoM^znYVI$#~rQ&1~8jjHFD z*-X3|mL@$P3*iaWU3reWbUA`demT^o?uNSL1A|;2XC{%sWK=`nU>~P3*1}r281))n z$BcN_`V`esnk+uv_d5{PVJPY?3PatEJg9cHP#>^n)}Hto>Cr9`KO*@;Ooy?k*Qx~S z15pL5U_I2?&q5u|UTlkhqCPNnvl^SBCeqH@5jCMMs0sJB4n^&_JC=yHYAYt>PQ}=?n=Jw=E!QJCNc>1i64Tx3lmY7eIr z2EK?IFfh~%P!{u&?ugxRJgVMZ)TNEg;p6?AZWJ~reE@aI!g8ASO>jNwVWb7Yc;?cz+uPU{2Cgte>Jjy}M8!tRvVC zUtnu&6=A+7n^8NJG1A zx}xq(s&y3VZcRpA!s#~sA?inNDZ2V~+e$=dbqw_*aRN2KS=2->pe~tzlo=ohHEZaU#-VnmJZgXzsCNBO^@pMQ9fxW+DT?=B1I{EvGn|Lofn}(MU!YdB4OMR+X2I`} z%j29!E#M*QgOc83b|MCqpM-jS>!5a`F>0YLQ2n>|xMn7u$ZVyF@he3g|sc)R}iheK6if?a0Td zJFw2Ck79Px=THOOM@{Sr>L^}g6b9urM^Y4(u7%pU9;i#}jw7NO&qfWj*cN<_>Ts(q z--8HEHhU&KfYNrxxx;$#)HIe>YryUVBNI`uVQc;&^7V6Ab zqdp)TP!rl?J&gJQokUIShV`D!e{2niF(0r9)K1sL(%2c(>HS|qL}$Mey#u1oXaj0T zwxTZ0x2OpoLLJRjY>7{?5jMzYzI>lxEa@ZGN0^^Jrr8-t3y%1v<-#JgDCjN`+ zsCohOC0u|dNgqVr=9gFyLkgOSltmxXpYV^a%(N&)&0Bp< zBff%qUs1lFvQor7`_FTN41Us`J_J3wVEqYqsPvICc#05TZp-fxPauAq5Mc*u zV#`#w59R$xmqPx?asDQ>CqA0GTTo9$!dkvR-e*4lTuQh^McrCGUsJId>ixe@d?WU! zoF7Q%d*b@zQjf=W_$T>kh#$i^!oW8>V4Y0e0)#5m(YIj;VYW-68x<QA z+m1~x$3*%v^$uW)E$c=4Ln>4w)F7lIt*0V=OfXT0Z=4fK{cVI{1dXZZ8u{*7{xOBh z+igB7xRyM=InFr3 zm!zALZbu(~;9*sK>*-0ITk1oD_pk$wB4Z@!L<$=b=PxQ}E@}QmbOsXm1Ia0@Mm(-< zGmX6e$a_GTLwpeVQ;{D;Co6f!Om*iuJ|axD?Uj9$I__#B;Y9RIr;xvxoxcbdN$U?x z{(AC0WBF%86Lt7Y%lo{`Ka*(Fz;^lz>6~v3@Du6psQZ`An@D^J@gYp|2xVo`u>QJa zG@xJ>;T7@sDHuw87rr3foXV|;wU>2FZaSwaIsAbEP`lAnoqLqcA{B|-{$GiV=R zsyNk%>-pEf}QGEwGXD z7|J`7&QI_qym`hFuS40JXC~<$)YtPb`JWRnOmIKq9~o@LI~4lZO2cTdg8Wp{<-E=K z$k;L^UlN+UH9(TBQ;a&l5|6iK{AM|e3Hl+^vzc&$viHqoU1vXu-BhTBQ506h^c21( zuMh6S56B-&{$b*JHW{2_D^H5J~>`(ZCcpPCMVGIqHlXnnDVlz4qBK$*qALS>>?@7E4CZnE-2Jb&tk@tk~ zg)Q@D>iy^6JDlQ#xfJXs+#+6{{M*F&>&gjXkgfO+dEkMmSDhH$qzKjwF4J zcyH?HSzvHdDSMB+ji@Jz_(JT9?Y%ktqmga2&1M{@Gd*LiCT0FJTPlfJ)c=pN8nzw( zR^}8To`pd&*~&lq%$-v^N=s~MhhAt6vb{dVvTwS!&Lppx?NwRNNq5FyuqUR$L-eDm ze?Yt&;Uo1+SPP$#*0bH}{%#`~-s0}A<)r8qLZ!#T36Mi;L zobJS{6GBMWM?HNA9SEICSEk)E+g4>?5MM<84IHNojsG5rI6LE>ID_nhHhqxFA%y9q z2jR!wMqF*;Z=QOTh0uroPTxt$MOo3e%Da%)j8K9)!8io{~ICysv`afV}S!kZ@} z9h|U>nW74@$=4Q<6hY-(!-S<6uGCE*<55aG?Uiviy} zk8J!;%w+pgSqZ`)wvBiEykxvXrTJvGAXFmEBK<32JPrF3`cWql2it}uowJmW!u8~3 zq%13880q=s?lhBO(1oFd)=OfIqZTDhF!d1$r(eG=*1=0gZ z|AF@L-ZbZPQcEegfe-O7JVk?IgzpFegmi?a4Dgz=J;a|9%8*_~{g&8*{QJbiQI8LK zok@40UVVIzyoOi-Gm|%o@-aH;BV_g_EFe@Nydr!__<>4|QO|YaZD>#r^@I}g5L!{5 z4|@~z?6URCQn#(5E}j?jcKh{E<%++jN+i~rSxzX9J$ zD=(7JfO=Ii3*l#5zUi%cb;&P4ogc_6Na$e8`jW5bE+Jl#4h(Qm5uRWg6r$o&;&qA7 z#PXy!Q0EJ7Ojg&2SUy6Ss`FI0-NuqPn{;^`j{Y{kAH94`JOxjYf1L6+Pf7CXkQj+~ zsPm>MnsgSz8p>wc%yBqE|M_DunUmi1fCUL(QusUJB=JZ(dT7go$qS&Px1ZtU^&;<6 zGS3jNO8g|Yq1}4&mJ*L5WFriwtQ27c`5h^b(ZBvQC!(hg1$w$$6(3Kd{Dc9--%$q7 zMAE}(<4gF_WI3D2Ye#wo>A7#U&q2NpC7sQyj~@^U5vGuTxH=Wyr{Qz_nvAW4$E1s5 z7GrHl@8|7t+2KCEnX099`v0gdKwMt-*rgu Z!SPMKbC{cOGUwa}C$elgc4B}3^_TGD!Ymb^WOSSf>8YL|?tExqfqFS@1 zRw-4ZXes`$_xGIqf9~UPJkRHxbI&>VoO5qNd;YY~52t+GUqgKsIb3tS9VZtqlhUb6-?HtiCzFy$>V3MXTX<2ued zGP>ayM&l#YOtUmG6G*Z)wD!VC>Zf3KT!(6Z05ze@s1-<;Y}!Sk`mcg|fS%U(F)!mg zdz8T|7=^D#Jj7q4CVtJ9dp9%fVyrb$6YPO%KN%Bn4Z2Ze z&XV!$8ES?h%}s-HScJG2CgKv*M2@1i;0_kVj47sFY1E2z!>l+Cv*AMPX4FIuquTwJ z!uo6GFDOulxmy^kp;n*=YR0osd$$?2#}`re{f%1kY%NWFC5$5OgIcLss0nYi<)=^+ z{tII;M=RD}PhPQ=xuGqpVk}1CDqDWYmfy4nv^EnhjG9m~X2ZUi11DQQM(zEVHok^B z)Gw^zZW~@P3W`~)V|wD|s3+)vK{x@Ua1Lg~ZI}V~TaRG`@lU7+dWh;bxGe`6BQYLJ zpjNa4hNC-qSh6Kjq-L!D7)XC~^q zup2}0mW`hytME^1o{xSu(m}F)Diu$59A~CEkoWQ{SK_^gC+ee`7|MjBiKt1YwwyxFBZ2ny3y_P%F^`^_EOPb+jI}MX9Lv zM^HZcEC;8Cb?7GONCL7kaXU08oLyh(vh@nfr3S93#V)LuoQZb(A4 zt8Hz8deUyF36DUvpJVG+pjK=vYMi~OevY9gbk!xJrTYtY<8#z059ns%ET{ouu>_Vz zosqt%(>xuE;SSWqZlUh~8-38}ZpwYpmoN)zMIulWa7&QUX|92qVPjOs?QA>^wbzSK zGv9=o=s`@xGpMCc*TdXb2=%_FpzfQ1Nw^rbHAhk7oH4QMT(u4EU=b=JdYUJ!gIc<- z7>k220hieN?@%3IM?Gv0;{w!ui%}ilLVbYlp+EZcGbdh!U&jq&JaAXA5o zmbf`)#L=j|osJ!FH>#r?{mlm`FX|B1!bt3Fi(<)%*y0O#qk4J ze?4h23Iee-Dz0kdTBs*)f?DFv7=XiU`8do(JP-5ZO4N!SMQzzd48kXJ=!EJHtBgL;xpm4L@zKGzQP2I7;K)TE^1d9`} z@_#X$IDEAEaashk6Su;wI0$p#G>pJisDby{_y%g6*P~hgSTecCm~VA;j3OS0dh+*C z6WNYA@f50~KTu~NsZ!b1C<(U_O=D; z$;Mzj&bQ_Ju@Lcf)KUhIOKD&_2g$UH{M50G(F>JLeZ#|s)TCS(j^l` zW{_<#A9cf4)FJu~_1>SbUO-LkChG0TG~S%@9H~Ppx%OxsI8cSdOJ3wAAVuueW)e>7PS)Bu>d*~ z&3FZom2jO(WYnM~YQSNp!dZx(iJ=bFAzOa|wMEY{5`!n16-+=aabwiP`k=le^KJb) z)LZr)>b?hol0c1m#tA9bwLd@5H;{rR0kiR4$nuZmD-8X_!FxAKd1=@ zPc_D%?kj_Opo*vo)J2Wg23;M7u4FXu5Y(QHM=j+?r~!AQIy#G*(0NoxcTpX^Kpi%p zX(rBt>aPH5LM2fvQ4jsG6{_Ek(^!8Uo>3I2qlu_5)+`$z#FE6{qaQlc&FS?=U&3%y z$GK2%MLbr;6x4$)K}~c$YT~<4XYCkzn*)-IXuSBiH7pRpzgu3r4>NO2=-!mVU@|Z+H4=jsIF%f@6t%%P| zb7L7SM%)ecBp+a2+=(sm0#?SvS>|;eh&n3^u?D7M8~g`LquXq@>0l=2qhJg6$FtZP ztIjbueu$C8*H9C6=9-BYL%j{{QTGqSa<~k6L!F;c_qCeGe&a~g16;%uz5hY)o4xCd zYB(F!;TF_h9!9N%-+Z$IrLi7ySJdg>h9&SU>d^WxFi#wVTJma`fE};^&av?>%%}JN zHkmF|WLQXJ9Dwn-1M}lAs2hD3nE?|}6H3NHI1zRKR*b^X#iqPCRv_+xda&gfhx<@l zcLQ@UzT>sT9IBkCy-LC)Y=Wh5BI<_S7>nnzIKHxR(g!APi5hSw7RIBf6?%%{n0=|) z>Y}KvN=8?wcQ~1h=wdsZjoQO|s3nbCX8uj68tS#1j)6D_GvNoQ`!}NAo}Czk2hazP zV|F}^YJb=I?=sduGX;Sk^1D4opx(=|m>wsfZkUC^xE!PKQ`C~4z!6euPmNw!-{fuLP=m61K*5 zs1U?^TgE%6i7!~@rx35KE0T7Fc08T8is-^ey-YAd>92o2t~ z<#SMHWHsuHY(jPXGwM)Xv++IjA%1GhU!eN&-C)dyzQhGl6Df+G-~X#9LqQW;(GfEc z55kN%7X5H0`r~}-GSuF#MxB*?m<=!6@+YX%pK+sk{c@ouR1&pfwbAqb*C(TyHAgLB z8`RSFv*qt$0P#F*fJ;$Na2qwT=NN#m(I5RkF#}{m^%sWeFb>teAgW#BC#=5;%Gd^# zQBP0}wa0BxOFkU+0a=Y&^1Z0D@*M`^Z>Up!57lwHP4-tX)Zq+6)#pd8Kqb`5HQB`e zYoOi~Xr@y!JuXExT#M>pCu)nnM=j|k)YjZZP4GEt;xV6^j?1Is6jZ2QWMS zily*5>QE)@HWO`zvBV=#1AT;=@E%)!0rh~dceDOl;@Cary{w9viIc6JQA;`mwWL!q z0zW|Amume1HNZX0f`NO@gz}*7ua25<3)BM)u=R6YGTA8j9CP3a8{bCV@EW5q+djMJ zn3K3EdbS8P@FI-BR8&8wY<$P+z2B@z9t@|x2C9FzEg9V~)H(;XM;lR3as;&nSFDe1 zdB6elWVtbj`a~>>6)_X`!y-5qwQ`@L`q^*me?(Tob#9Q+-g$pzW>f(45Ld-Z*by~A z`GaO9>YzSMy)YvVz#BLgH9)7YP5B7a%1%M8%tz>lUs}JyjC%jSBclnN!xH!}CSbxL zv$XB7Eb$oBz+a%gfP1kMeuc|1?>A-w2T%i@L$$kX%detV;wkEk`5)%9&iGDtGWycR zUr1JOXr(i486LhliFw|Qz4kK{^mc&%l3f)Ct z^gC`=HVD-|1`A^umrMYeZm1{jkI^_7HRDA#-hg^0vzEn5 z#0^jnG!v6>E7rhkNPqnM?5|6AebazmqU8Za_`o7zX1RY>n5j z0hasGtkg7AyALrPu0g#u>rn%rM6J|S48?n>Eq#ry2F`NM9FkbfNL&uJ$91fYP+QR) zt6^KzDgPMP;5qcckw2Ly8;jb4h1dZ%V;>Cq*-UUG_9GtiGwZJ#?@~}3AD|9jsq?0T zDyS!Dh5D)28#TeHsHI+L>vv;S;^R0BGhQ%TH3_p4&qA%xYK+BAs1-h~e@@pPKBhpg zOXiE_-*)0rPuv#uT6RWt&>c15{dbs(%h#jE`y5x|S=SZ} z;YVF01@EKYg6*ii+Gpb*P%Ci>!|*<4N9VFR)j3dGmV%mKThzomTDzhq(i7GHAXIhK~4;Z@X%+(#XYiP=~E3s=PdELJhDOCSy*V zj7-pVR+7;TYcU&shFZF#sHHq_%Wt91#w%2Z{=e|c1_ohCtcN*pJm$w`s0TTO8u&66 z$KYSh>st-;>izFSMoTjrwPcG?d%euYtI_j1p_c9>YHKc_p5z{C1^us@`kdI1I1bn0 zP}CuexMo%?5i=22!|X1ZreyTQeNY{bMy<$f)Y30SeL~k`VLXN!@EK|g(*I_*CKu|y z7}Nt5#U@zBmd`--zX&yfjp%BCFUjbMzr_eViR$1EY6~8rp5P5?NwZ$(V}%K*C0~V2 zaW59c;2Y+XT?Pjcr{EGif)laBO}-^~{U+<*lT7JbX3tilmhLE)!SLJW_kqS(lXx7) z;$hU2{bA$sznd>-C(KLv6x4%kz-T;#n)of$3ckijEOdwUSHt>uOvCONLp%eE;1 zmr)%%cg+N%u@GS$)Br5r3J(*Z?yUH%A@5&bE9cYJl+=j7z7QrJJfKSm+ z@BeF0hS@(dABrHtWQ=-^4I{g`R)^3wdUiJOa~E5siTui{V%lwYRlUhqM6(V=v5vBT-8_9mDZ`^uvv) z32nnHc*J_emOpyN`m4jh=jOGELk(ONL$N;UN!#1#Ar(;e`y z`AsJbwE`|`;Hjwkr5J>3QDQ z5NH0+yd`x}@hD8f9as);qCQNKugoE?h=cV0cOX-jiZiI!DCcW4q1srQxHk^L)z|^U z-XUY`Geu>oU=9WO7>_aF`{5za+D=qZfT`+uEGaS8&{c{#hW zBId&9I3KfkdwHH{1I{GAhVj_f$IG*FOE4$#9;|{tqn2gh*nv1Gz{~S(?~5gg_oKciPf(xq z=s+*e&zM?Ro_H#D#Y5;uk;$Ll%)Ab2D`ud|f5bfaH)>DAGMMrP7(v_*wZzj=E4URa z<8{;%MhAI$K3pxa9`Sh8gB(Y-`!C4L^~}6NMla9b$!23gDvn@oe1tl5nfQlYm6t%B z>h`Ep-V5hoU#x*IF&V35@^b3neAH`r88hH@>jP9jFEY7ap7+}~v*|Dx^%{ksUY8uG z8>^tcU=6IDa6R#G^ugRAro(8|YgGgTu^d*z8mPUWhT584_zvE7$>;-9J=E9$^<*j5 zR;UTJMa{U2wLfafN1;|~3l_uUs5A2#^>)OEnZw!&HGxT}6-`CG1?~kh+LQaJ!;(9T z*|VysiS$N&&wK$|lrGdFL``qXg;++oJ9phuZtk zurTgNE%hI$mCKadn1K2r)(}1a{+CQfKh54j9hyGYVW`99q7LC?8_&aR#EVcr-L{~% z>M;7^5!3)DQ4=|XI%BU<{rl%JXDI|-9j;ttGGji}(v(CE&b`NP z0jHuSI19A`AE54AhZ=Azs@<0uf(KA%=X4(4e?7q;6zGHE6=_x?7plAv>iw;TT8X-- zCvAipAQ?50HmHepMz!ybns7hth9gn!ens7P8#Up-B3(1XmlSA*zELL5fEq9>>c$9b zG-`l&Tc3oQcq!C?$*4Vl2lc&}fLf8os57v}#)mK~@eeK;4R8xJvp-Q=@eCu;Kd;%6 z{HVAJYUw(n4(({v5>H1BG~br5K=rr9*6&1(a}YJbqp17cKgnq3FRgyjrXmE@aU^P~ z3fj0NYUY(u9j2f^o2J6KZ*^kK z7c2{EsVieyY=gRQA!_fJqh~`n#FqN`|A0&r3TovuU%n+6 zPkhjN595f#W6ckjidcnsE@~-HV{Lqj>Zf9y`4Y~-QpEdEhxrK>!1VdeM2aKlpWkdW zJ+3O&^VrN3Ipy?d_9{ibH+jyi=jzU%%-tD=eYs~KRw6EhDa38bSKyv5!~=-alXTs- zD(}vq!DqI^Wb&)1EJDS5rK864yH~Ys#N@sdluXK+EIU#^5Vp?o>dJ(@7-%9%S96?1S$XcQLfi?TseUf9``e?lBb97|jfw_ww^2AofFAq(>g(Xnfkn>+?4Bb$?MHu z=ZVZ8XKBw1@3bU!rG7WX56O=pP0@S6??p~D6@9P}9sNXuA4#1x80Be~zG07SaD}$t zljm0)=gM1cRK1yaDEBs?F70|v8NbUre^F4Lx+>&flJ;o-%Tf5mHr5xvDvihD&!oY& z{AbFN$?w8#q@$z|I@(MdU59MD>Eyrml<>u;%}3-b;CLnSnXwq@7u)6&Em@+y`Komi zhSGU&3`bopNwdj!roFBW)D_yVmkhZJIKc(U#@l(=k;?czG$=9>@xe0cF z4=K1#MFHXkH1x6Mm2E>WY)q<5c@WMZ4I}AVg!w4{oBT{$mX5fb&DW&77%7mlUvUBH zFm?Q9;5v869Am)xRHnn_r0%4llqZw&(%2!cKzfg)Pgi@=eDa5=uZe|7rO0o^;iMtd z7pCcO(njJ6sH+U+2Qe#cb#2%FHzzno`h|u)DQt?mo}qpd(De>C>hH$7nvmC3o_jW$ ztm8-9mA2FG$-lDYGx2@mhSc3Azl)UB-v6!I*zb??p8~FdG%kaENju2vI%aVA3xP9{ zj>h3!(ifx&wlg*HBH!J{adt9a(I)NMPgwyQ^S2gfII;TynW@}VnpBMZ7SdTN!nx}g z+sSd%@2|SzsV{)tXkV556i+Gt*%6=7t}f+6DF2cCe#$x$r(K^?=11@^j-m~h>zw1y zK@{kEjOD0kfgMbd=g-TOO*A(+FRZ`f2s)od+u5|bh&S*b$}eGI9Aw+7lV;>ADf8B~ zP3vEof*Ef$44_l~3gqmj!>)LpbcZ%0NGHgTBe=<>t>wy82Oe$+p*d zYD64>HEo{iT~8`Gw`%`Yb3nLgrdKZKs&p{1_RXx9eA)3IJ*1W`0>gtbT?Q!&)u z_%%+a>;YxN88`=?BTl%Mj1ONXnLxPrJI?d=dq9Nj0cHYVZ37eJOim7+LCS@J(o=TAJD_&)J>YQPmkS!w)^@_d*;DofiB ziT}YQ)HT5K_fV5}rr{haZ`jJNbTWdtFsTG}?QQwD#B)h$*DG5-in66PKgU`U$I*|j z&kdeGJJR+wxd*OoSQLF}cz}wVq&&n^X)xB_Jji;Ly7r{=)LpdqR<|~w%{}UBkg}7{ zj%n9S+Ek>h2x$z3*=(K8pL5a%pJQJdc2pr(cJd`iODW%EikyMAZ5A8nB)&%e7VUIh zBhJGhx{8ob#z)lUrL2&>_dfAG%EPt)Uy+HTVh!m>DuPHC$bU`xoAi+SP?D}jq>kor@mtAK6Onz)52^8C5Q zmJ@jP#p%b*n@R6dV(<0*(`;tj=^M%?lb#ZPz|F%j@PC~+yNQQ!V<<+GexvRCZ`F6R z`ApO;CclCd>=}sh^HR9ZHaNnKy7p2w)MOoh^0jH~N1M4g-E*U?=JZYEuPFm1!ZT8fO4KfF(e%NNAUuwlpjnkzr=~CDy_3s{I>SjnRTclWG zRAQNO#mX!gz5Pe;q=cl@MmxF$rS3bhCNQ=C(N5l}SB`(-v*6X~45{Z%Pipyp&cI>W diff --git a/resources/locales/de_DE/default.po b/resources/locales/de_DE/default.po index a7821aa65f..99e3b3bd51 100644 --- a/resources/locales/de_DE/default.po +++ b/resources/locales/de_DE/default.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-09-20 08:24+0200\n" -"PO-Revision-Date: 2022-09-20 08:28+0200\n" +"POT-Creation-Date: 2022-10-27 22:11+0200\n" +"PO-Revision-Date: 2022-10-27 22:13+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.2\n" msgid "Access_denied_please_sign_in." msgstr "Zugriff verweigert, bitte melde dich an." @@ -720,6 +720,12 @@ msgstr "Produkt {0} wirklich als \"neu\" anzeigen?" msgid "Really_do_not_show_product_{0}_as_new?" msgstr "Produkt {0} wirklich als \"nicht neu\" anzeigen?" +msgid "Activate" +msgstr "Aktivieren" + +msgid "Deactivate" +msgstr "Deaktivieren" + msgid "Activate_product" msgstr "Produkt aktivieren" @@ -792,6 +798,9 @@ msgstr "Achtung: Es gibt keine Möglichkeit, das rückgängig zu machen!" msgid "Errors_occurred_while_member_was_deleted" msgstr "Beim Löschen des Mitgliedskontos sind Fehler aufgetreten" +msgid "Errors_occurred_while_product_status_was_changed" +msgstr "Beim Ändern des Produkt-Status sind Fehler aufgetreten" + msgid "Delete_products?" msgstr "Produkte löschen?" @@ -951,6 +960,9 @@ msgstr "zurück" msgid "Send_email_to_member" msgstr "E-Mail an Mitglied versenden" +msgid "Change_status" +msgstr "Status ändern" + msgid "Were_the_products_picked_up?" msgstr "Wurden die Produkte abgeholt?" @@ -1260,9 +1272,6 @@ msgstr "Rechnung" msgid "Cancellation_invoice" msgstr "Storno-Rechnung" -msgid "Filename_Information-about-right-of-withdrawal" -msgstr "Informationen-ueber-Ruecktrittsrecht" - msgid "ID" msgstr "" @@ -1314,6 +1323,9 @@ msgstr "Summe Steuer" msgid "Sum_price_incl." msgstr "Summe Preis inkl." +msgid "Filename_Information-about-right-of-withdrawal" +msgstr "Informationen-ueber-Ruecktrittsrecht" + msgid "You_are_not_signed_in." msgstr "Du bist nicht angemeldet." @@ -1719,6 +1731,10 @@ msgstr "Das Produkt mit der ID {0} ist nicht vorhanden." msgid "The_attribute_does_not_exist:_{0}" msgstr "Die Variante existiert nicht: {0}" +#, fuzzy +msgid "Please_accept_the_information_about_right_of_withdrawal" +msgstr "Bitte akzeptiere die Information über das Rücktrittsrecht und dessen Ausschluss." + msgid "Please_accept_the_information_about_right_of_withdrawal." msgstr "Bitte akzeptiere die Information über das Rücktrittsrecht und dessen Ausschluss." @@ -1737,6 +1753,9 @@ msgstr "Bitte wähle einen Abholtag aus." msgid "The_pickup_day_is_not_valid." msgstr "Der Abholtag ist nicht gültig." +msgid "Delivery_break" +msgstr "Lieferpause" + msgid "offline" msgstr "offline" @@ -1857,9 +1876,6 @@ msgstr "Bitte gib einen gültigen IBAN ein." msgid "Please_enter_a_valid_BIC." msgstr "Bitte gib einen gültigen BIC ein." -msgid "Delivery_break" -msgstr "Lieferpause" - msgid "online" msgstr "online" diff --git a/resources/locales/default.pot b/resources/locales/default.pot index cd820f2a46..e9fdb8e48d 100644 --- a/resources/locales/default.pot +++ b/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-09-20 08:24+0200\n" +"POT-Creation-Date: 2022-10-27 22:11+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -719,6 +719,12 @@ msgstr "" msgid "Really_do_not_show_product_{0}_as_new?" msgstr "" +msgid "Activate" +msgstr "" + +msgid "Deactivate" +msgstr "" + msgid "Activate_product" msgstr "" @@ -791,6 +797,9 @@ msgstr "" msgid "Errors_occurred_while_member_was_deleted" msgstr "" +msgid "Errors_occurred_while_product_status_was_changed" +msgstr "" + msgid "Delete_products?" msgstr "" @@ -950,6 +959,9 @@ msgstr "" msgid "Send_email_to_member" msgstr "" +msgid "Change_status" +msgstr "" + msgid "Were_the_products_picked_up?" msgstr "" @@ -1259,9 +1271,6 @@ msgstr "" msgid "Cancellation_invoice" msgstr "" -msgid "Filename_Information-about-right-of-withdrawal" -msgstr "" - msgid "ID" msgstr "" @@ -1313,6 +1322,9 @@ msgstr "" msgid "Sum_price_incl." msgstr "" +msgid "Filename_Information-about-right-of-withdrawal" +msgstr "" + msgid "You_are_not_signed_in." msgstr "" @@ -1718,6 +1730,9 @@ msgstr "" msgid "The_attribute_does_not_exist:_{0}" msgstr "" +msgid "Please_accept_the_information_about_right_of_withdrawal" +msgstr "" + msgid "Please_accept_the_information_about_right_of_withdrawal." msgstr "" @@ -1736,6 +1751,9 @@ msgstr "" msgid "The_pickup_day_is_not_valid." msgstr "" +msgid "Delivery_break" +msgstr "" + msgid "offline" msgstr "" @@ -1856,9 +1874,6 @@ msgstr "" msgid "Please_enter_a_valid_BIC." msgstr "" -msgid "Delivery_break" -msgstr "" - msgid "online" msgstr "" diff --git a/resources/locales/en_US/default.mo b/resources/locales/en_US/default.mo index 1d56332296e10225bedfc0817c13bba3ea45d36f..e7823659dcc41e2dcec905bb63d588c2011eea46 100644 GIT binary patch delta 19787 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\n" "Language: en_US\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.2\n" msgid "Access_denied_please_sign_in." msgstr "Access denied, please sign in." @@ -720,6 +720,12 @@ msgstr "Do you really want to show product {0} as \"new\"?" msgid "Really_do_not_show_product_{0}_as_new?" msgstr "Do you really want to show product {0} as \"not new\"?" +msgid "Activate" +msgstr "Activate" + +msgid "Deactivate" +msgstr "Deactivate" + msgid "Activate_product" msgstr "Activate product" @@ -792,6 +798,9 @@ msgstr "Be careful, you cannot undo this action!" msgid "Errors_occurred_while_member_was_deleted" msgstr "Errors occurred while member was deleted" +msgid "Errors_occurred_while_product_status_was_changed" +msgstr "Errors occurred while the product status was changed" + msgid "Delete_products?" msgstr "Delete products?" @@ -951,6 +960,9 @@ msgstr "back" msgid "Send_email_to_member" msgstr "Send email to member" +msgid "Change_status" +msgstr "Change status" + msgid "Were_the_products_picked_up?" msgstr "Were the products picked up?" @@ -1260,9 +1272,6 @@ msgstr "Invoice" msgid "Cancellation_invoice" msgstr "Cancellation invoice" -msgid "Filename_Information-about-right-of-withdrawal" -msgstr "Informationen-ueber-Ruecktrittsrecht" - msgid "ID" msgstr "" @@ -1314,6 +1323,9 @@ msgstr "Sum tax" msgid "Sum_price_incl." msgstr "Sum price incl." +msgid "Filename_Information-about-right-of-withdrawal" +msgstr "Informationen-ueber-Ruecktrittsrecht" + msgid "You_are_not_signed_in." msgstr "Your are not signed in." @@ -1719,6 +1731,10 @@ msgstr "The product with id {0} does not exist." msgid "The_attribute_does_not_exist:_{0}" msgstr "The attribute does not exist: {0}" +#, fuzzy +msgid "Please_accept_the_information_about_right_of_withdrawal" +msgstr "Please accept the information about the right of withdrawal." + msgid "Please_accept_the_information_about_right_of_withdrawal." msgstr "Please accept the information about the right of withdrawal." @@ -1737,6 +1753,9 @@ msgstr "Please select a pickup day." msgid "The_pickup_day_is_not_valid." msgstr "The pickup day is not valid." +msgid "Delivery_break" +msgstr "Delivery break" + msgid "offline" msgstr "offline" @@ -1857,9 +1876,6 @@ msgstr "Please enter a valid IBAN." msgid "Please_enter_a_valid_BIC." msgstr "Please enter a valid BIC." -msgid "Delivery_break" -msgstr "Delivery break" - msgid "online" msgstr "online" diff --git a/src/Controller/LocalizedController.php b/src/Controller/LocalizedController.php index 28d81745f3..82e0190578 100644 --- a/src/Controller/LocalizedController.php +++ b/src/Controller/LocalizedController.php @@ -178,6 +178,8 @@ private function getStrings() 'DoNotShowProductAsNew' => __('Do_not_show_product_as_new?'), 'ReallyShowProduct0AsNew' => __('Really_show_product_{0}_as_new?'), 'ReallyDoNotShowProduct0AsNew' => __('Really_do_not_show_product_{0}_as_new?'), + 'Activate' => __('Activate'), + 'Deactivate' => __('Deactivate'), 'ActivateProduct' => __('Activate_product'), 'DeactivateProduct' => __('Deactivate_product'), 'ActivateMember' => __('Activate_member?'), @@ -202,6 +204,7 @@ private function getStrings() 'ReallyDeleteMember' => __('Really_delete_member?'), 'BeCarefulNoWayBack' => __('Be_careful_there_is_no_way_back!'), 'ErrorsOccurredWhileMemberWasDeleted' => __('Errors_occurred_while_member_was_deleted'), + 'ErrorsOccurredWhileProductStatusWasChanged' => __('Errors_occurred_while_product_status_was_changed'), 'DeleteProducts' => __('Delete_products?'), 'ReallyDelete0Products' => __('Really_delete_{0}_products?'), 'ErrorsOccurredWhileProductsWereDeleted' => __('Errors_occurred_while_products_were_deleted'), @@ -255,6 +258,7 @@ private function getStrings() 'GivenAmount' => __('Given_amount'), 'back' => __('back'), 'SendEmailToMember' => __('Send_email_to_member'), + 'ChangeStatus' => __('Change_status'), ], 'pickupDay' => [ 'WereTheProductsPickedUp' => __('Were_the_products_picked_up?'), From df7ea1cc3ccd064a6b69cf6dbe4b89a425c71a10 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 27 Oct 2022 22:48:26 +0200 Subject: [PATCH 245/646] corrected admin translations in non-admin files --- resources/locales/admin.pot | 25 ------------------ resources/locales/de_DE/default.mo | Bin 75863 -> 76145 bytes resources/locales/de_DE/default.po | 14 +++++----- resources/locales/default.pot | 8 +++++- resources/locales/en_US/default.mo | Bin 71425 -> 71679 bytes resources/locales/en_US/default.po | 14 +++++----- src/Controller/CustomersController.php | 2 +- .../Table/PurchasePriceProductsTable.php | 2 +- templates/pdf/order_confirmation.php | 2 +- 9 files changed, 26 insertions(+), 41 deletions(-) delete mode 100644 resources/locales/admin.pot diff --git a/resources/locales/admin.pot b/resources/locales/admin.pot deleted file mode 100644 index 50b07d6ea8..0000000000 --- a/resources/locales/admin.pot +++ /dev/null @@ -1,25 +0,0 @@ -# LANGUAGE translation of CakePHP Application -# Copyright YEAR NAME -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-08-18 18:16+0200\n" -"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" -"Last-Translator: NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" - -msgid "Filename_Terms-of-use" -msgstr "" - -msgid "Purchase_price" -msgstr "" - -msgid "Deposit" -msgstr "" - diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index 6d4e045ca12c340e0be8670da12a713b14b02523..4684ff6b39d954cf0ef2a3aeec9d036fb15016e2 100644 GIT binary patch delta 19864 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 Y-Fo-vIIv4n-~I{Rk~XJ%UZ>>$0ci}7M*si- delta 19779 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 diff --git a/resources/locales/de_DE/default.po b/resources/locales/de_DE/default.po index 99e3b3bd51..fadfefc4e6 100644 --- a/resources/locales/de_DE/default.po +++ b/resources/locales/de_DE/default.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-10-27 22:11+0200\n" -"PO-Revision-Date: 2022-10-27 22:13+0200\n" +"POT-Creation-Date: 2022-10-27 22:40+0200\n" +"PO-Revision-Date: 2022-10-27 22:43+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -279,6 +279,9 @@ msgstr "Deine E-Mail-Adresse wurde bereits aktiviert oder der Aktivierungscode w msgid "Your_email_address_has_been_activated_successfully." msgstr "Deine E-Mail-Adresse wurde erfolgreich aktiviert." +msgid "Filename_Terms-of-use" +msgstr "Nutzungsbedingungen" + msgid "Your_email_address_has_been_activated_successfully._Your_password_has_been_sent_to_you." msgstr "Deine E-Mail-Adresse wurde erfolgreich aktiviert, dein Passwort wurde dir soeben zugeschickt." @@ -1731,7 +1734,6 @@ msgstr "Das Produkt mit der ID {0} ist nicht vorhanden." msgid "The_attribute_does_not_exist:_{0}" msgstr "Die Variante existiert nicht: {0}" -#, fuzzy msgid "Please_accept_the_information_about_right_of_withdrawal" msgstr "Bitte akzeptiere die Information über das Rücktrittsrecht und dessen Ausschluss." @@ -1951,6 +1953,9 @@ msgstr "gelöscht" msgid "The_price_needs_to_be_greater_or_equal_than_0." msgstr "Der Preis muss eine positive Zahl sein." +msgid "Purchase_price" +msgstr "Einkaufspreis" + msgid "The_quantity_needs_to_be_a_number." msgstr "Der Lagerstand muss eine Zahl sein." @@ -2921,9 +2926,6 @@ msgstr "Die Preise verstehen sich inklusive Umsatzsteuer." #~ msgid "Your_email_address_was_activated" #~ msgstr "Deine E-Mail-Adresse wurde erfolgreich aktiviert und du bist bereits eingeloggt." -#~ msgid "Filename_Terms-of-use" -#~ msgstr "Nutzungsbedingungen" - #~ msgid "Generate_orders_as_pdf?" #~ msgstr "Bestellungen als PDF generieren?" diff --git a/resources/locales/default.pot b/resources/locales/default.pot index e9fdb8e48d..79e9a1312b 100644 --- a/resources/locales/default.pot +++ b/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-10-27 22:11+0200\n" +"POT-Creation-Date: 2022-10-27 22:40+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -278,6 +278,9 @@ msgstr "" msgid "Your_email_address_has_been_activated_successfully." msgstr "" +msgid "Filename_Terms-of-use" +msgstr "" + msgid "Your_email_address_has_been_activated_successfully._Your_password_has_been_sent_to_you." msgstr "" @@ -1949,6 +1952,9 @@ msgstr "" msgid "The_price_needs_to_be_greater_or_equal_than_0." msgstr "" +msgid "Purchase_price" +msgstr "" + msgid "The_quantity_needs_to_be_a_number." msgstr "" diff --git a/resources/locales/en_US/default.mo b/resources/locales/en_US/default.mo index e7823659dcc41e2dcec905bb63d588c2011eea46..62bd4fc8fe82387143cbf99195d35b4c70c6f2db 100644 GIT binary patch delta 19871 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 F{{b-1nhyW~ delta 19760 zcmZwM2Xq$2AMWuD2?>ydgg|IX$O|E~5C|=F=}mfXQl)pKsg$LI3B8MeNG}2!q=>Xg zQ&6O;bOAw-CJG4B?)Q0T^1qyW?w&J#W_~j}GdnZ8FW~Dfe&aU#xtGKI<~v+-eH|wf zzv4ef{2Zr2c|{$kR|ChXg1s?6uE%&hj+yZVX2rmUjuVH`7=`sw{q@G&IN6pzv+gx< z*STN=PpnxRIZiHaNWchu+u8#QQ67()$VM!HComTOMGX|y*l`MCIcsNByQx?dx1a|v zVvOTD&Py`7A#W4M$%pk&Gw+9*z(>~A)>MopehG8pOH}*pP0c{1P%F?5)$V;%|BFx$ zu-|$c^D@2@){G36Mh~_^J<$l%N-RZnv;)=d7h8UYc_`; zTA7JNqS}>j#rkW>n-S2S4zn&st-wCijBlX!&abuE;}WR*8ld)eAgX==dhh^h1%5|O z*uRa57eGz84#wc%Hm-T{`2=*sR$FlvJ(Qo>c<#35hDz4Xs0mL*9lG_H0}o;@yl8!b z+WXLUCSDG8rkYs?xMVUANWxH@Yh8tzC~reeY(EC!HT2*E493v*yn2|&S_E@bPDCBT zrl@`gVm2I$MQ}c9W!?Q`vXi-j>G26_;1^g61Ku(3cSF$r)z236;4aj}FQ6uV3v~vZPU?^SFG5B$FM*nQRaD1~umrw~+JgD$hdZph zQ3Iu70RDiw{|xF0uc21x5o(2lJDW3kiI)P&AZk^4 zfVQY5?2Wo{FzVEgx8)hA0Y1gj_$BJh+(e!3bUhrWBo;+IKqu7w1JDmYv~kxZlb*l~ z)RN3YO<*%>N%x{A_&uuQUu@Z@r`hum)Wq|nCRza#us&+(N7?df)crqW96G(c_q$F} zG9@Ti!wfhCHQ*>)PD0hs#dth~deVPTOBmAI{8mI_G0N3Z^@CCOO-DWXK2*QQP-o;E z7S;QImrMZyx%xOxMy!fjfw!?Sw!=EO0riA`qd)rgH63R{tz350gc2|YE2G+XK@Iqx zEl)zVTOjrRuOy=__yV;z+im$9EJHaJgfab0yZ2B7j6j`*saP8qqrRM1F&)0u z-`rOXHO?&5hiL)20c5t23C10$CqINycoqZkAB@G<7>uz4%pRA*PL#W$`ZP*zfir5m1<80KHrJ^3}9O}MX*2kEQa=KxvXa94M(UKHEZ9xgt9+$%s*ar2a zNvJ(sf|}UpsE$)mPqYtp`oFXBd#E3&|4?s3_;53D3Do_yF`V(824pmWuBd_fV^(xg z1I|UA-j%2)Jci})IclP%N0|FsU;^bH_&zSgei%xj3XaCAxCcG>3f)pEwx%@dEHt;}L8v92Y2&LfJLOa?g1=%;^c`v5sz}U5x#URJKR1~M z1T=6@RCxyK46H|ec)r7;cpp6&G0Hr7CDcUT!3g{S)z5s)fxA)toIwx%gXJ;XXw$yY zXx3j}x;_LVaVly8tI>n|QA>OkwYNTF%##&BJy~T`ycg;dJsq`0Ut>eOjis?H6 zHG$Kp*Y|hSMBJ?7Oh@skFJCFt4b@PuWfRoiwm}WtAN5{O!aTSIHR0o^_x=ymiUf`~ zTakczJ6fYZcDCi7$cnqpATm)@OvggF5jEf$^sa=hPdC8~=t0G+pm$;zPPxCWpMW}i zD=-?rMh~7tt>AyCGm?Fxz9TGiWio2e1ofH?M&0-^YRSGvy^cq*0bWKedE6v3fwHLA zwgGA)9Z?e)YU`6x--+d@72Skdk!={v_|9H3e)t1wz>}z@x`sN8w^4iPH`#QQ88uJ@ zYTy#6`)i<9rY>r0x?nyWi)z0TwPIgekE5#_uanUe-9k;^5o*BnQ_NWiK|Mhp)LRmV zTFSbp0lT648I79IcvL_0Q2ne%9kwmD{5`6_(^FV~&FD7*I(&~Y0DY&LjssCkl^@kn zJnDm0)|UHX8Op=ZA2*^7ZwjWzR8+r5P;bRqtcK1LY(d?39ZO>9H1i-eFfZjU*cvBb6}*5k=tfL8houVE zB+wDt;YuuvuTUK%&M@zF8yrA+G`7XNsQYTqG;d8ZYN8u44lkkJhK#e!{T{49xfb$f zyUtiLdfj|yvkDl4dV-1A5_ez`44z}!l|yyd2DO(1F#*5CqIeD8#*n$@^tZ#(lt-fu zZ3^n`IF6Be|L>70Mj+EX^8qT4DtE>FI2+%^?N}Xi&o>k5fCVW}#X|T6>UBGZn$Qc> z3dAok_qRn4?NHM2uf#+IPcP z%Hy#VuCwKfww&%`1|*({TB#xEYR1dSWXA)jy*`h6@)xMnn|HB!jf!9g%H>ddxB#`J zC$SdZL%nvTJ~5}gJcdxNfx*}u_4ahZAng4K>+eTqIDwov5_Q8o>naST{1tY^L#WrX z&=T{y6-Bi#iOOmazW1F~d^RVGh)Loe$NZFzSX< zs6DHQk=PUCaU$w)rr7#Rs4dL6%(PFyT$JBIO>{V_eln_`O)i-zGDlHQb_=!FcQH4n z`_veP+M;r(fg58U9F5wtCFsGu*a)xKc(LW?HEn`gfeqLaZ(wnBD}H8X*cUk`&Lq@8 zc~+Qs87xV;G3wBa$2PbH>tlwMW~EwSL&_bo9Da^rcmuQIQ_O}zt4ujBa!C36ADPxv z^hV7*71dGbYV)KWF@o|m)QYUbf_MOf@eXQ&&oD0*U1QoeLM?G0^u;Nt2_>Ueco}BY z`~MXg&2TU3u${6EuA^>zX6s+tc$T&1x1u2GzVaA=4N+&LCF<;q!%UcL%L~wt@^Twr zjaeAq`9c}|7SrPy)I`ps4$U3wa~ls_XMS`dQ7cdg{V@>(u(Gul>hLv0ot2)L11H<~ zGIVwNcaqWTcLX(&-%wBfH)g;msENHsEn)igW@&Sx;$=|nDq;hyiF$z9sEMtx_3Kd+ zOhNU(Yd!0)4)+pBhbK`toUsir*z$E-|0n7R?xD^^`VD5u^P(Q0A!^Bcpw7x*%!t!a zhk5~O0-I11-nN1D_wK!Ia0;~ow^2*?95qn*M)Tw)FcamPsCJD}_jf^U)iBhGPC{+X zJdDE?sEHp(^?TEn9rtt7aZXf+aj1?eqdIPgdTqL(IvkE#v5Bbf#zNGSZo?ovfvUfR zYX28%La%H*c#|o6Q0?5}WHdl^48qo!54)jWpDCD#t56fXV7-UlGl5#l^qbArWk&67 zIO;Xah3daJ>NT&4^>GOn())jlOc4TEwwRyMN|>K=cWjJFs3$#-TEeGT6GOi+|18%M z_1-VV!nhB$*SC=Y_=AC2^1_(khaV%XMz~js#$o?AkclVo6K2Mjs1Aa*n!Srby*`am zD>4AXFxk4y`Xz=EKWNKmt+z0Q_;b_>27YCX!u)#wi`zg8)BruugA-64uCnEAsFnB` z)$S2$tFmk}6E2N9T=h}yx}ygtpax!r>TkRC2)YXVN=B#rHfjaZZ#Pev4HYklS+NGH zU~~kun)$ei_y3dHQ{5n{O3;AUo*+{wRw#^n3r-zjKL156&Z(t zI19D+ORQV0-=f-`#hmy%>a~1n&AH30WGU3d8l(3ubIE86rl4+Igj#_wZG+>eCwhol zfehc6342iSMAVZt#9Y|l)=xnVu++x)quQTG_4Cli-Hf}WMS#UcW?kUNi`3&5B*&N=gFwyRn%d; zfqKH{sHG43)+}8l>Wfwo^{H-xns^7)#D}3KJ_B_a=c87173$EXU|u|erSLX-|Nb9! z!2HQ1AL`ewAnIqbB&vf7s3)w88mJv=sfS<;CZQ&@88z{5P!s(D^+1m?0s{}42P%l_ zuk1nAUwc@Oz=!xQs-w%O56&Ib1YV<7BKVML7lkS>!gySVe)uy+;|0`2pJM^ccGzr5 zMbyC6P!HJrFzc_w)t-O`8jhO4MAVYaMxEw0s2jGRmUaiKqr<4f^ecA7JGQ>j5wjH? zP!sKj>SriwoYANiOm@k{kXeD6$YIozTt#igP1FDnt$yE`JH z?U)h2xAD^$Liq-c!p9hj@0~Rhn1FinrKtNipdN4!hT}2RZ^l(ycAt?cKp^C2Gt)$C z1?yYZ>ZmhP8}(!jQ4?v2ns9g25|6O)1*rCGP%F2|mcK@A;eO2HQQwZqYaD^RcJ0n~ea3pJsKs0Vm#%P&zY<8#g&Ru5|B3SfZV z|3oqx=q=PZm7gZ0ozBR%8fj3&x-(FbT`xD%69X zM^_!+C8O8q1*+q87t9ldUK9;{^{*Pt~R-qhynZJ}^C-mS-tc(Xy z{ieHO{$5ZL%TjKG`qIuq)u&u>&C*;W5J|x2H&f1oTGGm>cr(n71F;BB#+>*ihT~Dp zg}-5L{10_z!mpZgdCWt(1;*kKEQ%kyWORrQV>I4D4H$UM{E?{;7NlGgb6`JIM-$P5 zE3rHt#0Y$aQJDL>>8Bhj-V!}H7&Xou%!_Uc89mt<)Zw^;`ZVVK-Mkg`QA;%n-^S0e zH2#bF@D#maCRQ0Wa7$Yrf*Lp(wNh(s{eJXNzHI7U=QSBUS;S3qh)SV880D?Cumt6% zsJCMR>hMiRO<)OX1va4u`~%aY?;qx{W<<5mfdNN~Lp)$b`(KabFZk+;ptRz~md{{S+DsaS$) zco=o4?qfdm`_t4H#2Cs=F+UDNJ@I1HmTX6TNA92pU!hhe`i>c}Eo$$RP_N?#bQ_S_ zOC}Hl@0wGe1NHh9MNQ-_)EQ}E>-%C5<*^um(=h|iM_*iqez*d)MQc$jwG%breHell z?y~+tWbP2qKu=KvXTE1T@SyfC7BxU=Yh~1gYolJ%W~e9Xi5hsMtsje;z%LAWq#>T7Ia#K`??NJZX3xjbCYK5ku-hz3k z2ib(`Z@WvT44M5l@Whs#2WH6WKO)}r@Ih}w#ysFk>a`jFkl zVwmxvxxXBGD0ebt{{J5tozk_KfLE~;hW%|mk+rcTQ3#i@JXudjI|JD4Br-9$-7{^w`|E3w0)5TOt$ z`Efs1z#BLLJ^z~fR$*t#2eBl^KIIn^+h8gD7NcDboUJG?tKSVw80@RXkL)~`@3!%?*Q!avPTuGM>Ro81~AnKx0&Y1JQ#EF&FMcovBl=c>nW|xkaD^ z2D~v0rlXeZD~!ckww&4V@eW)aixMA;n(!vnik?92^&hDIGWz&<4{t%# zAy4peeZ2oBQ<^{p0xMAiUB+4%md?lf+O{4pOh$D$1O0Fg#^6F! z`){nrFqHBIoPl>;GP-f3uaEb2b5S=WVP;&66>&Xk3vQq~&hBR>TmdzKVWBlJ(QbaTO5Mg;~%jj{)gJK zwi$e!rZ^AvMZAeRWLYx$IP)#^I>;BW?Y7)C7}J1I$IO)I!vXeuiql3e|3-EpN5; zyIeBb<2|Sk!xfCizfgM`n#C-66za7pgc_g*>QpyGb=(cL$Nf+%GtAb1gj%8HHlBj| z^d3g_?_MOMC%cWB>3vj3k8S*wE&GOa{w6n$WMP0j{8)^e(FXBO8Bdp`M;>2=f>I0m-7?U zhv=X!KfoBuIm6BOpb~0A$(Td$|9UbtF%{L3e|B>wnqgteLs5IZ3=82l)UVuS^ubU0 zPdA?6lnPv(% zo8Pf*)({&*-AJ|JiYNYvdR_Wlr+cHXWb!L%_Z9W2)RiTFiF|oqtv}aK1o*f){Ybj< zlLnG*)94cgxQdZqVe9XbFG2nmDbfzq%+{%GKk5fiE{pseI1fo3$&aD!R@7C6w1MxB z_tFo=Qqlz)>h;p~4Gr~^+nsce{1zNYJ=^VkPrfWkm&bN^pLja*KVVVP;ItL6PN8i< zQgzzs%@{_SuG5MRhLh7PHA$V3rjdV0qdcT8ux*v+4@}N(+(0ab{CLurl$%rTKp%JTh#J0e^`^}q>O+I~vICALFp6?X zDw~k!yWz~G%oo@hOycw4#OWq3*WQy%>@~3mq}k-(Bc6oOq^!h#FwLE3_zx+`-mmac z+PLe;M3B)njY@v9oxe!uDZfL?Y3s(3Z%opa!^S=!Uy6Gg*-kG}&iTdwrzjt$?O!%F ziTp6~!Dq{7vw*pVmSF-_#fq#G;Tw_HL>B8_n@w`q(-D*V!GxM z43Q}H7(oe3g6w*)BePkx< zI;j+P)1WR!Q&|NwQu&HlKirRVh>s(FguJdV49*Y4?vk%+%K=z|m@jD+ZEKl9ytQkH z=?|~Ec9O3_eH*?1(<#g*=?{wYP*+%2j||GBuKG-)msyGehLuT1p@CS+fkISk?%_zT?-7(5b8c8wgq)XlV6DaQR92BCibT7wtSqmVsI+Z z?m6if(jijXwTl7Mu77O)J_gyoR9A*{=YRLG|M>{Cr_p?Ztw>c#GbvvtP2k3Xqye-k zi9`Q)BYyy)el+pVi3L)Zl{A9#eB%2^JIUW5bs}Dwr0W35qYT#^+O%YR=X)|~*AUxq zJ+VHdZKSEB$)qj}v`CV4jiy}5=4;|IQae&p>grP0gZxGEemIhpb`7xkyo}`z;y-58&NI6L@h?gK9K|Yo=+upkm zJCm+bpG?26NarXIqI?J6yw+;}ms0UN{*8a(Np46W9VTTU1(2FEz$@zZl7B*~KzTLo zTVpHY_sB<}E+1lDDZfj*hWH_|#`qRyCN`P+v83;axqbQ10#bF-3(}XQV>D`tx~`LN zN8<*lD?2GKsSWk9*q5Yhmu+8>w*76}{kVgahgc-_zmfcD+t=3T)cb#!Kr_;NRCc7{ zPTLV7=VuzGyiryxiqwd9H82b5XIuZp8|~^7FG!nX#0rr**}DG3b^U2@I_dj=&=x|u zp)d`fP_9pY23DrLnMrK2ZQjI(cq}QG4c4-Q6d^WC_u~8LZ{q{#a~b*Wc#`;W>i_rq zpGfd+%A@c$jZ~*AhH@6tdh#=Da6FDAHk8<8HL_PB{F1txq!Z+$=;v=+7fLJx_q=(% zPt5H@@H3)kDAXW-0^4!p=fswhk0xa!4W+IuX(aK^)aNI)Bz7!A=mkWU\n" "Language: en_US\n" @@ -279,6 +279,9 @@ msgstr "Your email address was already activated or the activation code was not msgid "Your_email_address_has_been_activated_successfully." msgstr "Your email address has been activated successfully." +msgid "Filename_Terms-of-use" +msgstr "Terms-of-use" + msgid "Your_email_address_has_been_activated_successfully._Your_password_has_been_sent_to_you." msgstr "Your email address has been activated successfully, your password has been sent to you." @@ -1731,7 +1734,6 @@ msgstr "The product with id {0} does not exist." msgid "The_attribute_does_not_exist:_{0}" msgstr "The attribute does not exist: {0}" -#, fuzzy msgid "Please_accept_the_information_about_right_of_withdrawal" msgstr "Please accept the information about the right of withdrawal." @@ -1951,6 +1953,9 @@ msgstr "deleted" msgid "The_price_needs_to_be_greater_or_equal_than_0." msgstr "The price needs to be greater or equal than 0." +msgid "Purchase_price" +msgstr "Purchase price" + msgid "The_quantity_needs_to_be_a_number." msgstr "The quantity needs to be a number." @@ -2921,9 +2926,6 @@ msgstr "The prices include the VAT." #~ msgid "Your_email_address_was_activated" #~ msgstr "Your email address was successfully activated and you are already signed in." -#~ msgid "Filename_Terms-of-use" -#~ msgstr "Terms-of-use" - #~ msgid "Generate_orders_as_pdf?" #~ msgstr "Generate orders as PDF?" diff --git a/src/Controller/CustomersController.php b/src/Controller/CustomersController.php index 188cb32ffe..3ba412616e 100644 --- a/src/Controller/CustomersController.php +++ b/src/Controller/CustomersController.php @@ -149,7 +149,7 @@ public function activateEmailAddress() ]); if (Configure::read('app.termsOfUseEnabled')) { - $email->addAttachments([__d('admin', 'Filename_Terms-of-use').'.pdf' => ['data' => $this->generateTermsOfUsePdf($customer), 'mimetype' => 'application/pdf']]); + $email->addAttachments([__('Filename_Terms-of-use').'.pdf' => ['data' => $this->generateTermsOfUsePdf($customer), 'mimetype' => 'application/pdf']]); } $email->addToQueue(); diff --git a/src/Model/Table/PurchasePriceProductsTable.php b/src/Model/Table/PurchasePriceProductsTable.php index 4f5e00a206..be2329b201 100644 --- a/src/Model/Table/PurchasePriceProductsTable.php +++ b/src/Model/Table/PurchasePriceProductsTable.php @@ -262,7 +262,7 @@ public function savePurchasePriceTax($taxId, $productId, $oldProduct): Array } $changedTaxInfoForMessage[] = [ - 'label' => __d('admin', 'Purchase_price') . ': ', + 'label' => __('Purchase_price') . ': ', 'oldTaxRate' => $oldPurchasePriceTaxRate, 'newTaxRate' => $taxRate, ]; diff --git a/templates/pdf/order_confirmation.php b/templates/pdf/order_confirmation.php index 8e8da16c2b..f03c8b3bc4 100644 --- a/templates/pdf/order_confirmation.php +++ b/templates/pdf/order_confirmation.php @@ -47,7 +47,7 @@ if (Configure::read('app.isDepositEnabled')) { $widths[4] = 45; - $headers[] = __d('admin', 'Deposit'); + $headers[] = __('Deposit'); } else { $widths[1] = 265; $widths[4] = 0; From 8e1785824392280613342d4c5f1092e3bdec606c Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 27 Oct 2022 22:59:43 +0200 Subject: [PATCH 246/646] shorter names for product edit buttons --- .../Admin/resources/locales/de_DE/admin.mo | Bin 70903 -> 70735 bytes .../Admin/resources/locales/de_DE/admin.po | 37 +++++++++++------- plugins/Admin/resources/locales/default.pot | 13 +++--- .../Admin/resources/locales/en_US/admin.mo | Bin 66283 -> 66135 bytes .../Admin/resources/locales/en_US/admin.po | 37 +++++++++++------- plugins/Admin/templates/Products/index.php | 13 +++--- ...gPriceWithSurchargeForSelectedProducts.php | 2 +- .../button/deleteSelectedProducts.php | 2 +- .../editDeliveryRhythmForSelectedProducts.php | 2 +- .../button/editStatusForSelectedProducts.php | 2 +- 10 files changed, 66 insertions(+), 42 deletions(-) diff --git a/plugins/Admin/resources/locales/de_DE/admin.mo b/plugins/Admin/resources/locales/de_DE/admin.mo index b1df892c8301f9a84eb224024fa0333d60bda690..1195f395564104239e13c2daddb66c69a8d0dc03 100644 GIT binary patch delta 16202 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 Rjdjy^2d8cR?LtKP{{!4{J+%M; delta 16357 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\n" "Language: de_DE\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.2\n" msgid "Activities" msgstr "Aktivitäten" @@ -1827,6 +1827,9 @@ msgstr "Neu?" msgid "Delivery_rhythm" msgstr "Lieferrhythmus" +msgid "Selected_products" +msgstr "Ausgewählte Produkte" + msgid "Storage_location" msgstr "Lagerort" @@ -2076,17 +2079,17 @@ msgstr "Vielen Dank, dass du uns belieferst!" msgid "Customer_ID" msgstr "Mitglieds-Nr." -msgid "Calculate_selling_price_with_surcharge_for_selected_products" -msgstr "Verkaufspreis mit Aufschlag für ausgewählte Produkte berechnen" +msgid "Calculate_selling_price" +msgstr "Verkaufspreis berechnen" -msgid "Delete_selected_products" -msgstr "Ausgewählte Produkte löschen" +msgid "Delete" +msgstr "Löschen" -msgid "Edit_delivery_rhythm_for_selected_products" -msgstr "Lieferrhythmus für ausgewählte Produkte bearbeiten" +msgid "Edit_delivery_rhythm" +msgstr "Lieferrhythmus ändern" -msgid "Edit_status_for_selected_products" -msgstr "Status für ausgewählte Produkte bearbeiten" +msgid "Edit_status" +msgstr "Status ändern" msgid "Generate_product_cards" msgstr "Produktkarten generieren" @@ -2403,6 +2406,15 @@ msgstr "Das tatsächlich gelieferte Gewicht wird evtl. noch angepasst, d. h. der msgid "Product_ID" msgstr "Produkt-Nr." +#~ msgid "Delete_selected_products" +#~ msgstr "Ausgewählte Produkte löschen" + +#~ msgid "Edit_delivery_rhythm_for_selected_products" +#~ msgstr "Lieferrhythmus für ausgewählte Produkte bearbeiten" + +#~ msgid "Edit_status_for_selected_products" +#~ msgstr "Status für ausgewählte Produkte bearbeiten" + #~ msgid "Software_update_version" #~ msgstr "Software-Update / Version" @@ -2500,9 +2512,6 @@ msgstr "Produkt-Nr." #~ msgid "Zero_means_no_limit_and_global_limit_of_{0}_is_used." #~ msgstr "0 bedeutet: globales Limit von {0} wird verwendet." -#~ msgid "Delete" -#~ msgstr "Löschen" - #~ msgid "Additional_in_{0}" #~ msgstr "Zusätzlich in {0}" diff --git a/plugins/Admin/resources/locales/default.pot b/plugins/Admin/resources/locales/default.pot index 061c675da4..f1120a4e22 100644 --- a/plugins/Admin/resources/locales/default.pot +++ b/plugins/Admin/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-10-27 21:22+0200\n" +"POT-Creation-Date: 2022-10-27 22:55+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -1817,6 +1817,9 @@ msgstr "" msgid "Delivery_rhythm" msgstr "" +msgid "Selected_products" +msgstr "" + msgid "Storage_location" msgstr "" @@ -2066,16 +2069,16 @@ msgstr "" msgid "Customer_ID" msgstr "" -msgid "Calculate_selling_price_with_surcharge_for_selected_products" +msgid "Calculate_selling_price" msgstr "" -msgid "Delete_selected_products" +msgid "Delete" msgstr "" -msgid "Edit_delivery_rhythm_for_selected_products" +msgid "Edit_delivery_rhythm" msgstr "" -msgid "Edit_status_for_selected_products" +msgid "Edit_status" msgstr "" msgid "Generate_product_cards" diff --git a/plugins/Admin/resources/locales/en_US/admin.mo b/plugins/Admin/resources/locales/en_US/admin.mo index 498a04a0067f5682bb130a1d08417615ef0a5432..0d16bdc393445439b3ef98698c201087ad656513 100644 GIT binary patch delta 16122 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 sr)|C6eit<8 diff --git a/plugins/Admin/resources/locales/en_US/admin.po b/plugins/Admin/resources/locales/en_US/admin.po index ef5cce7cc2..1cafd4a6e0 100644 --- a/plugins/Admin/resources/locales/en_US/admin.po +++ b/plugins/Admin/resources/locales/en_US/admin.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-10-27 21:22+0200\n" -"PO-Revision-Date: 2022-10-27 21:22+0200\n" +"POT-Creation-Date: 2022-10-27 22:55+0200\n" +"PO-Revision-Date: 2022-10-27 22:56+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: en_US\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.2\n" msgid "Activities" msgstr "Activities" @@ -1824,6 +1824,9 @@ msgstr "New?" msgid "Delivery_rhythm" msgstr "Delivery rhythm" +msgid "Selected_products" +msgstr "Selected products" + msgid "Storage_location" msgstr "Storage location" @@ -2073,17 +2076,17 @@ msgstr "Thank you very much for delivering your products to us!" msgid "Customer_ID" msgstr "Customer-ID" -msgid "Calculate_selling_price_with_surcharge_for_selected_products" -msgstr "Calculate selling price with surcharge for selected products" +msgid "Calculate_selling_price" +msgstr "Calculate selling price" -msgid "Delete_selected_products" -msgstr "Delete selected products" +msgid "Delete" +msgstr "Delete" -msgid "Edit_delivery_rhythm_for_selected_products" -msgstr "Edit delivery rhythm for selected products" +msgid "Edit_delivery_rhythm" +msgstr "Edit delivery rhythm" -msgid "Edit_status_for_selected_products" -msgstr "Edit status for selected products" +msgid "Edit_status" +msgstr "Edit status" msgid "Generate_product_cards" msgstr "Generate product cards" @@ -2400,6 +2403,15 @@ msgstr "The delivered weight will eventually be adapted, so the price can change msgid "Product_ID" msgstr "ProductID" +#~ msgid "Delete_selected_products" +#~ msgstr "Delete selected products" + +#~ msgid "Edit_delivery_rhythm_for_selected_products" +#~ msgstr "Edit delivery rhythm for selected products" + +#~ msgid "Edit_status_for_selected_products" +#~ msgstr "Edit status for selected products" + #~ msgid "Software_update_version" #~ msgstr "Software update / Version" @@ -2495,9 +2507,6 @@ msgstr "ProductID" #~ msgid "Zero_means_no_limit_and_global_limit_of_{0}_is_used." #~ msgstr "0 means: global limit of {0} is used." -#~ msgid "Delete" -#~ msgstr "Delete" - #~ msgid "Additional_in_{0}" #~ msgstr "Additional in {0}" diff --git a/plugins/Admin/templates/Products/index.php b/plugins/Admin/templates/Products/index.php index 2fb9237b16..2423921b3c 100644 --- a/plugins/Admin/templates/Products/index.php +++ b/plugins/Admin/templates/Products/index.php @@ -344,11 +344,14 @@ echo ''; echo '
'; - echo $this->element('productList/button/deleteSelectedProducts'); - echo $this->element('productList/button/calculateSellingPriceWithSurchargeForSelectedProducts'); - echo $this->element('productList/button/generateProductCardsOfSelectedProducts'); - echo $this->element('productList/button/editStatusForSelectedProducts'); - echo $this->element('productList/button/editDeliveryRhythmForSelectedProducts'); + if (!empty($products)) { + echo '
' . __d('admin', 'Selected_products') . ':
'; + echo $this->element('productList/button/deleteSelectedProducts'); + echo $this->element('productList/button/calculateSellingPriceWithSurchargeForSelectedProducts'); + echo $this->element('productList/button/generateProductCardsOfSelectedProducts'); + echo $this->element('productList/button/editStatusForSelectedProducts'); + echo $this->element('productList/button/editDeliveryRhythmForSelectedProducts'); + } echo '
'; ?> diff --git a/plugins/Admin/templates/element/productList/button/calculateSellingPriceWithSurchargeForSelectedProducts.php b/plugins/Admin/templates/element/productList/button/calculateSellingPriceWithSurchargeForSelectedProducts.php index 6658e4e207..c493a956bd 100644 --- a/plugins/Admin/templates/element/productList/button/calculateSellingPriceWithSurchargeForSelectedProducts.php +++ b/plugins/Admin/templates/element/productList/button/calculateSellingPriceWithSurchargeForSelectedProducts.php @@ -23,4 +23,4 @@ $this->element('addScript', [ 'script' => Configure::read('app.jsNamespace') . ".ModalProductCalculateSellingPriceWithSurcharge.init();" ]); -echo ' ' . __d('admin', 'Calculate_selling_price_with_surcharge_for_selected_products') . ''; +echo ' ' . __d('admin', 'Calculate_selling_price') . ''; diff --git a/plugins/Admin/templates/element/productList/button/deleteSelectedProducts.php b/plugins/Admin/templates/element/productList/button/deleteSelectedProducts.php index 5953f32ac5..0f989a46d2 100644 --- a/plugins/Admin/templates/element/productList/button/deleteSelectedProducts.php +++ b/plugins/Admin/templates/element/productList/button/deleteSelectedProducts.php @@ -23,4 +23,4 @@ $this->element('addScript', [ 'script' => Configure::read('app.jsNamespace') . ".ModalProductDelete.init();" ]); -echo ' ' . __d('admin', 'Delete_selected_products') . ''; +echo ' ' . __d('admin', 'Delete') . ''; diff --git a/plugins/Admin/templates/element/productList/button/editDeliveryRhythmForSelectedProducts.php b/plugins/Admin/templates/element/productList/button/editDeliveryRhythmForSelectedProducts.php index 6f99cb0ab9..1c4bc83c57 100644 --- a/plugins/Admin/templates/element/productList/button/editDeliveryRhythmForSelectedProducts.php +++ b/plugins/Admin/templates/element/productList/button/editDeliveryRhythmForSelectedProducts.php @@ -23,4 +23,4 @@ $this->element('addScript', [ 'script' => Configure::read('app.jsNamespace') . ".ModalProductDeliveryRhythmEdit.initBulk();" ]); -echo ' ' . __d('admin', 'Edit_delivery_rhythm_for_selected_products') . ''; +echo ' ' . __d('admin', 'Edit_delivery_rhythm') . ''; diff --git a/plugins/Admin/templates/element/productList/button/editStatusForSelectedProducts.php b/plugins/Admin/templates/element/productList/button/editStatusForSelectedProducts.php index 57819e0aac..5917a9e131 100644 --- a/plugins/Admin/templates/element/productList/button/editStatusForSelectedProducts.php +++ b/plugins/Admin/templates/element/productList/button/editStatusForSelectedProducts.php @@ -25,4 +25,4 @@ $this->element('addScript', [ 'script' => Configure::read('app.jsNamespace') . ".ModalProductStatusEditBulk.init();" ]); -echo ' ' . __d('admin', 'Edit_status_for_selected_products') . ''; +echo ' ' . __d('admin', 'Edit_status') . ''; From 7cb39396ff77ebf916b898c132c497c8ffbdeac3 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 27 Oct 2022 23:06:56 +0200 Subject: [PATCH 247/646] install eslint globally --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d941f04f30..9292ea0a1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,8 @@ RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm RUN apk update && \ apk add npm gettext && \ - npm install -g npm-check-updates + npm install -g npm-check-updates && \ + npm install -g eslint #avoid permission error on gitpod on running npm install RUN npm config set cache /var/www/html/tmp --global From 5a7e7b04e90392f558ef8c17d69a0f93bb42f630 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 27 Oct 2022 23:07:19 +0200 Subject: [PATCH 248/646] fix error --- .../Admin/webroot/js/modal/modal-product-status-edit-bulk.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js b/plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js index 9ee7eea729..d30129b881 100644 --- a/plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js +++ b/plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js @@ -54,7 +54,7 @@ foodcoopshop.ModalProductStatusEditBulk = { modalSelector, foodcoopshop.LocalizedJs.admin.ChangeStatus, html, - buttons, + buttons ); foodcoopshop.Modal.bindSuccessButton(modalSelector, function() { From 7d80e238697dc45eec5fdd56458016d5c9454078 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 27 Oct 2022 23:08:39 +0200 Subject: [PATCH 249/646] eslint already installed in container --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88c66dae90..b8de040565 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,9 +52,7 @@ jobs: run: docker exec -w /var/www/html fcs-php-nginx php ./vendor/bin/phpstan analyze -c phpstan.neon --no-interaction --no-progress - name: ESLint - run: | - npm install -g eslint - bash ./devtools/eslint.sh + run: docker exec -w /var/www/html fcs-php-nginx bash ./devtools/eslint.sh - name: PHPUnit Tests run: docker exec -w /var/www/html fcs-php-nginx php ./vendor/bin/phpunit From 99b1daf8f7f528cf2f68d7b72bfaf6e5a0426756 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 28 Oct 2022 20:48:03 +0200 Subject: [PATCH 250/646] add action log --- .../Admin/resources/locales/de_DE/admin.mo | Bin 70735 -> 71043 bytes .../Admin/resources/locales/de_DE/admin.po | 10 ++++++++-- plugins/Admin/resources/locales/default.pot | 8 +++++++- .../Admin/resources/locales/en_US/admin.mo | Bin 66135 -> 66427 bytes .../Admin/resources/locales/en_US/admin.po | 10 ++++++++-- .../src/Controller/ProductsController.php | 17 ++++++++++++++++- 6 files changed, 39 insertions(+), 6 deletions(-) diff --git a/plugins/Admin/resources/locales/de_DE/admin.mo b/plugins/Admin/resources/locales/de_DE/admin.mo index 1195f395564104239e13c2daddb66c69a8d0dc03..f2d33352013e5058c62be5dc43bb09d18962cad0 100644 GIT binary patch delta 17239 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 T?+1G%XY1a>UD!*Zv*-T+10xqC delta 17159 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 diff --git a/plugins/Admin/resources/locales/de_DE/admin.po b/plugins/Admin/resources/locales/de_DE/admin.po index b1e2bd98d2..f81b167b70 100644 --- a/plugins/Admin/resources/locales/de_DE/admin.po +++ b/plugins/Admin/resources/locales/de_DE/admin.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-10-27 22:55+0200\n" -"PO-Revision-Date: 2022-10-27 22:55+0200\n" +"POT-Creation-Date: 2022-10-28 20:44+0200\n" +"PO-Revision-Date: 2022-10-28 20:47+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: de_DE\n" @@ -648,6 +648,12 @@ msgstr "Das Produkt {0} vom Hersteller {1} wird nicht mehr als \"neu\" angezeigt msgid "The_product_{0}_from_manufacturer_{1}_is_shown_as_new_from_now_on_for_the_next_{2}_days." msgstr "Das Produkt {0} vom Hersteller {1} wird jetzt {2} Tage lang als \"neu\" angezeigt." +msgid "{0,plural,=1{1_product_was} other{#_products_were}}_deactivated." +msgstr "{0,plural,=1{Ein Produkt wurde} other{# Produkte wurden}} deaktiviert." + +msgid "{0,plural,=1{1_product_was} other{#_products_were}}_activated." +msgstr "{0,plural,=1{Ein Produkt wurde} other{# Produkte wurden}} aktiviert." + msgid "The_product_{0}_from_manufacturer_{1}_was_deactivated." msgstr "Das Produkt {0} vom Hersteller {1} wurde deaktiviert." diff --git a/plugins/Admin/resources/locales/default.pot b/plugins/Admin/resources/locales/default.pot index f1120a4e22..837fcc1ab7 100644 --- a/plugins/Admin/resources/locales/default.pot +++ b/plugins/Admin/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-10-27 22:55+0200\n" +"POT-Creation-Date: 2022-10-28 20:44+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -647,6 +647,12 @@ msgstr "" msgid "The_product_{0}_from_manufacturer_{1}_is_shown_as_new_from_now_on_for_the_next_{2}_days." msgstr "" +msgid "{0,plural,=1{1_product_was} other{#_products_were}}_deactivated." +msgstr "" + +msgid "{0,plural,=1{1_product_was} other{#_products_were}}_activated." +msgstr "" + msgid "The_product_{0}_from_manufacturer_{1}_was_deactivated." msgstr "" diff --git a/plugins/Admin/resources/locales/en_US/admin.mo b/plugins/Admin/resources/locales/en_US/admin.mo index 0d16bdc393445439b3ef98698c201087ad656513..2fdb4754334890ef5fa0d8f5d1f8823b8604220a 100644 GIT binary patch delta 13017 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 delta 12942 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 WPOhJlTCn=F(Y?R^)WhS9$NvF=t@IQC diff --git a/plugins/Admin/resources/locales/en_US/admin.po b/plugins/Admin/resources/locales/en_US/admin.po index 1cafd4a6e0..2a8d3cc9a1 100644 --- a/plugins/Admin/resources/locales/en_US/admin.po +++ b/plugins/Admin/resources/locales/en_US/admin.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-10-27 22:55+0200\n" -"PO-Revision-Date: 2022-10-27 22:56+0200\n" +"POT-Creation-Date: 2022-10-28 20:44+0200\n" +"PO-Revision-Date: 2022-10-28 20:45+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: en_US\n" @@ -648,6 +648,12 @@ msgstr "The product {0} from manufacturer {1} is not shown as \"new\" any more." msgid "The_product_{0}_from_manufacturer_{1}_is_shown_as_new_from_now_on_for_the_next_{2}_days." msgstr "The product {0} from manufacturer {1} is shown as \"new\" from now on for the next {2} days." +msgid "{0,plural,=1{1_product_was} other{#_products_were}}_deactivated." +msgstr "{0,plural,=1{One product was} other{# products were}} deactivated." + +msgid "{0,plural,=1{1_product_was} other{#_products_were}}_activated." +msgstr "{0,plural,=1{One product was} other{# products were}} activated." + msgid "The_product_{0}_from_manufacturer_{1}_was_deactivated." msgstr "The product {0} of manufacturer {1} has been deactivated." diff --git a/plugins/Admin/src/Controller/ProductsController.php b/plugins/Admin/src/Controller/ProductsController.php index 2c6cfab0d1..cf0000e540 100644 --- a/plugins/Admin/src/Controller/ProductsController.php +++ b/plugins/Admin/src/Controller/ProductsController.php @@ -1735,7 +1735,7 @@ public function changeStatusBulk() $productIds = $this->request->getData('productIds'); $status = (int) $this->request->getData('status'); - + $data = []; foreach($productIds as $productId) { $productId = (int) $productId; @@ -1743,13 +1743,28 @@ public function changeStatusBulk() } try { + $this->Product->changeStatus($data); + $actionLogMessage = __d('admin', '{0,plural,=1{1_product_was} other{#_products_were}}_deactivated.', [ + count($productIds), + ]); + $actionLogType = 'product_set_inactive'; + if ($status) { + $actionLogMessage = __d('admin', '{0,plural,=1{1_product_was} other{#_products_were}}_activated.', [ + count($productIds), + ]); + $actionLogType = 'product_set_active'; + } + $this->Flash->success($actionLogMessage); + $this->ActionLog->customSave($actionLogType, $this->AppAuth->getUserId(), 0, 'products', $actionLogMessage . '
Ids: ' . join(',', $productIds)); $this->set([ 'status' => 1, 'msg' => __d('admin', 'Saving_successful.'), ]); + $this->viewBuilder()->setOption('serialize', ['status', 'msg']); + } catch (InvalidParameterException $e) { return $this->sendAjaxError($e); } From 70b2a217b0b1472f72f5c83d74e9e14329cf7219 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 28 Oct 2022 21:00:06 +0200 Subject: [PATCH 251/646] add testChangeProductStatusBulk --- .../src/Controller/ProductsControllerTest.php | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php b/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php index 7dd98ba221..9e26cfa558 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php @@ -46,7 +46,26 @@ public function testChangeProductStatus() 'Products.id_product' => $productId ] ])->first(); - $this->assertEquals($product->active, $status, 'changing product status did not work'); + $this->assertEquals($product->active, $status); + } + + public function testChangeProductStatusBulk() + { + $this->loginAsSuperadmin(); + $productIds = [60, 102, 103]; + $status = APP_OFF; + $this->ajaxPost('/admin/products/changeStatusBulk', [ + 'productIds' => $productIds, + 'status' => APP_OFF, + ]); + $products = $this->Product->find('all', [ + 'conditions' => [ + 'Products.id_product IN' => $productIds + ] + ]); + foreach ($products as $product) { + $this->assertEquals($product->active, $status); + } } public function testEditSellingPriceWithInvalidPriceAsSuperadmin() From ab62edf7641817fda722e0371619a0380c49dd88 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 28 Oct 2022 21:04:50 +0200 Subject: [PATCH 252/646] =?UTF-8?q?better=20wording:=20ausgew=C3=A4hlt=20?= =?UTF-8?q?=3D>=20markiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/resources/locales/de_DE/admin.mo | Bin 71043 -> 71034 bytes .../Admin/resources/locales/de_DE/admin.po | 8 ++++---- resources/locales/de_DE/default.mo | Bin 76145 -> 76142 bytes resources/locales/de_DE/default.po | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/Admin/resources/locales/de_DE/admin.mo b/plugins/Admin/resources/locales/de_DE/admin.mo index f2d33352013e5058c62be5dc43bb09d18962cad0..be2f26907a68a45bb396d697c59d375aaa7b05af 100644 GIT binary patch delta 5914 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 Oul4^A9Y4Rh$$tS7\n" "Language: de_DE\n" @@ -1834,7 +1834,7 @@ msgid "Delivery_rhythm" msgstr "Lieferrhythmus" msgid "Selected_products" -msgstr "Ausgewählte Produkte" +msgstr "Markierte Produkte" msgid "Storage_location" msgstr "Lagerort" @@ -1936,7 +1936,7 @@ msgid "Order_stock_products" msgstr "Lagerprodukte bestellen" msgid "Copy_selected_email_addresses" -msgstr "Ausgewählte E-Mail-Adressen kopieren" +msgstr "Markierte E-Mail-Adressen kopieren" msgid "Generate_member_cards" msgstr "Mitgliedskarten generieren" @@ -1981,7 +1981,7 @@ msgid "Change_pickup_day" msgstr "Abholtag ändern" msgid "Cancel_selected_products" -msgstr "Ausgewählte Produkte stornieren" +msgstr "Markierte Produkte stornieren" msgid "Copy_all_email_addresses" msgstr "Alle E-Mail-Adressen kopieren" diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index 4684ff6b39d954cf0ef2a3aeec9d036fb15016e2..9961de323c720fbe606227964a4bcc6ca93d3366 100644 GIT binary patch delta 3117 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 IZ>`V!AG6nwLjV8( diff --git a/resources/locales/de_DE/default.po b/resources/locales/de_DE/default.po index fadfefc4e6..93ba47d20b 100644 --- a/resources/locales/de_DE/default.po +++ b/resources/locales/de_DE/default.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: 2022-10-27 22:40+0200\n" -"PO-Revision-Date: 2022-10-27 22:43+0200\n" +"PO-Revision-Date: 2022-10-28 21:03+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -661,7 +661,7 @@ msgid "Really_delete_selected_product?" msgstr "Ausgewähltes Produkt wirklich stornieren?" msgid "Really_delete_selected_products?" -msgstr "Ausgewählte Produkte wirklich stornieren?" +msgstr "Markierte Produkte wirklich stornieren?" msgid "You_selected_1_product" msgstr "Du hast 1 Produkt ausgewählt" From f29f085aff36e384577ea730a5924cafdfff25b4 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 28 Oct 2022 21:06:49 +0200 Subject: [PATCH 253/646] version --- .../Admin/webroot/js/modal/modal-product-status-edit-bulk.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js b/plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js index d30129b881..38a15d722d 100644 --- a/plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js +++ b/plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js @@ -5,7 +5,7 @@ * For full copyright and license information, please see LICENSE * Redistributions of files must retain the above copyright notice. * - * @since FoodCoopShop 3.1.0 + * @since FoodCoopShop 3.6.0 * @license https://opensource.org/licenses/AGPL-3.0 * @author Mario Rothauer * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com @@ -66,7 +66,7 @@ foodcoopshop.ModalProductStatusEditBulk = { foodcoopshop.Helper.disableButton($(this)); foodcoopshop.ModalProductStatusEditBulk.getSuccessHandler(modalSelector, 0); }); - + $(modalSelector).on('hidden.bs.modal', function (e) { foodcoopshop.ModalProductStatusEditBulk.getCloseHandler(modalSelector); }); From 796b68e6a5b88183f3281b04627863526fe74001 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 28 Oct 2022 21:12:09 +0200 Subject: [PATCH 254/646] 897 --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a74ea7557e..7cefdb74cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,9 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe ### Neue Funktionen / Verbesserungen - Superadmins können Tag und Uhrzeit der Cronjobs (z.B. die automatische Bestell-Erinnerung, Rechnungsversand) jetzt selber im Admin-Bereich (Homepage-Verwaltung / Einstellungen / neuer Tab "Cronjobs") ändern. [I#860](https://github.com/foodcoopshop/foodcoopshop/issues/860) / [PR#74](https://github.com/foodcoopshop/foodcoopshop/pull/874) - Die Konfiguration "Freitag Bestellschluss / Samstag Bestelllisten-Versand / Donnerstag Abholtag" ist jetzt möglich. [I#866](https://github.com/foodcoopshop/foodcoopshop/issues/866) / [PR#867](https://github.com/foodcoopshop/foodcoopshop/pull/867) -- Die Überschriften aller Tabellen im Admin-Bereich bleiben jetzt beim Scrollen sichtbar (nicht in iOS ). [PR#888](https://github.com/foodcoopshop/foodcoopshop/pull/888) +* Die Überschriften aller Tabellen im Admin-Bereich bleiben jetzt beim Scrollen sichtbar (nicht in iOS). [PR#888](https://github.com/foodcoopshop/foodcoopshop/pull/888) +* Im Produkt-Admin kann jetzt der Status (aktiviert, deaktiviert) von mehreren markierten Produkten auf einmal geändert werden. [I#895](https://github.com/foodcoopshop/foodcoopshop/issues/897) / [PR#897](https://github.com/foodcoopshop/foodcoopshop/pull/897) + ### For developers - New 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) and [Gitpod-Integration](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop). [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) / [PR#879](https://github.com/foodcoopshop/foodcoopshop/pull/879) / [PR#881](https://github.com/foodcoopshop/foodcoopshop/pull/881) From 6b65a48f233b366133e3dee9a3ee473d5cfbf6f5 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 29 Oct 2022 09:14:48 +0200 Subject: [PATCH 255/646] translation cleanup --- resources/locales/de_DE/default.mo | Bin 76142 -> 75934 bytes resources/locales/de_DE/default.po | 30 ++++++++++++------------- resources/locales/default.pot | 12 +++------- resources/locales/en_US/default.mo | Bin 71679 -> 71489 bytes resources/locales/en_US/default.po | 24 ++++++++++---------- src/Controller/LocalizedController.php | 6 ++--- 6 files changed, 32 insertions(+), 40 deletions(-) diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index 9961de323c720fbe606227964a4bcc6ca93d3366..33889b8d6103846ee86a5bd99f0f24053c3394fd 100644 GIT binary patch delta 19887 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 delta 19998 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 diff --git a/resources/locales/de_DE/default.po b/resources/locales/de_DE/default.po index 93ba47d20b..9ffc8eef89 100644 --- a/resources/locales/de_DE/default.po +++ b/resources/locales/de_DE/default.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-10-27 22:40+0200\n" -"PO-Revision-Date: 2022-10-28 21:03+0200\n" +"POT-Creation-Date: 2022-10-29 09:12+0200\n" +"PO-Revision-Date: 2022-10-29 09:12+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -657,17 +657,11 @@ msgstr "Ja, stornieren!" msgid "Please_only_cancel_if_ok_for_manufacturer!" msgstr "Nur stornieren, wenn es mit dem Hersteller abgesprochen ist!" -msgid "Really_delete_selected_product?" -msgstr "Ausgewähltes Produkt wirklich stornieren?" +msgid "You_selected_1_product." +msgstr "Du hast 1 Produkt markiert." -msgid "Really_delete_selected_products?" -msgstr "Markierte Produkte wirklich stornieren?" - -msgid "You_selected_1_product" -msgstr "Du hast 1 Produkt ausgewählt" - -msgid "You_selected_{0}_products" -msgstr "Du hast {0} Produkte ausgewählt" +msgid "You_selected_{0}_products." +msgstr "Du hast {0} Produkte markiert." msgid "Adapt_amount_reason_is_mandatory." msgstr "Bitte gib an, warum die Anzahl vermindert wird." @@ -916,7 +910,7 @@ msgid "Add_product_feedback_explanation_text_{0}." msgstr "Dein Feedback wird dem Hersteller {0} nach dem Speichern automatisch per E-Mail geschickt, es ist dann nicht mehr änderbar. Der Hersteller erhält deine E-Mail-Adresse, damit er dir ggfs. zurückschreiben kann." msgid "Tip:_Change_delivery_rhythm_for_multiple_products:_Select_checkboxes_and_click_bottom_button." -msgstr "Du kannst den Lieferrhythmus von mehreren Produkten gleichzeitig ändern, indem du sie links auswählst und auf den Button ganz unten klickst." +msgstr "Du kannst den Lieferrhythmus von mehreren Produkten gleichzeitig ändern, indem du sie links markierst und dann auf den Button ganz unten klickst." msgid "Generate_invoice" msgstr "Rechnung erstellen" @@ -1195,10 +1189,10 @@ msgid "Status" msgstr "Status" msgid "No_products_or_attributes_selected." -msgstr "Es sind keine Produkte oder Varianten ausgewählt." +msgstr "Es sind keine Produkte oder Varianten markiert." msgid "No_product_data_selected." -msgstr "Es sind keine Produktdaten ausgewählt." +msgstr "Es sind keine Produktdaten markiert." msgid "Please_enter_your_credentials." msgstr "Bitte gib deine Login-Daten ein." @@ -2769,6 +2763,12 @@ msgstr "getätigt am" msgid "Prices_are_including_vat." msgstr "Die Preise verstehen sich inklusive Umsatzsteuer." +#~ msgid "Really_delete_selected_product?" +#~ msgstr "Markiertes Produkt wirklich stornieren?" + +#~ msgid "Really_delete_selected_products?" +#~ msgstr "Markierte Produkte wirklich stornieren?" + #~ msgid "The_day_of_month_is_required." #~ msgstr "Bitte gib einen Tag (Monat) an." diff --git a/resources/locales/default.pot b/resources/locales/default.pot index 79e9a1312b..7023410ddb 100644 --- a/resources/locales/default.pot +++ b/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-10-27 22:40+0200\n" +"POT-Creation-Date: 2022-10-29 09:12+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -656,16 +656,10 @@ msgstr "" msgid "Please_only_cancel_if_ok_for_manufacturer!" msgstr "" -msgid "Really_delete_selected_product?" +msgid "You_selected_1_product." msgstr "" -msgid "Really_delete_selected_products?" -msgstr "" - -msgid "You_selected_1_product" -msgstr "" - -msgid "You_selected_{0}_products" +msgid "You_selected_{0}_products." msgstr "" msgid "Adapt_amount_reason_is_mandatory." diff --git a/resources/locales/en_US/default.mo b/resources/locales/en_US/default.mo index 62bd4fc8fe82387143cbf99195d35b4c70c6f2db..6189920965ad57e5a398be73af8a4a57a2cb8a00 100644 GIT binary patch delta 19825 zcmZwN2YgT0AOGm2ng%2>& zaXU`tMy5kC%uhu!YUQI)3s_*?Vm*Zs#2;c9W^QcSN1-OFhT4H%sCE-k3;GUq1F6=R zn2-6L{7uMUb#&o}s5|-$wG(Sm1O0+(cgL19Gq1bl~@AfdT=1dTA7@(@(JrKlY_j@j`xhT>~$ zNDH%&SX8?@E!cmpyfXnk(+Sqqs2wU3|%P&|v__`vGh z+B|y~Dqb6PraD{4xXJhvSct*6-1-A%qFGdc#arvEr&TN*F-(i zPN;F+7=kk}23MkX)}2Zw2bo8h9(~)Ii36|(0Av7uRDTZbdEZ zAnGigL7k1)sP98eJIBd_Es(O?=|M&l&qm$xLgautE0I3VOVrl2Xm2L!kGkVws5=^m zy2JUXL$?Yw&Te$!5!Ax(qZa-z>I?*T(0Dxma%8mfDyWq=LJiy=i{T*DBUp((_>1)z zYNAuZ_GLNVLYMe5tel;-;TcG-lx8)_M8##vV2r{S0=nOnYy-xm}%_Av_nz$tD z4r`$fS3}f9y-*7nj@q#asGVGhYQM^sH=@SbgIV!3YC*R;v;XSwj(`qPU>CFU?5MY* zAZns`)B-DDUTlh5$UxMcOhrA4nWzaCTQ{H%;eOP34^ZPhM=ij+EBmjl%G1@n7ICOY z&9mjPoNg~J8IxNww$HAdFBzQg(spGS{Dc82xb^YQibDybx8t9OLje)SY_wG+P*f1u4g3JT^hqk45!cj9TDH)DGN2jsF<4 z>ivI5CYC_fUgq>y#tf7{MD0X>Y=|FYElfq-X;^P_XroaBC!lt)0_xeez)0+ZYX2GP zaL%{oH5j1xf2T5d81*R5p`OttTfUAZDc`{&n5U29G{8EjcJomaEJmG)byySkpuV7f zA307s?278w9W~EZbn6SXlZ+q!hMDm)>dxY<)>GIqd8sB!+n z0{8^=C_?+0pWzaya#LIG*N^>o5tvRucenvHz-Z(qkn9gd^6{H!fsv*kOe1wTbC zIP*aB8s_?zI*PgR z1jgfi%z`-wnT5q-R?0O|r#~5^aWqEZx0nx4AUouC{vo5Seu=sRzrkh!L8xziZqyc+ zM{QjdTi+NpQG3+uIsnUK3Kqp}s7H1Obz|>PHx@X=mx3B>IZR6R7njb3{>hzb#5NwI*ncwL{COZy9Enp&Q zqFI;?SE44|jyk=EQFr(lOJlxa{E%QWYQZy6{WoC(9>C%F9Q$Bj3YGC9x<4S3YlQiu zQd=xRc{FN*ji_gK9ZRGCNb~GIK-G6fJ))VYGqKT@PoVDbp^c|Yv2P8=5HE#c*eQkm z*PV|f5RNl2C$2_Ke9)F3peFJgWj;Vr7)v<`T{r@D=L<16{)D;kJZhY$7>YSZn{kSx zi*n=9?0;D@0|}_Z_m~HNMGbTtwIJ^?rbAxTM3qs`xC7?E@u)ld(#8*=KGpY8I~B@2 z^|2Nv;vCfLe#A{icYYBy@pIHlvwdt9R0OqEwNULkq6ieN4 zo@(RYqZW7&b+-Pn_5YwARnT~|b5R(j_rEF`eMowu3rC?|v&9&J2T@yf3-vm_z$DB# z!EAL))P!A7uibFe#FJ1Her4;op}rHxP&@fM`ZK?Cos72nFZ98GQ4_vFw#W(m)EvU> zsArgf8mJssQA^Yz9E_T925OvDs0FP>8@xW}cLZZUXaCi(F9EG| zG-~D3P>1U)^u}Eng!`HicHaTV&&UctP2|6h^OmWR(aTU`nZQ|@NV(@-n^8N1*Otco?~m<4@~g(&}k z>URk>VfwjdL4{E}kc{d-0bO`capre2&f_l)SPHcRgD?tbp`P7OsMqEKX2&O}N98}? zY;hqhML8MOeg+oAbyxz=+Oq!wQ;tW?*BRZ~s-T0ikdhD^WrMhBl{Iy_!l<7OkbIJYfPp*3bh00usOQ3d~N=O(jB$J zdB}NjHex8&U1k>08H-aMjXESi z?KC8#Q`!Yv;yl#KAE5@Sw9?$^6wF2WC)AFdL%nv7F*AmLV-{El^HFY%YCj6K!}HM_ zx1biZ9kc8GKSoB+_y%Uf2dKm5d}|&-7F5SVsQMx{UKz7cZf@h<(T{Qp>Y0y2jk_Lo zrncMi0ra7KLUHDI&XCbSSFHbFddlg(GYj!Y9hz`!w2ha=OvLM=cAy3NVpsIT-qt~= zN1K8=D|1kf_6KyU;usmdHn&l)-*eQ00#}(kccDM!0;q+>p|-FDYHMrSco$T=o|uFK zQ9HRCwXjrMe;&2KYpd9QZS7qG8t?(8!*{3-=~kPD8BpacsQNI}9ppki;}WPXZ-}~q z6wHXTQDGK$wNs-} z{imZI)pFF1Zbm(teOLrjQ44>K8aKrKy$Qsl2Cj)3Fc~#aZ`8mksMlsXYQPn!_M1@O zjf1E=y@>(%7FC~Vt!bYZwV+s3yu2;D8`wZQ)CB!e15CjDI1}}Zx1fGxPNNo>VVyA- zdd>uDCrh9nRRz?et%my1s)ZWA9qKh7i1j#s&Ji+&3FKIBKB1LSMJKBG}PvIw=6+pWi}S239Q6I=HF!L-YPLByjm3zn67|Lc*_owlNRSBI!rw=5+|c}WIblWU8tQoV!dqr2i4B|C$sRZsPT$eYofj*olpxK?Iz=S%}|eG z3x?q#)DB#=^{-KP6tTnHc`4LRH9*C?qHZJw!|_X7zXdh^Q5*jo)!u)n8OI$#Mjc99 z8>5SIZ`6XOU}jv5dS+{^J5Xofs4d?^J&KpsOh23NK_1jNQP$F^FK2B`)cfC*j6OIM zF#+eGCOm}N>a*5sn3M7Y%!7Wr%)kXvH&6=oeEJArDY6ni)@=eslL3_=YFgtdo9FBc) z4CZu`c}PZ|O#gkRVG!!sWI>N%weT^hg-=E;d^u{oov6dOAGPq) zs6%%R^Wk%Jmmm|m-~5TBp0yEbqUNZd$&RQ2dZ6xbC~BgKsIC4QBk@Pnf-a#Jeh;K7@KC=gWM?J$D z=#Sme8~dYnaxiMbX&8e`P>X%r~GGauC(=JSN~> zER5mD%)d~migA>OVG&%3>VFEC;%)TDPmh~NG#yo*g~gcPSwtodPoSRZYYf1=C(Lg^ z5iCHtHtGy~gj&GIsCKI`6K=)KxDVAX71i!07Q%p&<}4+m9z|tzHzm`MOjTTty3^aJ zt@|J9P`yQMS-Mm+VQ$o6jYhSvkD9Q(Ee}8~>=WyB)N8j0b*Puw^0%q%e@Oys325tX zVnYl%Wg2$CV9H%lk75Yc#?P=LreZoQcG~nyL`^gv%itu`VcU;d&{5Q*xqx}`;c50? zTNiM~9Ii0b7FNXsY=j+fENYY11ksB3A#3-zbTIm4m5bFr*Xw(@Qi@LLksD;cxE%+gaWQ9F0nlzIQj z=o$WpTJc-kAnd%^>H??<%3?;Wg4(epjKjv54c({(&qB4EhatEO192N_Cl1;88T8Tn zf0v9F@DOA1AJntYbHUt61JuGgqPB1(M&eY|q1}isyo`EH-=f~{$luL^Vo^7cV9RAt zJ5vEY|NXBG8EsuBRKo$NiAJEF^%Sg$b8!$}MzwGJhq<#(s5|R#9gVv4Nw$6|YDdI3h0`{Q0B$=yZ^vtqfGy@kxy+)-`16M@dQC%#DO;HP-hB{1hQCqyi#y6w-??5ed zFKPj&Q1e_uJ+i+qvj1w3?h=2vz^qslQ?LTAvED_!W(6;s0cv0}<(4=cH)0=*xnh1B z=3zC;=h20^u5uGt0X6mEum3gEAO^KXtuZ%_u;sa^t=)o(AHf`W z2V?LphGFz|^EOq*aLTPPCk{l<*|Ft~ZZewa7-~iLQHL{i2consv+cy3j<0-#IeK+FnF+TG<$z%#) z3c7GPYKsqG96rZrjQq>AtB?9r55fF68CAayb*C3F5uc&HBhmNGxD`-4(hfELJoNnk zf4`E^`*;_V@HJ+_IuFcgZ;pCzd!Z&Cg*qEEZT%_?pu7wH@F@D@8T7_W=!4f#XX6%X zhh98j|Fz;b1cEU9p&2L|HBl+l#7U?D+M~9#3u=Oa))dr&$D>})8K@gtiR!oA*6%_s z;0R{Gix1gNcjK^9?f44J~jElfx6L5B+PU$U7z=$WT8XI9Oj>qD-5%t~p6ZM*=dusm0 zVgam7c@#$CPSopr4XfijY=YIF>Ay4Z{O6I;0JpIK`akC{h8TyfaWSgnzo@fO@rC)~ zwZlr3zeBwZcToM`qJAYK|HtPV+oSs3z>b*iUvmRpuqX37bIFuI=cQ?wh#IgNR>9s_ z8rPz>?iSX=kXPpY?}&+%$D!V)A5nLF7PaM1QT>AdGk+hbj4Jm)w^lrl%xv6=Rk87F zbC_nMK1{o@Fy29ZaDv~MM^gedP*?1PvoJS4$BLNst@#;mgxZ0rsPWdK3x9jd{)dx! zK_EK@zcVY3!eW$bU`ZT?d2lW2&>cnX*b^*>QI40VoP?VAW7JvMg<9}^)Q$#vd3hdn zLDYD)yxd-%)7y=JPI+JKivzJ7UPn!oJDr#3zic)_y>@d^r+pFX?fC}v8g50sJqJ+Z z9YY^X#Yp@O)&8Y5gWKE7^F<2BX;j3ZI&Me3ZagB_{lpCU6&%Wrw8JLV4 zQO`J&zn9Y<%b<2(9yZ3)s4rrH3|^iy))41V?unY`9p=>gADYq2^Fb+&8n7E`f|=L| zAE36fVkR%oe~_$&Whu|WtauW$;SCJI7q*-!z?_{3Y)QN+Ho!GlA75b{^E;Y}I=%Z*XXIDZ8A(M=^crg{Q0Z64(1 z_H<}NKpi{Uif*Xi^WLZ(7=~Kd1k^&NSZAZ&ibbd!Sc95yH|o1`%GTdU{V2UcEg)O4 z*@^IA-hWM;hkz>bqb4eh+S;Nvo`l-6CfFL=p!#h^wclau_n{Ve6t%NwP&;)VwWHTj z?f*ozyYIGvr?$Z>)H8mA!5ERn%k$|>Kt0n&sI6^>Ix9U;6O2QB;ijSnUV&Qh_o$uO zV(Sm1cIcXoyPuHJr`I>DnIJdn&Z1E(jYkbs(#9*m3KC?pfJ<~5vcaDsP>6AUeU(uqHdrG zs(-Sr?~D5Or(kZq{|m_I3$_(?1|FiG)l*x3ftuhoYQXd%=Gg|I-v40K7DuAq^U|oF z=jm7&FQPs~KG{vVC`M9lg$?xnk0PTL9Yx*oJ*k|^CRl|AKikGl$zP!IH_F3oNA-D4 z`HtFH#(qFXsQUR`__esa5!{wBX3`%}-ca1N6%P12Rmj`t67AMz(K zjx^9N%**;2Z42r7SEG?$jUl8j$akkfWjZ{jtgEZ-u+|Q2qWo7(%2#N206(;Ky(!P9 zfzD4&5jTCZZ?ewEHnxpE?&197W83*pD$bKWr}2-t&~{j0JJ_N#oeV#Up4avj zR;K;;c!cWSy1_HWc+reM-I>X$tu# zw22^fBJWE~R~>`nNBMsYS`{nW36J7Wv_E6p{7e2CvHPg27O84F?Z3SWQ_+H?&}teU zwhar~$;#pdVy&q=Na{rXG3qL1+bGW;pq!n!hWY~J$B{NtZbrF1?H=GSYN#u1{$4b? zONFkUcCay&M^P?8U1RcmN1R!d`C{`2RQ|+FinV<{wtc1$(=X3I#AlKpM1C^5NI8fd zqgvNX(o>RqvK>IdV>J2>bEB@Q)bSJVJR$u-xh*N&){Q0Kkfe+6j^`S|KNIQG(2jYT za`=1WpQijPZ6Dj%r~LWD8A@R&tNfM9^5m094QVuk^qTzV#D|gp33augZ7Xa=Y#8;s zQP*!I{qZW8n6BBxgUB}`MUpO&J|s4c{{E(kQ$z2+t~UnffE_G~@@rBe#jA^ zdxKsh-i~-TTc>vG-^=G_uvf$qNxR7Jv2_P2U#1*s$I3-KfRvtegLq4l=l;uKJJKcF zk*xC-X)om{8!N&fi^;DdePLr08K3~^oH}szAYYTDKa@5=U42L$NL?sbrQg@KujD zl=f$ElkKPKiSOlA4xqj`>fb**KPzIdvs5H7@G8``&~{A145U&vew(__DNnLxPhIFsSe zVh_r7$?Hm?OrVa>d0!kwO1t{m ze17H{KPNMUiPRmG-$loPxBWAVrnv?1hn?M>sz9e;J z)q!g^DV}%;md5|zm0;s5>3cKnZvyLV%j{T&)PzB&(J+*Jaq<&MUy#B{&50Kyo|}A> z;^cMhCUqp;q<#v6za#xlc>v}6`2O`Rg(bxQ)c!vs^ADb;Low1Xq)em?q-IR;mb%^K z|3@lM`5W4|!WP6Ikk0OQJU`;zo5n?mc7l)&-jrU{BrQ|=v zQ^ZeFpLUhjzlp6&X*AxaQCeLA%2`RPsGDws<8TzQ!NfjI8vzTGHc@wnluAA?<2R1V!erdP0;-th3XVeVH-MrPjCr&7b%o9gt{`M6ylwzFGy-Z(p8VRt{zt9 z$J3_}sXzHP3UGZ&c{qK%Nykmd*+{It{wBDb!0h)12%{p7n7@rRz*(di(nR9FQa_1- zUf~YPTSzY`7sZ^!bh)ve%|D<{*LRe6;T=*wja{rmw~sn)-kP+v^yanWWAo;Ycar-J z=`g5UpKe_Sck9|AC1G@j{sa4U9nxj+p!m&CmlX{1E9*)qTdr8~%@LbQm)*SdeyIr4 V$CcK{MIYDy?X&GsMz7$^{|AJ1m2dz6 delta 19943 zcmaLeXLuGx-}mti>48A#Bq8L4gp$xg@6x3gX`#1-CJ0FAZD~@a7o|#-CcOv((u)WP zsGu|fktQHbL}~Z;cg}D>9QTW7k7M}Ee`a=Oc4l@H@VfS|_j|L!&%KhtZ??lV$JcSP z;|cya>E}2@%c#_GHr92Vins}5@evlpEcF~GEmp&f*ckI;7mUK0sQxx#1fH_-9cw^+ zZ@KHlkWs_;tgSGdcpygN4C{K#M|>PLktdi3vo&y>+*lDcP$$fbBdn`X?M`C>{0BW4 z+t6`h9M^HGlhF;`Fc(foO=v4>0%xrEt-&8SPBi7YF&kD#wQq|WXb5TrmZIA2L-l_Z z^#DPQj72af<2x;t!J+8EMW`p*i&}|4P#wKNwTo_S;>wtVxC3h9BW(FHRJ()LKTs14 zY+~BSVj<$H=z7TXA>-XM)C@P-1{bg(ad1<|Nx)L5iF8G6!FY_rb*OgdQ7hu#%yBYf z4$O+ht#wfoNk+9B*^Kqq%;!;{4)<8EqgEg=(ag9YYVYcz_IMELzFDXx|Jv4HK@V~2 z=4J&7pe9@&Ro)Xd;i(vdJDaoqdh*K@XvtpKil`RmhRUe&j;I^PSXZGYd;&G0N0=4U zv@}~5Ykd#3_swlQ0(GY5S+~1nf+#qPVR+Gc4?~Dwp(YU2iq0_}Jy;4uu{oy3&elE{ zK|CDwU~^IZevO&%7{=pe)Y)-^TJtWG$&3E@9%|rfSRET+Mx2eBz-rW!ZpUnR3Ip&K zro{)SiM>LdrPOWA*(i?sK6J$NIK{-SvzUwqK7kteEOKC-%Sazik+x<@r=SK}g?i!* zs3+QmdcxDFLw60;&p+tFRPD^fV^9-MK%Ie_7@+sR4;jsT5NhV*Q6100BDfZ{1((qe z-&p6ibufo79@S9;)E2cy_0t=5-*7C5Q&9Kqw(&XCgZOo1|D(wSlhF+0P_I)Z)RuHX z4g3-630>6T8iyKaDQW^6Q7g6wwUTF1?XTJR4yvE$m;pnQ%!HznSbyD6iURHJ`>2`M zL%kJkPy=;FO|UQKz)7fytU*1=Vbq=f7^ zN0U$kEI}>dCe)2PQK$a6jnAP5xP`^>U(}f?)Y+Ww+E|phFX{nSqVC_0et5u^yGP0R zQ*aKoB$rSVc!pZifG%c&=~1suw2f<__B;_a@gAs&j=}_-iCX$YHolL#KSx*d9jJ-i z?>c?S6ro}Q2H`H$iX5`>SycT+EQq1q%#)TwEny<&#$+sn6K(xY)O|mrCK&jkS%D~2 z|8bZ>?|&&W1t_SEd2j#*<08~btilGk18ZPVce|GuK->Yfv|Ujv*cUaiDHwzEQ7f|- zbvRGk_;*ah_|8*h(5HvlinORb%4FkkEI}NN`LQY1$C0RZr%?m^j5-rH@qK)b`hr&c zh_4_nK;8ERYRey>t1r}3GJzP{(=1J9)RV_x6c)qO_yKCE+h8b;M(y={p9Lp zKTxPc*#M)lyNxH=cx5lv-$TVw3iO1xQ61#yZB`@?DlUe4(sHP+sbu5YHg14=@)oEi z?v6n?+?J2Sbi{KpFRsQgJky)?*PdOcAPv4mbrk%udBRB4;fX{2@TiD-pA%6})DyLo zQ!oT)p)Y=cn!qyD8TktJAX`uq*@fxxdzXwlyo{RBQ`8Oqeaw=lLB-i@9F3ZAe$<4k zqh7;Cr~$g5wyGCu#fI4W5$OFfj+)?V)P&u2w!sceOTkH0$CqsR9aKlJQHRJk#rzHz zfQ5)-P*2hbHL+yOfWuLze>%qDHq3*+VNML_>s=w&$wx+qsR-%`DxxM(1NE(Mf?DDf z)Y1*I^%GD7%|V@s)mRRH-`+Ophgy;`s3o6@+T%G` z1h=D}^fqcD|Dh%p(%*C(hT8KejKw^*ybkJzRddwakb;?TD*7|Nvz$z3T!WgxKGZ

$%VHKx#CYt9*>LU<)?ZJ) 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 diff --git a/resources/locales/en_US/default.po b/resources/locales/en_US/default.po index cf07dabb08..2539874ab3 100644 --- a/resources/locales/en_US/default.po +++ b/resources/locales/en_US/default.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-10-27 22:40+0200\n" -"PO-Revision-Date: 2022-10-27 22:43+0200\n" +"POT-Creation-Date: 2022-10-29 09:12+0200\n" +"PO-Revision-Date: 2022-10-29 09:12+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: en_US\n" @@ -657,17 +657,11 @@ msgstr "Cancel product!" msgid "Please_only_cancel_if_ok_for_manufacturer!" msgstr "Please only cancel if this is ok for the manfacturer!" -msgid "Really_delete_selected_product?" -msgstr "Really cancel the selected product?" +msgid "You_selected_1_product." +msgstr "You selected 1 product." -msgid "Really_delete_selected_products?" -msgstr "Really cancel the selected products?" - -msgid "You_selected_1_product" -msgstr "You selected 1 product" - -msgid "You_selected_{0}_products" -msgstr "You selected {0} products" +msgid "You_selected_{0}_products." +msgstr "You selected {0} products." msgid "Adapt_amount_reason_is_mandatory." msgstr "Please tell us, why you want to decrease the amount." @@ -2769,6 +2763,12 @@ msgstr "placed on" msgid "Prices_are_including_vat." msgstr "The prices include the VAT." +#~ msgid "Really_delete_selected_product?" +#~ msgstr "Really cancel the selected product?" + +#~ msgid "Really_delete_selected_products?" +#~ msgstr "Really cancel the selected products?" + #, fuzzy #~ msgid "The_day_of_month_is_required." #~ msgstr "The day of month is not valid." diff --git a/src/Controller/LocalizedController.php b/src/Controller/LocalizedController.php index 82e0190578..50ce9667f9 100644 --- a/src/Controller/LocalizedController.php +++ b/src/Controller/LocalizedController.php @@ -156,10 +156,8 @@ private function getStrings() 'WhyAreProductsCancelled' => __('Why_are_products_cancelled_(mandatory_field)?'), 'YesDoCancelButton' => __('Yes_do_cancel_button!'), 'PleaseOnlyCancelIfOkForManufacturer' => __('Please_only_cancel_if_ok_for_manufacturer!'), - 'ReallyDeleteSelectedProduct' => __('Really_delete_selected_product?'), - 'ReallyDeleteSelectedProducts' => __('Really_delete_selected_products?'), - 'YouSelectedOneProduct' => __('You_selected_1_product'), - 'YouSelected0Products' => __('You_selected_{0}_products'), + 'YouSelectedOneProduct' => __('You_selected_1_product.'), + 'YouSelected0Products' => __('You_selected_{0}_products.'), 'AdaptAmountReasonIsMandatory' => __('Adapt_amount_reason_is_mandatory.'), 'AdaptPriceReasonIsMandatory' => __('Adapt_price_reason_is_mandatory.'), 'CancellationReasonIsMandatory' => __('Cancellation_reason_is_mandatory.'), From 7ba57b0ee4b21b55e187785ead4e0ad6cd33a46c Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 29 Oct 2022 10:31:22 +0200 Subject: [PATCH 256/646] add permissions check for manufacturers --- .../src/Controller/ProductsControllerTest.php | 37 +++++++++++++++++-- tests/TestCase/Traits/LoginTrait.php | 6 +++ 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php b/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php index 9e26cfa558..cb0008acab 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php @@ -43,13 +43,13 @@ public function testChangeProductStatus() $this->get('/admin/products/changeStatus/' . $productId . '/' . $status); $product = $this->Product->find('all', [ 'conditions' => [ - 'Products.id_product' => $productId + 'Products.id_product' => $productId, ] ])->first(); $this->assertEquals($product->active, $status); } - public function testChangeProductStatusBulk() + public function testChangeProductStatusBulkAsSuperadmin() { $this->loginAsSuperadmin(); $productIds = [60, 102, 103]; @@ -60,7 +60,38 @@ public function testChangeProductStatusBulk() ]); $products = $this->Product->find('all', [ 'conditions' => [ - 'Products.id_product IN' => $productIds + 'Products.id_product IN' => $productIds, + ] + ]); + foreach ($products as $product) { + $this->assertEquals($product->active, $status); + } + } + + public function testChangeProductStatusBulkAsManufacturerPermisionsNotOk() + { + $this->loginAsMeatManufacturer(); + $productIds = [60, 102, 103]; + $status = APP_OFF; + $this->ajaxPost('/admin/products/changeStatusBulk', [ + 'productIds' => $productIds, + 'status' => $status, + ]); + $this->assertAccessDeniedFlashMessage(); + } + + public function testChangeProductStatusBulkAsManufacturersPermissionsOk() + { + $this->loginAsMilkManufacturer(); + $productIds = [60]; + $status = APP_OFF; + $this->ajaxPost('/admin/products/changeStatusBulk', [ + 'productIds' => $productIds, + 'status' => $status, + ]); + $products = $this->Product->find('all', [ + 'conditions' => [ + 'Products.id_product IN' => $productIds, ] ]); foreach ($products as $product) { diff --git a/tests/TestCase/Traits/LoginTrait.php b/tests/TestCase/Traits/LoginTrait.php index fcf49c0721..ff271b42e0 100644 --- a/tests/TestCase/Traits/LoginTrait.php +++ b/tests/TestCase/Traits/LoginTrait.php @@ -78,6 +78,12 @@ public function loginAsVegetableManufacturer() $this->session($sessionData); } + public function loginAsMilkManufacturer() + { + $sessionData = $this->login(Configure::read('test.milkManufacturerId')); + $this->session($sessionData); + } + public function logout() { $this->get($this->Slug->getLogout()); From adce8ece9d11acc71afc7f0ebd42c3242895b345 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 29 Oct 2022 10:42:13 +0200 Subject: [PATCH 257/646] format --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cefdb74cd..298067d8a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,13 +10,13 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe ### Herzlichen Dank an alle beteiligten Personen -* [mrothauer](https://github.com/mrothauer) +- [mrothauer](https://github.com/mrothauer) ### Neue Funktionen / Verbesserungen - Superadmins können Tag und Uhrzeit der Cronjobs (z.B. die automatische Bestell-Erinnerung, Rechnungsversand) jetzt selber im Admin-Bereich (Homepage-Verwaltung / Einstellungen / neuer Tab "Cronjobs") ändern. [I#860](https://github.com/foodcoopshop/foodcoopshop/issues/860) / [PR#74](https://github.com/foodcoopshop/foodcoopshop/pull/874) - Die Konfiguration "Freitag Bestellschluss / Samstag Bestelllisten-Versand / Donnerstag Abholtag" ist jetzt möglich. [I#866](https://github.com/foodcoopshop/foodcoopshop/issues/866) / [PR#867](https://github.com/foodcoopshop/foodcoopshop/pull/867) -* Die Überschriften aller Tabellen im Admin-Bereich bleiben jetzt beim Scrollen sichtbar (nicht in iOS). [PR#888](https://github.com/foodcoopshop/foodcoopshop/pull/888) -* Im Produkt-Admin kann jetzt der Status (aktiviert, deaktiviert) von mehreren markierten Produkten auf einmal geändert werden. [I#895](https://github.com/foodcoopshop/foodcoopshop/issues/897) / [PR#897](https://github.com/foodcoopshop/foodcoopshop/pull/897) +- Die Überschriften aller Tabellen im Admin-Bereich bleiben jetzt beim Scrollen sichtbar (nicht in iOS). [PR#888](https://github.com/foodcoopshop/foodcoopshop/pull/888) +- Im Produkt-Admin kann jetzt der Status (aktiviert, deaktiviert) von mehreren markierten Produkten auf einmal geändert werden. [I#895](https://github.com/foodcoopshop/foodcoopshop/issues/897) / [PR#897](https://github.com/foodcoopshop/foodcoopshop/pull/897) ### For developers From 88092fd6ad767289b5ff3bc5cb7f17dbd90e9208 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 29 Oct 2022 21:11:16 +0200 Subject: [PATCH 258/646] add trait --- tests/TestCase/AppCakeTestCase.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/TestCase/AppCakeTestCase.php b/tests/TestCase/AppCakeTestCase.php index 6b0fee7b6b..701d0874db 100644 --- a/tests/TestCase/AppCakeTestCase.php +++ b/tests/TestCase/AppCakeTestCase.php @@ -2,6 +2,7 @@ namespace App\Test\TestCase; use App\Lib\DeliveryRhythm\DeliveryRhythm; +use App\Test\TestCase\Traits\AppIntegrationTestTrait; use App\Test\TestCase\Traits\QueueTrait; use App\View\Helper\MyHtmlHelper; use App\View\Helper\MyTimeHelper; @@ -36,6 +37,7 @@ abstract class AppCakeTestCase extends TestCase { + use AppIntegrationTestTrait; use ConsoleIntegrationTestTrait; use QueueTrait; From 05fcb53c8b1f36a1d35db7f1c6c75c141e8b1110 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 29 Oct 2022 21:44:44 +0200 Subject: [PATCH 259/646] unit test improvements - remove custom sql --- tests/TestCase/AppCakeTestCase.php | 47 ++++++------------- .../src/Controller/CartsControllerTest.php | 6 +-- 2 files changed, 17 insertions(+), 36 deletions(-) diff --git a/tests/TestCase/AppCakeTestCase.php b/tests/TestCase/AppCakeTestCase.php index 701d0874db..43c698e998 100644 --- a/tests/TestCase/AppCakeTestCase.php +++ b/tests/TestCase/AppCakeTestCase.php @@ -3,17 +3,18 @@ use App\Lib\DeliveryRhythm\DeliveryRhythm; use App\Test\TestCase\Traits\AppIntegrationTestTrait; +use App\Test\TestCase\Traits\LoginTrait; use App\Test\TestCase\Traits\QueueTrait; use App\View\Helper\MyHtmlHelper; use App\View\Helper\MyTimeHelper; use App\View\Helper\PricePerUnitHelper; use App\View\Helper\SlugHelper; +use Cake\Console\TestSuite\ConsoleIntegrationTestTrait; use Cake\Core\Configure; use Cake\Datasource\ConnectionManager; use Cake\Filesystem\Folder; use Cake\Filesystem\File; use Cake\View\View; -use Cake\TestSuite\ConsoleIntegrationTestTrait; use Cake\TestSuite\TestCase; use Cake\TestSuite\TestEmailTransport; use Migrations\Migrations; @@ -39,6 +40,7 @@ abstract class AppCakeTestCase extends TestCase use AppIntegrationTestTrait; use ConsoleIntegrationTestTrait; + use LoginTrait; use QueueTrait; protected $dbConnection; @@ -57,10 +59,6 @@ abstract class AppCakeTestCase extends TestCase public $Manufacturer; - - /** - * called before every test method - */ public function setUp(): void { parent::setUp(); @@ -80,7 +78,6 @@ public function setUp(): void $this->Customer = $this->getTableLocator()->get('Customers'); $this->Manufacturer = $this->getTableLocator()->get('Manufacturers'); - // enable security token only for IntegrationTests if (method_exists($this, 'enableSecurityToken')) { $this->enableSecurityToken(); @@ -228,21 +225,14 @@ protected function debug($content) ob_flush(); } - protected function changeManufacturerNoDeliveryDays($manufacturerId, $noDeliveryDays = '') + protected function changeManufacturerNoDeliveryDays(int $manufacturerId, string $noDeliveryDays = ''): void { - $query = 'UPDATE fcs_manufacturer SET no_delivery_days = :noDeliveryDays WHERE id_manufacturer = :manufacturerId;'; - $params = [ - 'manufacturerId' => $manufacturerId, - 'noDeliveryDays' => $noDeliveryDays - ]; - $statement = $this->dbConnection->prepare($query); - $statement->execute($params); + $this->changeManufacturer($manufacturerId, 'no_delivery_days', $noDeliveryDays); } /** * @param int $productId * @param int $amount - * @return string */ protected function addProductToCart($productId, $amount) { @@ -368,27 +358,18 @@ protected function addPayment($customerId, $amount, $type, $manufacturerId = 0, return $this->getJsonDecodedContent(); } - - protected function changeManufacturer($manufacturerId, $field, $value) + protected function changeManufacturer(int $manufacturerId, string $field, $value) { - $query = 'UPDATE ' . $this->Manufacturer->getTable().' SET '.$field.' = :value WHERE id_manufacturer = :manufacturerId'; - $params = [ - 'value' => $value, - 'manufacturerId' => $manufacturerId - ]; - $statement = $this->dbConnection->prepare($query); - return $statement->execute($params); + $newManufacturer = $this->Manufacturer->get($manufacturerId); + $newManufacturer->{$field} = $value; + $this->Manufacturer->save($newManufacturer); } - protected function changeCustomer($customerId, $field, $value) + protected function changeCustomer(int $customerId, string $field, $value) { - $query = 'UPDATE ' . $this->Customer->getTable().' SET '.$field.' = :value WHERE id_customer = :customerId'; - $params = [ - 'value' => $value, - 'customerId' => $customerId - ]; - $statement = $this->dbConnection->prepare($query); - return $statement->execute($params); + $newCustomer = $this->Customer->get($customerId); + $newCustomer->{$field} = $value; + $this->Customer->save($newCustomer); } protected function getCorrectedLogoPathInHtmlForPdfs($html) @@ -408,7 +389,7 @@ protected function prepareSendingInvoices() protected function resetCustomerCreditBalance() { $this->Payment = $this->getTableLocator()->get('Payments'); - $this->dbConnection->execute('DELETE FROM ' . $this->Payment->getTable().' WHERE id = 2'); + $this->Payment->delete($this->Payment->get(2)); } private function prepareSendingOrderListsOrInvoices($contentFolder) diff --git a/tests/TestCase/src/Controller/CartsControllerTest.php b/tests/TestCase/src/Controller/CartsControllerTest.php index 54430f210f..d2ac588aed 100644 --- a/tests/TestCase/src/Controller/CartsControllerTest.php +++ b/tests/TestCase/src/Controller/CartsControllerTest.php @@ -712,7 +712,7 @@ public function testFinishOrderWithComment() public function testProductsWithAllowedNegativeStock() { - $this->changeManufacturer(5, 'stock_management_enabled', true); + $this->changeManufacturer(5, 'stock_management_enabled', 1); $this->loginAsCustomer(); $this->addProductToCart(349, 8); $this->assertJsonOk(); @@ -720,7 +720,7 @@ public function testProductsWithAllowedNegativeStock() public function testProductsWithAllowedNegativeStockButTooHighAmount() { - $this->changeManufacturer(5, 'stock_management_enabled', true); + $this->changeManufacturer(5, 'stock_management_enabled', 1); $this->loginAsCustomer(); $response = $this->addProductToCart(349, 11); $this->assertRegExpWithUnquotedString('Die gewünschte Anzahl 11 des Produktes Lagerprodukt ist leider nicht mehr verfügbar. Verfügbare Menge: 10', $response->msg); @@ -792,7 +792,7 @@ public function testFinishOrderStockNotificationsEnabled() $this->loginAsCustomer(); $manufacturerId = $this->Customer->getManufacturerIdByCustomerId(Configure::read('test.vegetableManufacturerId')); - $this->changeManufacturer($manufacturerId, 'stock_management_enabled', true); + $this->changeManufacturer($manufacturerId, 'stock_management_enabled', 1); $this->placeOrderWithStockProducts(); From ff612bd2c993fbaf98a79c2e45ae081743bbfa93 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 29 Oct 2022 21:46:59 +0200 Subject: [PATCH 260/646] vendor updates --- composer.lock | 90 +++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/composer.lock b/composer.lock index 4d5555ee92..cf7a86913b 100644 --- a/composer.lock +++ b/composer.lock @@ -536,16 +536,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.4.1", + "version": "2.4.3", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379" + "reference": "67c26b443f348a51926030c83481b85718457d3d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/69568e4293f4fa993f3b0e51c9723e1e17c41379", - "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d", + "reference": "67c26b443f348a51926030c83481b85718457d3d", "shasum": "" }, "require": { @@ -635,7 +635,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.4.1" + "source": "https://github.com/guzzle/psr7/tree/2.4.3" }, "funding": [ { @@ -651,7 +651,7 @@ "type": "tidelift" } ], - "time": "2022-08-28T14:45:39+00:00" + "time": "2022-10-26T14:07:24+00:00" }, { "name": "hisorange/browser-detect", @@ -925,16 +925,16 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.19.0", + "version": "2.20.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "b3c7e9262b4fbec801d8df2370cdebb4f5d3a0ae" + "reference": "10696c809866bebd9d71dca14de6c0d6c1cac2f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/b3c7e9262b4fbec801d8df2370cdebb4f5d3a0ae", - "reference": "b3c7e9262b4fbec801d8df2370cdebb4f5d3a0ae", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/10696c809866bebd9d71dca14de6c0d6c1cac2f8", + "reference": "10696c809866bebd9d71dca14de6c0d6c1cac2f8", "shasum": "" }, "require": { @@ -1018,20 +1018,20 @@ "type": "community_bridge" } ], - "time": "2022-10-10T21:28:03+00:00" + "time": "2022-10-25T13:35:54+00:00" }, { "name": "laminas/laminas-httphandlerrunner", - "version": "2.3.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-httphandlerrunner.git", - "reference": "3c9491473b7decd8f329266a3cb6226a1f90594c" + "reference": "d15af53895fd581b5a448a09fd9a4baebc4ae6e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/3c9491473b7decd8f329266a3cb6226a1f90594c", - "reference": "3c9491473b7decd8f329266a3cb6226a1f90594c", + "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/d15af53895fd581b5a448a09fd9a4baebc4ae6e5", + "reference": "d15af53895fd581b5a448a09fd9a4baebc4ae6e5", "shasum": "" }, "require": { @@ -1085,7 +1085,7 @@ "type": "community_bridge" } ], - "time": "2022-10-10T19:52:02+00:00" + "time": "2022-10-25T13:41:39+00:00" }, { "name": "league/climate", @@ -2792,16 +2792,16 @@ }, { "name": "symfony/console", - "version": "v6.1.6", + "version": "v6.1.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "7fa3b9cf17363468795e539231a5c91b02b608fc" + "reference": "a1282bd0c096e0bdb8800b104177e2ce404d8815" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/7fa3b9cf17363468795e539231a5c91b02b608fc", - "reference": "7fa3b9cf17363468795e539231a5c91b02b608fc", + "url": "https://api.github.com/repos/symfony/console/zipball/a1282bd0c096e0bdb8800b104177e2ce404d8815", + "reference": "a1282bd0c096e0bdb8800b104177e2ce404d8815", "shasum": "" }, "require": { @@ -2868,7 +2868,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.1.6" + "source": "https://github.com/symfony/console/tree/v6.1.7" }, "funding": [ { @@ -2884,7 +2884,7 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:04:03+00:00" + "time": "2022-10-26T21:42:49+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3433,16 +3433,16 @@ }, { "name": "symfony/string", - "version": "v6.1.6", + "version": "v6.1.7", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "7e7e0ff180d4c5a6636eaad57b65092014b61864" + "reference": "823f143370880efcbdfa2dbca946b3358c4707e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/7e7e0ff180d4c5a6636eaad57b65092014b61864", - "reference": "7e7e0ff180d4c5a6636eaad57b65092014b61864", + "url": "https://api.github.com/repos/symfony/string/zipball/823f143370880efcbdfa2dbca946b3358c4707e5", + "reference": "823f143370880efcbdfa2dbca946b3358c4707e5", "shasum": "" }, "require": { @@ -3498,7 +3498,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.1.6" + "source": "https://github.com/symfony/string/tree/v6.1.7" }, "funding": [ { @@ -4015,16 +4015,16 @@ }, { "name": "composer/composer", - "version": "2.4.3", + "version": "2.4.4", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "b34c0e9a93f2cd688c62ce4dfcc69e13b6ce7aa4" + "reference": "e8d9087229bcdbc5867594d3098091412f1130cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/b34c0e9a93f2cd688c62ce4dfcc69e13b6ce7aa4", - "reference": "b34c0e9a93f2cd688c62ce4dfcc69e13b6ce7aa4", + "url": "https://api.github.com/repos/composer/composer/zipball/e8d9087229bcdbc5867594d3098091412f1130cf", + "reference": "e8d9087229bcdbc5867594d3098091412f1130cf", "shasum": "" }, "require": { @@ -4107,7 +4107,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.4.3" + "source": "https://github.com/composer/composer/tree/2.4.4" }, "funding": [ { @@ -4123,7 +4123,7 @@ "type": "tidelift" } ], - "time": "2022-10-14T14:56:41+00:00" + "time": "2022-10-27T12:39:29+00:00" }, { "name": "composer/metadata-minifier", @@ -5235,16 +5235,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.17", + "version": "9.2.18", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8" + "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8", - "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a", + "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a", "shasum": "" }, "require": { @@ -5300,7 +5300,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18" }, "funding": [ { @@ -5308,7 +5308,7 @@ "type": "github" } ], - "time": "2022-08-30T12:24:04+00:00" + "time": "2022-10-27T13:35:33+00:00" }, { "name": "phpunit/php-file-iterator", @@ -5553,16 +5553,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.25", + "version": "9.5.26", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d" + "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", - "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/851867efcbb6a1b992ec515c71cdcf20d895e9d2", + "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2", "shasum": "" }, "require": { @@ -5635,7 +5635,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.26" }, "funding": [ { @@ -5651,7 +5651,7 @@ "type": "tidelift" } ], - "time": "2022-09-25T03:44:45+00:00" + "time": "2022-10-28T06:00:21+00:00" }, { "name": "psy/psysh", From 73cc4b31ee357bdc113447c45ba8e73d0c316c9f Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 29 Oct 2022 21:58:29 +0200 Subject: [PATCH 261/646] fixed initHighlightedRowId --- plugins/Admin/webroot/js/admin.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Admin/webroot/js/admin.js b/plugins/Admin/webroot/js/admin.js index 32b8607b09..d2882bb71f 100644 --- a/plugins/Admin/webroot/js/admin.js +++ b/plugins/Admin/webroot/js/admin.js @@ -230,9 +230,10 @@ foodcoopshop.Admin = { }, initHighlightedRowId: function (rowId) { + var newTop = $('.filter-container').height() + $(rowId).closest('table').find('tr.sort').height() + 10; $.scrollTo(rowId, 1000, { offset: { - top: -100 + top: newTop * -1, } }); $(rowId).css('background-color', 'orange'); From aff5650141c77ba2c47d3deea1b53ba93f7c0e32 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 29 Oct 2022 22:29:38 +0200 Subject: [PATCH 262/646] add class to pw wrapper if delivery break is enabled --- templates/element/catalog/product.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/templates/element/catalog/product.php b/templates/element/catalog/product.php index 2ca0efdd79..84aba8a8b2 100644 --- a/templates/element/catalog/product.php +++ b/templates/element/catalog/product.php @@ -15,7 +15,14 @@ * @link https://www.foodcoopshop.com */ -echo '

'; +$classes = [ + 'pw' +]; +$deliveryBreakEnabled = $product->delivery_break_enabled ?? false; +if ($deliveryBreakEnabled) { + $classes[] = 'delivery-break-enabled'; +} +echo '
'; echo '
'; echo $this->element('catalog/columns/column1', [ From 2eca659a6efad34251b1c00d363ea6aa69a62515 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 30 Oct 2022 21:51:33 +0100 Subject: [PATCH 263/646] update ubuntu to 22.10 --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8de040565..bb7bfcb47b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,15 +10,15 @@ on: jobs: ci: - runs-on: ubuntu-22.04 + runs-on: ubuntu-22.10 name: FoodCoopShop CI steps: - name: Checkout code uses: actions/checkout@v2 - + - name: Run Docker Compose run: CURRENT_UID=$(id -u):$(id -g) docker compose up php-nginx -d - + - name: Setup Dev Environment run: | # do not use ./devtools/init-dev-setup.sh because dev db is not needed @@ -26,7 +26,7 @@ jobs: bash ./devtools/setup-dev/copy-config-files.sh CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx composer install CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html/webroot fcs-php-nginx npm install - + - name: Apply secrets run: | sed -i 's/HELLO_CASH_USERNAME/${{secrets.HELLO_CASH_USERNAME}}/' ./config/custom_config.php @@ -50,7 +50,7 @@ jobs: - name: PHPStan run: docker exec -w /var/www/html fcs-php-nginx php ./vendor/bin/phpstan analyze -c phpstan.neon --no-interaction --no-progress - + - name: ESLint run: docker exec -w /var/www/html fcs-php-nginx bash ./devtools/eslint.sh From 884d8dac4ea5be4995354e88c2eb14b18991a021 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 31 Oct 2022 08:20:11 +0100 Subject: [PATCH 264/646] Revert "update ubuntu to 22.10" This reverts commit 2eca659a6efad34251b1c00d363ea6aa69a62515. --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb7bfcb47b..b8de040565 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,15 +10,15 @@ on: jobs: ci: - runs-on: ubuntu-22.10 + runs-on: ubuntu-22.04 name: FoodCoopShop CI steps: - name: Checkout code uses: actions/checkout@v2 - + - name: Run Docker Compose run: CURRENT_UID=$(id -u):$(id -g) docker compose up php-nginx -d - + - name: Setup Dev Environment run: | # do not use ./devtools/init-dev-setup.sh because dev db is not needed @@ -26,7 +26,7 @@ jobs: bash ./devtools/setup-dev/copy-config-files.sh CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx composer install CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html/webroot fcs-php-nginx npm install - + - name: Apply secrets run: | sed -i 's/HELLO_CASH_USERNAME/${{secrets.HELLO_CASH_USERNAME}}/' ./config/custom_config.php @@ -50,7 +50,7 @@ jobs: - name: PHPStan run: docker exec -w /var/www/html fcs-php-nginx php ./vendor/bin/phpstan analyze -c phpstan.neon --no-interaction --no-progress - + - name: ESLint run: docker exec -w /var/www/html fcs-php-nginx bash ./devtools/eslint.sh From c037bb87d7cd350e24b7e396813c2cebcf1646f7 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 31 Oct 2022 09:12:13 +0100 Subject: [PATCH 265/646] vendor updates --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index cf7a86913b..1e30129c7a 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "cakephp/cakephp", - "version": "4.4.6", + "version": "4.4.7", "source": { "type": "git", "url": "https://github.com/cakephp/cakephp.git", - "reference": "074248ad68fb6669e951862d0f2f82a0d7c99b23" + "reference": "20668423818ede9878df06a9d0621c77a5514dba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/cakephp/zipball/074248ad68fb6669e951862d0f2f82a0d7c99b23", - "reference": "074248ad68fb6669e951862d0f2f82a0d7c99b23", + "url": "https://api.github.com/repos/cakephp/cakephp/zipball/20668423818ede9878df06a9d0621c77a5514dba", + "reference": "20668423818ede9878df06a9d0621c77a5514dba", "shasum": "" }, "require": { @@ -108,7 +108,7 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/cakephp" }, - "time": "2022-10-01T23:52:05+00:00" + "time": "2022-10-30T02:20:57+00:00" }, { "name": "cakephp/chronos", From 1a9ad8ada4e848746a7c65d442bd34beb9b565c6 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 31 Oct 2022 12:54:06 +0100 Subject: [PATCH 266/646] fix loader-icon after network module button click --- plugins/Admin/webroot/js/admin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Admin/webroot/js/admin.js b/plugins/Admin/webroot/js/admin.js index d2882bb71f..44fc1d6616 100644 --- a/plugins/Admin/webroot/js/admin.js +++ b/plugins/Admin/webroot/js/admin.js @@ -86,7 +86,7 @@ foodcoopshop.Admin = { addLoaderToSyncProductDataButton : function (button) { button.on('click', function () { - foodcoopshop.Helper.addSpinnerToButton($(this), 'fa-arrow-circle-left'); + foodcoopshop.Helper.addSpinnerToButton($(this), 'fa-arrow-circle-right'); foodcoopshop.Helper.disableButton($(this)); }); }, From 9b67ab78ccbc278138e692de5b4416fa42691bbd Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 31 Oct 2022 13:03:51 +0100 Subject: [PATCH 267/646] repaired network plugin --- src/Application.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Application.php b/src/Application.php index d9a6918dde..a8bf983c47 100644 --- a/src/Application.php +++ b/src/Application.php @@ -59,6 +59,8 @@ public function bootstrap(): void 'autoload' => true ]); + require_once $this->configDir . 'bootstrap_locale.php'; + if (Configure::read('appDb.FCS_NETWORK_PLUGIN_ENABLED')) { $this->addPlugin('Network', [ 'routes' => true, @@ -66,8 +68,6 @@ public function bootstrap(): void ]); } - require_once $this->configDir . 'bootstrap_locale.php'; - } /** From cdd2760ae26277a8a70d2841c21876a216e34d24 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 31 Oct 2022 13:17:47 +0100 Subject: [PATCH 268/646] no buggy sticky header for tables in network module --- plugins/Network/webroot/css/sync.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/Network/webroot/css/sync.css b/plugins/Network/webroot/css/sync.css index f235bb4d50..675a3b6a9e 100644 --- a/plugins/Network/webroot/css/sync.css +++ b/plugins/Network/webroot/css/sync.css @@ -114,6 +114,10 @@ body.syncs.product div.product-list table.list th, body.syncs.product div.produc border-right: none; } +body.syncs div.product-list table.list th { + /* override sticky, that would need some extra work */ + position: inherit; +} body.syncs.product div.product-list>b { margin-top: 5px; } From dce817b6fe2d0f1ff50e7d0ba097f2aee972818e Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 31 Oct 2022 15:32:41 +0100 Subject: [PATCH 269/646] change mysql docker ports --- .gitpod.yml | 4 ++-- config/custom_config.dev.php | 4 ++-- docker-compose.yml | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 3e0baa3ea3..6c54dbaa8d 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -12,9 +12,9 @@ ports: onOpen: ignore - port: 8081 onOpen: ignore - - port: 3310 + - port: 3320 onOpen: ignore - - port: 3311 + - port: 3321 onOpen: ignore github: diff --git a/config/custom_config.dev.php b/config/custom_config.dev.php index 7b71168de1..14c466e713 100644 --- a/config/custom_config.dev.php +++ b/config/custom_config.dev.php @@ -44,14 +44,14 @@ 'username' => 'user', 'password' => 'secret', 'database' => 'foodcoopshop-dev', - 'port' => 3310, + 'port' => 3320, ], 'test' => [ 'host' => 'database-test', 'username' => 'user', 'password' => 'secret', 'database' => 'foodcoopshop-test', - 'port' => 3311, + 'port' => 3321, ], ], diff --git a/docker-compose.yml b/docker-compose.yml index 41979f6492..1786acebd7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,13 +32,13 @@ services: container_name: fcs-database-dev restart: always ports: - - '3310:3306' + - '3320:3306' environment: MYSQL_USER: user MYSQL_PASSWORD: secret MYSQL_DATABASE: foodcoopshop-dev MYSQL_ALLOW_EMPTY_PASSWORD: true - MYSQL_TCP_PORT: 3310 + MYSQL_TCP_PORT: 3320 volumes: - db-dev-data:/var/lib/mysql networks: @@ -50,13 +50,13 @@ services: restart: always tmpfs: /var/lib/mysql:exec,size=1G #smaller size (eg. 256M) lead to failing tests ports: - - '3311:3306' + - '3321:3306' environment: MYSQL_USER: user MYSQL_PASSWORD: secret MYSQL_DATABASE: foodcoopshop-test MYSQL_ALLOW_EMPTY_PASSWORD: true - MYSQL_TCP_PORT: 3311 + MYSQL_TCP_PORT: 3321 networks: - fcs @@ -71,7 +71,7 @@ services: environment: PMA_HOST: database-dev PMA_USER: root - PMA_PORT: 3310 + PMA_PORT: 3320 UPLOAD_LIMIT: 300M networks: - fcs @@ -87,7 +87,7 @@ services: environment: PMA_HOST: database-test PMA_USER: root - PMA_PORT: 3311 + PMA_PORT: 3321 UPLOAD_LIMIT: 300M networks: - fcs From 287e342b8a3d7d8a4e5dcb5d52cffdb108e3ad12 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 2 Nov 2022 09:16:02 +0100 Subject: [PATCH 270/646] change nginx docker image path to /app --- .github/workflows/ci.yml | 18 +++++++++--------- Dockerfile | 2 +- devtools/init-dev-setup.sh | 10 +++++----- docker-compose.yml | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8de040565..882b2c33e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,18 +15,18 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v2 - + - name: Run Docker Compose run: CURRENT_UID=$(id -u):$(id -g) docker compose up php-nginx -d - + - name: Setup Dev Environment run: | # do not use ./devtools/init-dev-setup.sh because dev db is not needed bash ./devtools/installation/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh - CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx composer install - CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html/webroot fcs-php-nginx npm install - + CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs-php-nginx composer install + CURRENT_UID=$(id -u):$(id -g) docker exec -w /app/webroot fcs-php-nginx npm install + - name: Apply secrets run: | sed -i 's/HELLO_CASH_USERNAME/${{secrets.HELLO_CASH_USERNAME}}/' ./config/custom_config.php @@ -49,10 +49,10 @@ jobs: SSH_ARGS: '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' - name: PHPStan - run: docker exec -w /var/www/html fcs-php-nginx php ./vendor/bin/phpstan analyze -c phpstan.neon --no-interaction --no-progress - + run: docker exec -w /app fcs-php-nginx php ./vendor/bin/phpstan analyze -c phpstan.neon --no-interaction --no-progress + - name: ESLint - run: docker exec -w /var/www/html fcs-php-nginx bash ./devtools/eslint.sh + run: docker exec -w /app fcs-php-nginx bash ./devtools/eslint.sh - name: PHPUnit Tests - run: docker exec -w /var/www/html fcs-php-nginx php ./vendor/bin/phpunit + run: docker exec -w /app fcs-php-nginx php ./vendor/bin/phpunit diff --git a/Dockerfile b/Dockerfile index 9292ea0a1e..fb8cfda802 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,4 +13,4 @@ RUN apk update && \ npm install -g eslint #avoid permission error on gitpod on running npm install -RUN npm config set cache /var/www/html/tmp --global +RUN npm config set cache /app/tmp --global diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index e9aafef11f..81099453d4 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -3,10 +3,10 @@ bash ./devtools/installation/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh -CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx composer install +CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs-php-nginx composer install -CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate -p Queue -CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations migrate -CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html fcs-php-nginx bash ./bin/cake migrations seed --source Seeds/tests --seed InitTestDataSeed +CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs-php-nginx bash ./bin/cake migrations migrate -p Queue +CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs-php-nginx bash ./bin/cake migrations migrate +CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs-php-nginx bash ./bin/cake migrations seed --source Seeds/tests --seed InitTestDataSeed -CURRENT_UID=$(id -u):$(id -g) docker exec -w /var/www/html/webroot fcs-php-nginx npm install \ No newline at end of file +CURRENT_UID=$(id -u):$(id -g) docker exec -w /app/webroot fcs-php-nginx npm install \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 1786acebd7..558e4d7dd6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,11 +10,11 @@ services: restart: always user: ${CURRENT_UID} environment: - WEB_DOCUMENT_ROOT: /var/www/html/webroot + WEB_DOCUMENT_ROOT: /app/webroot PHP_UPLOAD_MAX_FILESIZE: 200M PHP_POST_MAX_SIZE: 200M volumes: - - ./:/var/www/html + - ./:/app ports: - "8001:80" depends_on: From ec48d31d61a08b198bd1d23f7b66c30a3ee9986e Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 2 Nov 2022 09:54:10 +0100 Subject: [PATCH 271/646] shorter docker container names --- .github/workflows/ci.yml | 10 +++++----- devtools/init-dev-setup.sh | 10 +++++----- docker-compose.yml | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 882b2c33e3..2e6c4ff025 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,8 +24,8 @@ jobs: # do not use ./devtools/init-dev-setup.sh because dev db is not needed bash ./devtools/installation/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh - CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs-php-nginx composer install - CURRENT_UID=$(id -u):$(id -g) docker exec -w /app/webroot fcs-php-nginx npm install + CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs.php composer install + CURRENT_UID=$(id -u):$(id -g) docker exec -w /app/webroot fcs.php npm install - name: Apply secrets run: | @@ -49,10 +49,10 @@ jobs: SSH_ARGS: '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' - name: PHPStan - run: docker exec -w /app fcs-php-nginx php ./vendor/bin/phpstan analyze -c phpstan.neon --no-interaction --no-progress + run: docker exec -w /app fcs.php php ./vendor/bin/phpstan analyze -c phpstan.neon --no-interaction --no-progress - name: ESLint - run: docker exec -w /app fcs-php-nginx bash ./devtools/eslint.sh + run: docker exec -w /app fcs.php bash ./devtools/eslint.sh - name: PHPUnit Tests - run: docker exec -w /app fcs-php-nginx php ./vendor/bin/phpunit + run: docker exec -w /app fcs.php php ./vendor/bin/phpunit diff --git a/devtools/init-dev-setup.sh b/devtools/init-dev-setup.sh index 81099453d4..9f6998459b 100644 --- a/devtools/init-dev-setup.sh +++ b/devtools/init-dev-setup.sh @@ -3,10 +3,10 @@ bash ./devtools/installation/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh -CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs-php-nginx composer install +CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs.php composer install -CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs-php-nginx bash ./bin/cake migrations migrate -p Queue -CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs-php-nginx bash ./bin/cake migrations migrate -CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs-php-nginx bash ./bin/cake migrations seed --source Seeds/tests --seed InitTestDataSeed +CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs.php bash ./bin/cake migrations migrate -p Queue +CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs.php bash ./bin/cake migrations migrate +CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs.php bash ./bin/cake migrations seed --source Seeds/tests --seed InitTestDataSeed -CURRENT_UID=$(id -u):$(id -g) docker exec -w /app/webroot fcs-php-nginx npm install \ No newline at end of file +CURRENT_UID=$(id -u):$(id -g) docker exec -w /app/webroot fcs.php npm install \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 558e4d7dd6..986401c338 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: php-nginx: build: . - container_name: fcs-php-nginx + container_name: fcs.php restart: always user: ${CURRENT_UID} environment: @@ -29,7 +29,7 @@ services: database-dev: image: mysql:8.0 - container_name: fcs-database-dev + container_name: fcs.database.dev restart: always ports: - '3320:3306' @@ -46,7 +46,7 @@ services: database-test: image: mysql:8.0 - container_name: fcs-database-test + container_name: fcs.database.test restart: always tmpfs: /var/lib/mysql:exec,size=1G #smaller size (eg. 256M) lead to failing tests ports: @@ -64,7 +64,7 @@ services: depends_on: - database-dev image: phpmyadmin/phpmyadmin - container_name: fcs-phpmyadmin-dev + container_name: fcs.phpmyadmin.dev restart: always ports: - '8080:80' @@ -80,7 +80,7 @@ services: depends_on: - database-test image: phpmyadmin/phpmyadmin - container_name: fcs-phpmyadmin-test + container_name: fcs.phpmyadmin.test restart: always ports: - '8081:80' From 7e6bf21cf102aa1bc9b276ec0a8c2a7d9fd39e31 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 2 Nov 2022 21:45:52 +0100 Subject: [PATCH 272/646] selecting all objects in admin is much faster --- .../element/rowMarker/rowMarkerAll.php | 3 --- plugins/Admin/webroot/js/admin.js | 24 +++++++++++-------- .../js/modal/modal-order-detail-delete.js | 2 +- .../modal-order-detail-pickup-day-edit.js | 2 +- ...-calculate-selling-price-with-surcharge.js | 2 +- .../webroot/js/modal/modal-product-delete.js | 2 +- .../modal-product-delivery-rhythm-edit.js | 2 +- .../modal/modal-product-status-edit-bulk.js | 2 +- 8 files changed, 20 insertions(+), 19 deletions(-) diff --git a/plugins/Admin/templates/element/rowMarker/rowMarkerAll.php b/plugins/Admin/templates/element/rowMarker/rowMarkerAll.php index a7cf79df47..3da16dd849 100644 --- a/plugins/Admin/templates/element/rowMarker/rowMarkerAll.php +++ b/plugins/Admin/templates/element/rowMarker/rowMarkerAll.php @@ -18,9 +18,6 @@ echo ''; if ($enabled) { - $this->element('addScript', [ - 'script' => Configure::read('app.jsNamespace') . ".Admin.initRowMarkerAll();" - ]); echo ''; } echo ''; diff --git a/plugins/Admin/webroot/js/admin.js b/plugins/Admin/webroot/js/admin.js index 44fc1d6616..939f45fc67 100644 --- a/plugins/Admin/webroot/js/admin.js +++ b/plugins/Admin/webroot/js/admin.js @@ -19,6 +19,7 @@ foodcoopshop.Admin = { foodcoopshop.Helper.showContent(); foodcoopshop.Helper.initMenu(); foodcoopshop.ModalLogout.init(); + this.initRowMarkerAll(); this.setMenuFixed(); this.adaptContentMargin(); this.initStickyTableHeader(); @@ -95,15 +96,17 @@ foodcoopshop.Admin = { foodcoopshop.Helper.selectMainMenu('#menu', mainMenuTitle, subMenuTitle); }, - /** - * @return rowMarker dom element - */ initRowMarkerAll : function () { - var rowMarkerAll = $('input#row-marker-all').on('change', function () { + var rowMarkerAll = $('input#row-marker-all').on('click', function () { + var row; if (this.checked) { - $('input.row-marker[type="checkbox"]:not(:checked)').trigger('click'); + row = $('input.row-marker[type="checkbox"]:not(:checked)'); + row.prop('checked', true); + row.closest('tr').addClass('selected'); } else { - $('input.row-marker[type="checkbox"]:checked').trigger('click'); + row = $('input.row-marker[type="checkbox"]:checked') + row.prop('checked', false); + row.closest('tr').removeClass('selected'); } }); return rowMarkerAll; @@ -145,7 +148,7 @@ foodcoopshop.Admin = { return ids; }, - updateObjectSelectionActionButton : function (button) { + updateObjectSelectionActionButton: function (button) { foodcoopshop.Helper.disableButton(button); if ($('table.list').find('input.row-marker[type="checkbox"]:checked').length > 0) { foodcoopshop.Helper.enableButton(button); @@ -296,7 +299,7 @@ foodcoopshop.Admin = { var button = $(btnSelector); foodcoopshop.Helper.disableButton(button); - $('table.list').find('input.row-marker[type="checkbox"]').on('click', function () { + $('table.list').find('input.row-marker[type="checkbox"],#row-marker-all').on('click', function () { foodcoopshop.Admin.updateObjectSelectionActionButton(button); }); @@ -463,7 +466,7 @@ foodcoopshop.Admin = { var button = $('#generateMemberCardsOfSelectedCustomersButton'); foodcoopshop.Helper.disableButton(button); - $('table.list').find('input.row-marker[type="checkbox"]').on('click', function () { + $('table.list').find('input.row-marker[type="checkbox"],#row-marker-all').on('click', function () { foodcoopshop.Admin.updateObjectSelectionActionButton(button); }); @@ -477,7 +480,8 @@ foodcoopshop.Admin = { var button = $('#generateProductCardsOfSelectedProductsButton'); foodcoopshop.Helper.disableButton(button); - $('table.list').find('input.row-marker[type="checkbox"]').on('click', function () { + $('table.list').find('input.row-marker[type="checkbox"],#row-marker-all').on('click', function () { + console.log('click'); foodcoopshop.Admin.updateObjectSelectionActionButton(button); }); diff --git a/plugins/Admin/webroot/js/modal/modal-order-detail-delete.js b/plugins/Admin/webroot/js/modal/modal-order-detail-delete.js index 1c22cedd15..73897d23d0 100644 --- a/plugins/Admin/webroot/js/modal/modal-order-detail-delete.js +++ b/plugins/Admin/webroot/js/modal/modal-order-detail-delete.js @@ -18,7 +18,7 @@ foodcoopshop.ModalOrderDetailDelete = { var button = $('#deleteSelectedProductsButton'); foodcoopshop.Helper.disableButton(button); - $('table.list').find('input.row-marker[type="checkbox"]').on('click', function () { + $('table.list').find('input.row-marker[type="checkbox"],#row-marker-all').on('click', function () { foodcoopshop.Admin.updateObjectSelectionActionButton(button); }); diff --git a/plugins/Admin/webroot/js/modal/modal-order-detail-pickup-day-edit.js b/plugins/Admin/webroot/js/modal/modal-order-detail-pickup-day-edit.js index b245be083f..6ec5db45ee 100644 --- a/plugins/Admin/webroot/js/modal/modal-order-detail-pickup-day-edit.js +++ b/plugins/Admin/webroot/js/modal/modal-order-detail-pickup-day-edit.js @@ -18,7 +18,7 @@ foodcoopshop.ModalOrderDetailPickupDayEdit = { var button = $('#changePickupDayOfSelectedProductsButton'); foodcoopshop.Helper.disableButton(button); - $('table.list').find('input.row-marker[type="checkbox"]').on('click', function () { + $('table.list').find('input.row-marker[type="checkbox"],#row-marker-all').on('click', function () { foodcoopshop.Admin.updateObjectSelectionActionButton(button); }); diff --git a/plugins/Admin/webroot/js/modal/modal-product-calculate-selling-price-with-surcharge.js b/plugins/Admin/webroot/js/modal/modal-product-calculate-selling-price-with-surcharge.js index 4369e242ef..78c21782f4 100644 --- a/plugins/Admin/webroot/js/modal/modal-product-calculate-selling-price-with-surcharge.js +++ b/plugins/Admin/webroot/js/modal/modal-product-calculate-selling-price-with-surcharge.js @@ -20,7 +20,7 @@ foodcoopshop.ModalProductCalculateSellingPriceWithSurcharge = { var button = $('#calculateSellingPriceWithSurchargForSelectedProducts'); foodcoopshop.Helper.disableButton(button); - $('table.list').find('input.row-marker[type="checkbox"]').on('click', function () { + $('table.list').find('input.row-marker[type="checkbox"],#row-marker-all').on('click', function () { foodcoopshop.Admin.updateObjectSelectionActionButton(button); }); diff --git a/plugins/Admin/webroot/js/modal/modal-product-delete.js b/plugins/Admin/webroot/js/modal/modal-product-delete.js index a71e983857..db6ac95040 100644 --- a/plugins/Admin/webroot/js/modal/modal-product-delete.js +++ b/plugins/Admin/webroot/js/modal/modal-product-delete.js @@ -20,7 +20,7 @@ foodcoopshop.ModalProductDelete = { var button = $('#deleteSelectedProducts'); foodcoopshop.Helper.disableButton(button); - $('table.list').find('input.row-marker[type="checkbox"]').on('click', function () { + $('table.list').find('input.row-marker[type="checkbox"],#row-marker-all').on('click', function () { foodcoopshop.Admin.updateObjectSelectionActionButton(button); }); diff --git a/plugins/Admin/webroot/js/modal/modal-product-delivery-rhythm-edit.js b/plugins/Admin/webroot/js/modal/modal-product-delivery-rhythm-edit.js index 1dd53d5ffb..9fb752e0f0 100644 --- a/plugins/Admin/webroot/js/modal/modal-product-delivery-rhythm-edit.js +++ b/plugins/Admin/webroot/js/modal/modal-product-delivery-rhythm-edit.js @@ -18,7 +18,7 @@ foodcoopshop.ModalProductDeliveryRhythmEdit = { var button = $('#editDeliveryRhythmForSelectedProducts'); foodcoopshop.Helper.disableButton(button); - $('table.list').find('input.row-marker[type="checkbox"]').on('click', function () { + $('table.list').find('input.row-marker[type="checkbox"],#row-marker-all').on('click', function () { foodcoopshop.Admin.updateObjectSelectionActionButton(button); }); diff --git a/plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js b/plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js index 38a15d722d..50d84f395f 100644 --- a/plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js +++ b/plugins/Admin/webroot/js/modal/modal-product-status-edit-bulk.js @@ -20,7 +20,7 @@ foodcoopshop.ModalProductStatusEditBulk = { var button = $('#editStatusForSelectedProducts'); foodcoopshop.Helper.disableButton(button); - $('table.list').find('input.row-marker[type="checkbox"]').on('click', function () { + $('table.list').find('input.row-marker[type="checkbox"],#row-marker-all').on('click', function () { foodcoopshop.Admin.updateObjectSelectionActionButton(button); }); From 6a5ed14477133f683aaac68965ec580953fb61bc Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 3 Nov 2022 07:55:08 +0100 Subject: [PATCH 273/646] remove whitspace below filter --- webroot/css/self-service.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webroot/css/self-service.css b/webroot/css/self-service.css index 86f76f5a96..166bf7b920 100644 --- a/webroot/css/self-service.css +++ b/webroot/css/self-service.css @@ -21,7 +21,7 @@ body.self_services #content, width: 917px; } body.self_services #content { - margin-top: 104px; + margin-top: -46px; } .self-service { background-color: #fff; From 6041b11ea94e3a5fa0b9a55fefb25d4251cda66b Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 3 Nov 2022 19:45:47 +0100 Subject: [PATCH 274/646] keep selected order details when select all is clicked --- plugins/Admin/webroot/js/admin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Admin/webroot/js/admin.js b/plugins/Admin/webroot/js/admin.js index 939f45fc67..142a7a278f 100644 --- a/plugins/Admin/webroot/js/admin.js +++ b/plugins/Admin/webroot/js/admin.js @@ -45,7 +45,7 @@ foodcoopshop.Admin = { } - $('.row-marker').on('click', function() { + $('.row-marker,#row-marker-all').on('click', function () { var selectedOrderDetailIds = foodcoopshop.Admin.getSelectedOrderDetailIds(); From 8d9fc09566a5847da2f41ca0cdc10858b98a36d6 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 3 Nov 2022 20:50:59 +0100 Subject: [PATCH 275/646] better visibility of products with enabled delivery break --- templates/element/catalog/cartButton.php | 7 ++-- templates/element/catalog/columns/column2.php | 32 ++++++++++--------- webroot/css/frontend.css | 14 ++++++-- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/templates/element/catalog/cartButton.php b/templates/element/catalog/cartButton.php index 47b6b695df..758ed19a13 100644 --- a/templates/element/catalog/cartButton.php +++ b/templates/element/catalog/cartButton.php @@ -24,7 +24,7 @@ is_stock_product && $product->manufacturer->stock_management_enabled) { $availableQuantity = $stockAvailableQuantity - $stockAvailableQuantityLimit; @@ -32,9 +32,10 @@ if (((($product->is_stock_product && $product->manufacturer->stock_management_enabled) || !$stockAvailableAlwaysAvailable) && $availableQuantity <= 0) || $deliveryBreakEnabled) { - $disabledClass = 'disabled '; + $classes[] = 'disabled'; if ($deliveryBreakEnabled) { + $classes[] = 'btn-danger'; $cartButtonIcon = 'fa-times'; $cartButtonLabel = __('Delivery_break') . '!'; } @@ -42,7 +43,7 @@ } ?> - + diff --git a/templates/element/catalog/columns/column2.php b/templates/element/catalog/columns/column2.php index b6914d3cae..195c4d588b 100644 --- a/templates/element/catalog/columns/column2.php +++ b/templates/element/catalog/columns/column2.php @@ -28,22 +28,24 @@ echo ''; echo '
'; -if ($product->description_short != '') { - echo $product->description_short.'
'; -} +echo '
'; + if ($product->description_short != '') { + echo $product->description_short.'
'; + } -if ($product->description != '') { - echo $this->Html->link( - ' '.__('Show_more'), - 'javascript:void(0);', - [ - 'class' => 'toggle-link', - 'title' => __('More_infos_to_product_{0}', [h($product->name)]), - 'escape' => false - ] - ); - echo '
'.$product->description.'
'; -} + if ($product->description != '') { + echo $this->Html->link( + ' '.__('Show_more'), + 'javascript:void(0);', + [ + 'class' => 'toggle-link', + 'title' => __('More_infos_to_product_{0}', [h($product->name)]), + 'escape' => false + ] + ); + echo '
'.$product->description.'
'; + } +echo '
'; if (!Configure::read('appDb.FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY')) { diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index 7f64c51bb7..558d0e5d2a 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -427,7 +427,17 @@ body.superadmin .pw .heading h4 { .pw div.c1 span.fa-stack i.fa-star { color: #fff; } -.pw div.c3 .unity, +.pw.delivery-break-enabled { + background-color: #efefef; + opacity: .7; +} +.pw.delivery-break-enabled .descriptions { + display: none; +} +body.products.detail .pw.delivery-break-enabled .descriptions { + display: block; +} + .pw div.c3 .unity, .pw .radio label { word-break: break-word; } @@ -444,7 +454,7 @@ body.superadmin .pw .heading h4 { .manufacturer-wrapper div.c2 { float: left; width: 355px; - min-height: 170px; + min-height: 113px; padding-right: 15px; margin-right: 15px; border-right: 1px solid #d6d4d4; From cdce6bd1633e3f095bb9a9d8d0ef28c71ee01917 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 4 Nov 2022 17:07:27 +0100 Subject: [PATCH 276/646] vendor updates --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index 1e30129c7a..e102555f65 100644 --- a/composer.lock +++ b/composer.lock @@ -4196,16 +4196,16 @@ }, { "name": "composer/pcre", - "version": "3.0.0", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd" + "reference": "4482b6409ca6bfc2af043a5711cd21ac3e7a8dfb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd", - "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd", + "url": "https://api.github.com/repos/composer/pcre/zipball/4482b6409ca6bfc2af043a5711cd21ac3e7a8dfb", + "reference": "4482b6409ca6bfc2af043a5711cd21ac3e7a8dfb", "shasum": "" }, "require": { @@ -4247,7 +4247,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.0.0" + "source": "https://github.com/composer/pcre/tree/3.0.2" }, "funding": [ { @@ -4263,7 +4263,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T20:21:48+00:00" + "time": "2022-11-03T20:24:16+00:00" }, { "name": "composer/semver", @@ -5176,16 +5176,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.8.11", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "46e223dd68a620da18855c23046ddb00940b4014" + "reference": "a59c8b5bfd4a236f27efc8b5ce72c313c2b54b5f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/46e223dd68a620da18855c23046ddb00940b4014", - "reference": "46e223dd68a620da18855c23046ddb00940b4014", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a59c8b5bfd4a236f27efc8b5ce72c313c2b54b5f", + "reference": "a59c8b5bfd4a236f27efc8b5ce72c313c2b54b5f", "shasum": "" }, "require": { @@ -5215,7 +5215,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.8.11" + "source": "https://github.com/phpstan/phpstan/tree/1.9.1" }, "funding": [ { @@ -5231,7 +5231,7 @@ "type": "tidelift" } ], - "time": "2022-10-24T15:45:13+00:00" + "time": "2022-11-04T13:35:59+00:00" }, { "name": "phpunit/php-code-coverage", From ec8ec249fd19d49d6498bcb05027f1c92993a230 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 6 Nov 2022 19:51:03 +0100 Subject: [PATCH 277/646] remove unused functions --- webroot/js/helper.js | 39 --------------------------------------- 1 file changed, 39 deletions(-) diff --git a/webroot/js/helper.js b/webroot/js/helper.js index 237eebf0d3..60d6f44fcc 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -176,28 +176,6 @@ foodcoopshop.Helper = { }); }, - /** - * Returns a function, that, as long as it continues to be invoked, will not - * be triggered. The function will be called after it stops being called for - * N milliseconds. If `immediate` is passed, trigger the function on the - * leading edge, instead of the trailing. - * https://davidwalsh.name/javascript-debounce-function - */ - debounce: function(func, wait, immediate) { - var timeout; - return function() { - var context = this, args = arguments; - var later = function() { - timeout = null; - if (!immediate) func.apply(context, args); - }; - var callNow = immediate && !timeout; - clearTimeout(timeout); - timeout = setTimeout(later, wait); - if (callNow) func.apply(context, args); - }; - }, - addPrevAndNextCategoryLinks : function() { this.addPrevAndNextLinks( '#categories-menu li a', @@ -325,23 +303,6 @@ foodcoopshop.Helper = { }); }, - getJqueryUiNoButton : function() { - return this.getJqueryUiCloseDialogButton(foodcoopshop.LocalizedJs.helper.no); - }, - - getJqueryUiCancelButton : function() { - return this.getJqueryUiCloseDialogButton(foodcoopshop.LocalizedJs.helper.cancel); - }, - - getJqueryUiCloseDialogButton : function(label) { - return { - text: label, - click: function() { - $(this).dialog('close'); - } - }; - }, - initBlogPostCarousel: function () { var selector = '.blog-wrapper'; From d07243a31efd7453bd1ca53f4b84fbf139f9fb90 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 6 Nov 2022 19:51:20 +0100 Subject: [PATCH 278/646] code cleaning .ui-dialog --- plugins/Admin/webroot/css/admin.css | 9 +-------- plugins/Admin/webroot/css/mobile.css | 9 --------- plugins/Network/webroot/js/sync-base.js | 3 --- webroot/css/global.css | 7 ------- webroot/css/mobile-frontend-portrait.css | 4 ---- webroot/css/mobile-global.css | 3 --- 6 files changed, 1 insertion(+), 34 deletions(-) diff --git a/plugins/Admin/webroot/css/admin.css b/plugins/Admin/webroot/css/admin.css index 719bb35a44..1e49a4ffe6 100644 --- a/plugins/Admin/webroot/css/admin.css +++ b/plugins/Admin/webroot/css/admin.css @@ -426,10 +426,6 @@ body.configurations.index td { form div.error-message { margin-left: 220px; } -.ui-dialog-content label { - font-weight: 600; - margin-bottom: 0; -} .overlay-info { color: red; font-weight: 600; @@ -536,7 +532,7 @@ table.list td.amount > .has-separator:after { content: ' / '; } .cke_dialog_container { - z-index: 2147483650 ! important; /* open upload from dialog - 2 more than .ui-dialog */ + z-index: 2147483650 ! important; /* open upload from dialog */ } #manufacturer-options-edit-form h3 { margin-top: 15px; @@ -596,9 +592,6 @@ body.payments .bottom-button-container { width: 20px; height: 20px; } -.ui-dialog.has-datepicker { - z-index: 2147483646 ! important; -} #product-is-stock-product-edit-form input { float: right ! important; } diff --git a/plugins/Admin/webroot/css/mobile.css b/plugins/Admin/webroot/css/mobile.css index 484dbfee68..4a7890f871 100644 --- a/plugins/Admin/webroot/css/mobile.css +++ b/plugins/Admin/webroot/css/mobile.css @@ -96,11 +96,6 @@ body.pages.home .filter-container, body.pages.home #content { background: transparent; } -.ui-dialog { - min-width: 200px ! important; - width: 98% ! important; - max-width: 450px ! important; -} .product-attributes-dropdown { width: 100%; } @@ -140,10 +135,6 @@ div.cke { form.fcs-form .input .after.small { width: 100%; } -.ui-dialog-content #flashMessage { - width: 96%; - left: 2%; -} table.list th, table.list tr.fake-th td { word-break: normal; diff --git a/plugins/Network/webroot/js/sync-base.js b/plugins/Network/webroot/js/sync-base.js index 10dc0db7ee..fdb9860052 100644 --- a/plugins/Network/webroot/js/sync-base.js +++ b/plugins/Network/webroot/js/sync-base.js @@ -205,9 +205,6 @@ foodcoopshop.SyncBase = { } } foodcoopshop.Helper.showOrAppendErrorMessage(syncDomain + ': ' + errorMessage); - $('.ui-dialog-content').dialog('close'); - $('.ui-dialog .ajax-loader').hide(); - $('.ui-dialog button').attr('disabled', false); // TODO better implementation needed - maybe add callback for failures? $('.product-list').removeClass('loader'); }); diff --git a/webroot/css/global.css b/webroot/css/global.css index 06889bc6ee..e8d917ceb8 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -591,13 +591,6 @@ tr.selected > td > div > i.far, table:not(.no-hover) tr:hover > td > div > i.far top: 8px; font-size: 15px; } -.ui-dialog-content #flashMessage { - position: absolute; - top: 10px; - width: 98%; - left: 1% ! important; -} - .cookieConsentWrapper button.cookieConsent__Button { display: none; } diff --git a/webroot/css/mobile-frontend-portrait.css b/webroot/css/mobile-frontend-portrait.css index 5ce5293d96..94169b79b1 100644 --- a/webroot/css/mobile-frontend-portrait.css +++ b/webroot/css/mobile-frontend-portrait.css @@ -18,10 +18,6 @@ #RegistrationForm .input.checkbox input[type="checkbox"] { margin-top: 8px; } - .ui-dialog { - width: 98% ! important; - max-width: 450px ! important; - } body.categories .blog-post-wrapper, body.manufacturers.detail .blog-post-wrapper, body.pages.home .blog-post-wrapper, diff --git a/webroot/css/mobile-global.css b/webroot/css/mobile-global.css index 1ffc8cc67c..6c764aba18 100644 --- a/webroot/css/mobile-global.css +++ b/webroot/css/mobile-global.css @@ -67,9 +67,6 @@ #flashMessage img { height: 100px; } - .ui-dialog-content #flashMessage { - left: 50% ! important; - } .sb-left { -webkit-box-shadow: 5px 0 5px -2px #888; box-shadow: 5px 0 5px -2px #888; From b7eef2eaf356181901ffd3931d352a6329924e11 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 6 Nov 2022 19:56:18 +0100 Subject: [PATCH 279/646] remove unused function --- plugins/Admin/webroot/js/admin.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/plugins/Admin/webroot/js/admin.js b/plugins/Admin/webroot/js/admin.js index 142a7a278f..8907d78e1e 100644 --- a/plugins/Admin/webroot/js/admin.js +++ b/plugins/Admin/webroot/js/admin.js @@ -438,11 +438,6 @@ foodcoopshop.Admin = { return url; }, - addParameterToURL : function(url, param) { - url += (url.split('?')[1] ? '&':'?') + param; - return url; - }, - setMenuFixed: function () { $(window).scroll(function () { $('#menu').css('left', -$(window).scrollLeft()); From b487c5db3009456258aa6289a807fbc65b6b8b86 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 7 Nov 2022 09:14:55 +0100 Subject: [PATCH 280/646] vendor updates --- composer.lock | 12 ++++++------ webroot/package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index e102555f65..caf4423b7f 100644 --- a/composer.lock +++ b/composer.lock @@ -5655,16 +5655,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.8", + "version": "v0.11.9", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "f455acf3645262ae389b10e9beba0c358aa6994e" + "reference": "1acec99d6684a54ff92f8b548a4e41b566963778" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/f455acf3645262ae389b10e9beba0c358aa6994e", - "reference": "f455acf3645262ae389b10e9beba0c358aa6994e", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/1acec99d6684a54ff92f8b548a4e41b566963778", + "reference": "1acec99d6684a54ff92f8b548a4e41b566963778", "shasum": "" }, "require": { @@ -5725,9 +5725,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.8" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.9" }, - "time": "2022-07-28T14:25:11+00:00" + "time": "2022-11-06T15:29:46+00:00" }, { "name": "react/promise", diff --git a/webroot/package.json b/webroot/package.json index 3d0bd8ca06..48f600a436 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.4", - "@ericblade/quagga2": "^1.7.6", + "@ericblade/quagga2": "^1.7.7", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.2", From 2d65b853ec23f92bc4f74ccb1fd6aca5dff7d1f5 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 7 Nov 2022 10:49:34 +0100 Subject: [PATCH 281/646] get orders api for manufacturers --- .../Network/src/Controller/ApiController.php | 71 +++++++++++++++++- .../src/Controller/ApiControllerTest.php | 75 ++++++++++++++++++- 2 files changed, 143 insertions(+), 3 deletions(-) diff --git a/plugins/Network/src/Controller/ApiController.php b/plugins/Network/src/Controller/ApiController.php index 4be518fef3..23811d7c40 100644 --- a/plugins/Network/src/Controller/ApiController.php +++ b/plugins/Network/src/Controller/ApiController.php @@ -3,10 +3,11 @@ namespace Network\Controller; -use App\Lib\Error\Exception\InvalidParameterException; -use Cake\Controller\Controller; use Cake\Core\Configure; use Cake\Event\EventInterface; +use Cake\Controller\Controller; +use Cake\Database\Expression\QueryExpression; +use App\Lib\Error\Exception\InvalidParameterException; /** * FoodCoopShop - The open source software for your foodcoop @@ -425,4 +426,70 @@ public function getProducts() ]); $this->viewBuilder()->setOption('serialize', ['app', 'loggedUser', 'products']); } + + public function getOrders() + { + + $this->loadComponent('Sanitize'); + $this->setRequest($this->getRequest()->withParsedBody($this->Sanitize->trimRecursive($this->getRequest()->getData()))); + $this->setRequest($this->getRequest()->withParsedBody($this->Sanitize->stripTagsAndPurifyRecursive($this->getRequest()->getData()))); + + $pickupDay = h($this->getRequest()->getQuery('pickupDay')); + $formattedPickupDay = Configure::read('app.timeHelper')->formatToDbFormatDate($pickupDay); + + if (empty($pickupDay) || $formattedPickupDay == '1970-01-01') { + $this->set([ + 'error' => 'wrong pickupDay format', + ]); + $this->viewBuilder()->setOption('serialize', ['error']); + return; + } + $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); + $conditions = [ + 'Products.id_manufacturer' => $this->AppAuth->getManufacturerId(), + ]; + $exp = new QueryExpression(); + $conditions[] = $exp->eq('DATE_FORMAT(OrderDetails.pickup_day, \'%Y-%m-%d\')', $formattedPickupDay); + + $orderDetails = $this->OrderDetail->find('all', [ + 'conditions' => $conditions, + 'contain' => [ + 'Products', + 'OrderDetailUnits', + ], + ]); + + $preparedOrders = []; + foreach($orderDetails as $orderDetail) + { + $preparedOrder = [ + 'id' => $orderDetail->id_order_detail, + 'product_id' => $orderDetail->product_id, + 'attribute_id' => $orderDetail->product_attribute_id, + 'name' => $orderDetail->product_name, + 'amount' => $orderDetail->product_amount, + 'order_state' => $orderDetail->order_state, + 'created' => $orderDetail->created, + ]; + if (!empty($orderDetail->order_detail_unit)) { + $preparedOrder['unit'] = [ + 'name' => $orderDetail->order_detail_unit->unit_name, + 'product_quantity_in_units' => $orderDetail->order_detail_unit->product_quantity_in_units, + 'mark_as_saved' => (bool) $orderDetail->order_detail_unit->mark_as_saved, + ]; + } + $preparedOrders[] = $preparedOrder; + } + + $this->set([ + 'app' => [ + 'name' => $this->getInstallationName(), + 'domain' => Configure::read('App.fullBaseUrl'), + 'orders' => $preparedOrders, + ], + ]); + $this->viewBuilder()->setOption('serialize', ['app', 'orders']); + + } + } diff --git a/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php b/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php index be9b138dea..1448774d86 100644 --- a/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php +++ b/plugins/Network/tests/TestCase/src/Controller/ApiControllerTest.php @@ -74,4 +74,77 @@ public function testGetProductsAsManufacturer() $this->assertSameAsFile('products-for-demo-vegetable-manufacturer.json', $preparedResponse); } -} + public function testGetOrdersWrongPickupDayFormat() + { + $this->configRequest([ + 'environment' => [ + 'PHP_AUTH_USER' => Configure::read('test.loginEmailMeatManufacturer'), + 'PHP_AUTH_PW' => Configure::read('test.loginPassword'), + ] + ]); + $this->get('/api/getOrders.json?pickupDay=test'); + $response = json_decode($this->_response->getBody()->__toString()); + $this->assertEquals('wrong pickupDay format', $response->error); + } + + public function testGetOrdersOk() + { + + $this->loginAsSuperadmin(); + $productIdA = 347; // forelle + $productIdB = '348-11'; // rindfleisch, 0,5 kg + $productIdC = '103'; // bratwürstel + $this->addProductToCart($productIdA, 2); + $this->addProductToCart($productIdB, 3); + $this->addProductToCart($productIdC, 1); + $this->finishCart(1, 1); + + $productsTable = $this->getTableLocator()->get('Products'); + $dummyProduct = $productsTable->newEntity([ + 'delivery_rhythm_type' => 'week', + 'delivery_rhythm_count' => '1', + 'is_stock_product' => '0', + ]); + $nextDeliveryDay = DeliveryRhythm::getNextPickupDayForProduct($dummyProduct); + + $this->configRequest([ + 'environment' => [ + 'PHP_AUTH_USER' => Configure::read('test.loginEmailMeatManufacturer'), + 'PHP_AUTH_PW' => Configure::read('test.loginPassword'), + ] + ]); + $this->get('/api/getOrders.json?pickupDay=' . $nextDeliveryDay); + $response = json_decode($this->_response->getBody()->__toString()); + + $this->assertEquals(4, $response->app->orders[0]->id); + $this->assertEquals(348, $response->app->orders[0]->product_id); + $this->assertEquals(11, $response->app->orders[0]->attribute_id); + $this->assertEquals('Rindfleisch', $response->app->orders[0]->name); + $this->assertEquals(3, $response->app->orders[0]->amount); + $this->assertEquals(3, $response->app->orders[0]->order_state); + $this->assertEquals('kg', $response->app->orders[0]->unit->name); + $this->assertEquals(1.500, $response->app->orders[0]->unit->product_quantity_in_units); + $this->assertEquals(false, $response->app->orders[0]->unit->mark_as_saved); + + $this->assertEquals(5, $response->app->orders[1]->id); + $this->assertEquals(347, $response->app->orders[1]->product_id); + $this->assertEquals(0, $response->app->orders[1]->attribute_id); + $this->assertEquals('Forelle : Stück', $response->app->orders[1]->name); + $this->assertEquals(2, $response->app->orders[1]->amount); + $this->assertEquals(3, $response->app->orders[1]->order_state); + $this->assertEquals('g', $response->app->orders[1]->unit->name); + $this->assertEquals(700, $response->app->orders[1]->unit->product_quantity_in_units); + $this->assertEquals(false, $response->app->orders[1]->unit->mark_as_saved); + + $this->assertEquals(6, $response->app->orders[2]->id); + $this->assertEquals(103, $response->app->orders[2]->product_id); + $this->assertEquals(0, $response->app->orders[2]->attribute_id); + $this->assertEquals('Bratwürstel', $response->app->orders[2]->name); + $this->assertEquals(1, $response->app->orders[2]->amount); + $this->assertEquals(3, $response->app->orders[2]->order_state); + $this->assertFalse(isset($response->app->orders[2]->unit)); + + + } + +} \ No newline at end of file From 89685bdffc50efcda5fcaf3b7ef14439ccfb8bd3 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 8 Nov 2022 11:35:27 +0100 Subject: [PATCH 282/646] access docker network from other containers --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 986401c338..a39ebe4e9b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -97,3 +97,5 @@ volumes: networks: fcs: + name: fcs + driver: bridge From 33500d1c9fc5e02fe24621a8db8c3d8e5e0623fe Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 8 Nov 2022 11:39:03 +0100 Subject: [PATCH 283/646] 899 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 298067d8a8..45bfd9c961 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,8 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe - Superadmins können Tag und Uhrzeit der Cronjobs (z.B. die automatische Bestell-Erinnerung, Rechnungsversand) jetzt selber im Admin-Bereich (Homepage-Verwaltung / Einstellungen / neuer Tab "Cronjobs") ändern. [I#860](https://github.com/foodcoopshop/foodcoopshop/issues/860) / [PR#74](https://github.com/foodcoopshop/foodcoopshop/pull/874) - Die Konfiguration "Freitag Bestellschluss / Samstag Bestelllisten-Versand / Donnerstag Abholtag" ist jetzt möglich. [I#866](https://github.com/foodcoopshop/foodcoopshop/issues/866) / [PR#867](https://github.com/foodcoopshop/foodcoopshop/pull/867) - Die Überschriften aller Tabellen im Admin-Bereich bleiben jetzt beim Scrollen sichtbar (nicht in iOS). [PR#888](https://github.com/foodcoopshop/foodcoopshop/pull/888) -- Im Produkt-Admin kann jetzt der Status (aktiviert, deaktiviert) von mehreren markierten Produkten auf einmal geändert werden. [I#895](https://github.com/foodcoopshop/foodcoopshop/issues/897) / [PR#897](https://github.com/foodcoopshop/foodcoopshop/pull/897) +- Im Produkt-Admin kann jetzt der Status (aktiviert, deaktiviert) von mehreren markierten Produkten auf einmal geändert werden. [I#895](https://github.com/foodcoopshop/foodcoopshop/issues/895) / [PR#897](https://github.com/foodcoopshop/foodcoopshop/pull/897) +- Hersteller können Bestellungen über [eine neue API](https://foodcoopshop.github.io/de/netzwerk-modul.html#6-api-zum-abrufen-von-bestellungen) aufrufen. [I#894](https://github.com/foodcoopshop/foodcoopshop/issues/894) / [PR#899](https://github.com/foodcoopshop/foodcoopshop/pull/899) ### For developers From 2b1dfcddce959fc941ee0be9f9cd8da92226e7b9 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 8 Nov 2022 11:43:21 +0100 Subject: [PATCH 284/646] wording --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45bfd9c961..8832bd71e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe - Die Konfiguration "Freitag Bestellschluss / Samstag Bestelllisten-Versand / Donnerstag Abholtag" ist jetzt möglich. [I#866](https://github.com/foodcoopshop/foodcoopshop/issues/866) / [PR#867](https://github.com/foodcoopshop/foodcoopshop/pull/867) - Die Überschriften aller Tabellen im Admin-Bereich bleiben jetzt beim Scrollen sichtbar (nicht in iOS). [PR#888](https://github.com/foodcoopshop/foodcoopshop/pull/888) - Im Produkt-Admin kann jetzt der Status (aktiviert, deaktiviert) von mehreren markierten Produkten auf einmal geändert werden. [I#895](https://github.com/foodcoopshop/foodcoopshop/issues/895) / [PR#897](https://github.com/foodcoopshop/foodcoopshop/pull/897) -- Hersteller können Bestellungen über [eine neue API](https://foodcoopshop.github.io/de/netzwerk-modul.html#6-api-zum-abrufen-von-bestellungen) aufrufen. [I#894](https://github.com/foodcoopshop/foodcoopshop/issues/894) / [PR#899](https://github.com/foodcoopshop/foodcoopshop/pull/899) +- Hersteller können ihre Bestellungen über [eine neue API](https://foodcoopshop.github.io/de/netzwerk-modul.html#6-api-zum-abrufen-von-bestellungen) abrufen und sie so im eigenen System weiterverarbeiten. [I#894](https://github.com/foodcoopshop/foodcoopshop/issues/894) / [PR#899](https://github.com/foodcoopshop/foodcoopshop/pull/899) ### For developers From 23951dd6a763bf15975444d3bdb440c90f19dbf7 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 8 Nov 2022 16:13:49 +0100 Subject: [PATCH 285/646] add all tests in phpstan path --- .../src/Controller/InvoicesControllerTest.php | 4 +++- .../src/Controller/ListsControllerTest.php | 2 ++ .../ManufacturersControllerTest.php | 11 ++++------- .../OrderDetailsControllerAddFeedbackTest.php | 1 + ...OrderDetailsControllerCancellationTest.php | 2 ++ .../OrderDetailsControllerEditAmountTest.php | 2 ++ ...OrderDetailsControllerEditCustomerTest.php | 1 + .../OrderDetailsControllerEditNameTest.php | 2 ++ .../OrderDetailsControllerEditPriceTest.php | 1 + ...DetailsControllerEditPurchasePriceTest.php | 2 ++ ...OrderDetailsControllerEditQuantityTest.php | 2 ++ .../src/Controller/PaymentsControllerTest.php | 2 ++ .../src/Controller/ProductsControllerTest.php | 2 +- .../src/Model/Table/InvoicesTableTest.php | 4 +++- .../Table/ProductAttributesTableTest.php | 5 +++-- .../Table/PurchasePriceProductsTableTest.php | 1 + .../src/Model/Table/UnitsTableTest.php | 2 +- .../src/Controller/SyncsControllerTest.php | 2 ++ tests/TestCase/AppCakeTestCase.php | 12 +++++------- .../OrderDetailsControllerTestCase.php | 5 +++++ .../Traits/PrepareAndTestInvoiceDataTrait.php | 2 ++ .../src/Controller/CartsControllerTest.php | 19 ++++++++----------- .../CustomersFrontendControllerTest.php | 2 +- .../ManufacturersFrontendControllerTest.php | 6 +++--- .../src/Controller/PagesControllerTest.php | 5 +++-- .../ProductsFrontendControllerTest.php | 6 ++++-- .../Controller/SelfServiceControllerTest.php | 5 +++++ .../Lib/DeliveryRhythm/DeliveryRhythmTest.php | 3 +++ .../src/Lib/HelloCash/HelloCashTest.php | 1 + .../src/Model/Table/CronjobsTableTest.php | 7 ++++--- .../src/Shell/EmailOrderReminderShellTest.php | 3 +++ .../src/Shell/PickupReminderShellTest.php | 3 +++ .../SendInvoicesToCustomersShellTest.php | 4 ++++ .../SendInvoicesToManufacturersShellTest.php | 3 +++ .../src/Shell/SendOrderListsShellTest.php | 5 +++++ .../src/View/Helper/MyHtmlHelperTest.php | 2 ++ .../src/View/Helper/MyNumberHelperTest.php | 2 ++ .../src/View/Helper/MyTimeHelperTest.php | 2 ++ 38 files changed, 103 insertions(+), 42 deletions(-) diff --git a/plugins/Admin/tests/TestCase/src/Controller/InvoicesControllerTest.php b/plugins/Admin/tests/TestCase/src/Controller/InvoicesControllerTest.php index 795f385969..26d03d32cf 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/InvoicesControllerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/InvoicesControllerTest.php @@ -30,6 +30,8 @@ class InvoicesControllerTest extends AppCakeTestCase use LoginTrait; use PrepareAndTestInvoiceDataTrait; + protected $Invoice; + public function testGeneratePaidInCashSavedCorrectly() { @@ -118,7 +120,7 @@ public function testCancel() ])->toArray(); $paymentIds = Hash::extract($payments, '{n}.id'); - $response = $this->ajaxPost( + $this->ajaxPost( '/admin/invoices/cancel/', [ 'invoiceId' => $invoice->id, diff --git a/plugins/Admin/tests/TestCase/src/Controller/ListsControllerTest.php b/plugins/Admin/tests/TestCase/src/Controller/ListsControllerTest.php index 1ee06fcb13..cce7bbb97e 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/ListsControllerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/ListsControllerTest.php @@ -28,6 +28,8 @@ class ListsControllerTest extends AppCakeTestCase use LoginTrait; use PrepareAndTestInvoiceDataTrait; + protected $Invoice; + public function setUp(): void { parent::setUp(); diff --git a/plugins/Admin/tests/TestCase/src/Controller/ManufacturersControllerTest.php b/plugins/Admin/tests/TestCase/src/Controller/ManufacturersControllerTest.php index 7bdf113a9c..6bc9781082 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/ManufacturersControllerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/ManufacturersControllerTest.php @@ -26,6 +26,8 @@ class ManufacturersControllerTest extends AppCakeTestCase use LoginTrait; public $Manufacturer; + protected $OrderDetail; + protected $Product; public $manufacturerData = [ 'Manufacturers' => [ @@ -352,7 +354,7 @@ public function testEditMain() $this->logout(); } - private function doTestCustomerRecord($manufacturer) + private function doTestCustomerRecord($manufacturer): void { $customerRecord = $this->Manufacturer->getCustomerRecord($manufacturer->address_manufacturer->email); $this->assertEquals($manufacturer->address_manufacturer->firstname, $customerRecord->firstname); @@ -361,12 +363,7 @@ private function doTestCustomerRecord($manufacturer) $this->assertEquals(APP_ON, $customerRecord->active); } - /** - * - * @param array $data - * @return string - */ - private function add($data) + private function add($data): void { $this->post($this->Slug->getManufacturerAdd(), $data); } diff --git a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerAddFeedbackTest.php b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerAddFeedbackTest.php index 2c8ae59e1a..0a9c6d2fcf 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerAddFeedbackTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerAddFeedbackTest.php @@ -21,6 +21,7 @@ class OrderDetailsControllerAddFeedbackTest extends OrderDetailsControllerTestCase { + protected $OrderDetail; public $orderDetailFeedback = 'Product tasted great! Thank you!'; public $orderDetailId = 1; diff --git a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerCancellationTest.php b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerCancellationTest.php index 02e487996b..6376a904be 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerCancellationTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerCancellationTest.php @@ -21,6 +21,8 @@ class OrderDetailsControllerCancellationTest extends OrderDetailsControllerTestCase { + protected $OrderDetail; + protected $Product; public $cancellationReason = 'Product was not fresh any more.'; public function testCancellationWithPurchasePrice() diff --git a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditAmountTest.php b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditAmountTest.php index 60ad98e41e..6a1ef3b4bc 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditAmountTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditAmountTest.php @@ -21,6 +21,8 @@ class OrderDetailsControllerEditAmountTest extends OrderDetailsControllerTestCase { + protected $mockCart; + protected $OrderDetail; public $newAmount = 1; public $editAmountReason = 'One product was not delivered.'; diff --git a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditCustomerTest.php b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditCustomerTest.php index 0baa028d72..4852ffc9f4 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditCustomerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditCustomerTest.php @@ -21,6 +21,7 @@ class OrderDetailsControllerEditCustomerTest extends OrderDetailsControllerTestCase { + protected $OrderDetail; public $newCustomerId = 88; public $editCustomerReason = 'The member forgot his product and I took it.'; public $editCustomerAmount = 1; diff --git a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditNameTest.php b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditNameTest.php index ebbdc4e020..fcb190aa1b 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditNameTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditNameTest.php @@ -20,6 +20,8 @@ class OrderDetailsControllerEditNameTest extends OrderDetailsControllerTestCase { + protected $mockCart; + public function testEditOrderDetailNameNotValid() { $this->loginAsSuperadmin(); diff --git a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditPriceTest.php b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditPriceTest.php index 24e3f9badb..ef9d8de884 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditPriceTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditPriceTest.php @@ -22,6 +22,7 @@ class OrderDetailsControllerEditPriceTest extends OrderDetailsControllerTestCase { + protected $mockCart; public $newPrice = '3,53'; public $editPriceReason = 'Product was smaller than expected.'; diff --git a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditPurchasePriceTest.php b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditPurchasePriceTest.php index 641aa9d72b..c57541ca06 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditPurchasePriceTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditPurchasePriceTest.php @@ -21,6 +21,8 @@ class OrderDetailsControllerEditPurchasePriceTest extends OrderDetailsControllerTestCase { + protected $OrderDetailPurchasePrice; + public function testEditOrderDetailPurchasePricePriceExclValidPurchasePrice() { $this->changeConfiguration('FCS_PURCHASE_PRICE_ENABLED', 1); diff --git a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditQuantityTest.php b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditQuantityTest.php index fae609c218..93989115fe 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditQuantityTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditQuantityTest.php @@ -21,6 +21,8 @@ class OrderDetailsControllerEditQuantityTest extends OrderDetailsControllerTestCase { + protected $OrderDetail; + public function testEditOrderDetailQuantityNotValid() { $this->loginAsSuperadmin(); diff --git a/plugins/Admin/tests/TestCase/src/Controller/PaymentsControllerTest.php b/plugins/Admin/tests/TestCase/src/Controller/PaymentsControllerTest.php index 1203508913..9b23c65037 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/PaymentsControllerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/PaymentsControllerTest.php @@ -26,6 +26,8 @@ class PaymentsControllerTest extends AppCakeTestCase { + protected $ActionLog; + use AppIntegrationTestTrait; use LoginTrait; use EmailTrait; diff --git a/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php b/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php index cb0008acab..95654b0e90 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/ProductsControllerTest.php @@ -27,7 +27,7 @@ class ProductsControllerTest extends AppCakeTestCase use EmailTrait; use LoginTrait; - public $Product; + protected $Product; public function setUp(): void { diff --git a/plugins/Admin/tests/TestCase/src/Model/Table/InvoicesTableTest.php b/plugins/Admin/tests/TestCase/src/Model/Table/InvoicesTableTest.php index 2c8bbf4618..43f9582a4b 100644 --- a/plugins/Admin/tests/TestCase/src/Model/Table/InvoicesTableTest.php +++ b/plugins/Admin/tests/TestCase/src/Model/Table/InvoicesTableTest.php @@ -27,7 +27,9 @@ class InvoicesTableTest extends AppCakeTestCase use LoginTrait; use PrepareAndTestInvoiceDataTrait; - public $Invoice; + protected $Invoice; + protected $OrderDetail; + protected $Product; public function setUp(): void { diff --git a/plugins/Admin/tests/TestCase/src/Model/Table/ProductAttributesTableTest.php b/plugins/Admin/tests/TestCase/src/Model/Table/ProductAttributesTableTest.php index 6cdf55539c..de08876357 100644 --- a/plugins/Admin/tests/TestCase/src/Model/Table/ProductAttributesTableTest.php +++ b/plugins/Admin/tests/TestCase/src/Model/Table/ProductAttributesTableTest.php @@ -23,11 +23,12 @@ class ProductAttributesTableTest extends AppCakeTestCase { + protected $Product; + protected $ProductAttribute; + use AppIntegrationTestTrait; use LoginTrait; - public $ProductAttribute; - public function setUp(): void { parent::setUp(); diff --git a/plugins/Admin/tests/TestCase/src/Model/Table/PurchasePriceProductsTableTest.php b/plugins/Admin/tests/TestCase/src/Model/Table/PurchasePriceProductsTableTest.php index 978ed8f093..19adc3ec93 100644 --- a/plugins/Admin/tests/TestCase/src/Model/Table/PurchasePriceProductsTableTest.php +++ b/plugins/Admin/tests/TestCase/src/Model/Table/PurchasePriceProductsTableTest.php @@ -20,6 +20,7 @@ class PurchasePriceProductsTableTest extends AppCakeTestCase { public $Product; + protected $PurchasePriceProduct; public function setUp(): void { diff --git a/plugins/Admin/tests/TestCase/src/Model/Table/UnitsTableTest.php b/plugins/Admin/tests/TestCase/src/Model/Table/UnitsTableTest.php index 30e283c4ac..85385b416f 100644 --- a/plugins/Admin/tests/TestCase/src/Model/Table/UnitsTableTest.php +++ b/plugins/Admin/tests/TestCase/src/Model/Table/UnitsTableTest.php @@ -20,7 +20,7 @@ class UnitsTableTest extends AppCakeTestCase { - public $Units; + protected $Unit; public $productId = 346; public $productAttributeId = 0; diff --git a/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php b/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php index 6853e86631..d36a9ed19f 100644 --- a/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php +++ b/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php @@ -26,6 +26,8 @@ class SyncsControllerTest extends AppCakeTestCase { + public $Network; + use AppIntegrationTestTrait; use LoginTrait; diff --git a/tests/TestCase/AppCakeTestCase.php b/tests/TestCase/AppCakeTestCase.php index 43c698e998..c09b438ba3 100644 --- a/tests/TestCase/AppCakeTestCase.php +++ b/tests/TestCase/AppCakeTestCase.php @@ -44,20 +44,18 @@ abstract class AppCakeTestCase extends TestCase use QueueTrait; protected $dbConnection; - protected $testDumpDir; - protected $appDumpDir; - public $Slug; - public $Html; - public $Time; - + public $Cart; + public $Configuration; public $Customer; - public $Manufacturer; + public $Network; + public $Payment; + public $PricePerUnit; public function setUp(): void { diff --git a/tests/TestCase/OrderDetailsControllerTestCase.php b/tests/TestCase/OrderDetailsControllerTestCase.php index bd13394571..39ae17df39 100644 --- a/tests/TestCase/OrderDetailsControllerTestCase.php +++ b/tests/TestCase/OrderDetailsControllerTestCase.php @@ -37,6 +37,11 @@ abstract class OrderDetailsControllerTestCase extends AppCakeTestCase public $orderDetailIdB = 2; public $orderDetailIdC = 3; + protected $OrderDetail; + protected $mockCart; + protected $Product; + protected $StockAvailable; + public function setUp(): void { parent::setUp(); diff --git a/tests/TestCase/Traits/PrepareAndTestInvoiceDataTrait.php b/tests/TestCase/Traits/PrepareAndTestInvoiceDataTrait.php index ee66a73e43..948d7c0d91 100644 --- a/tests/TestCase/Traits/PrepareAndTestInvoiceDataTrait.php +++ b/tests/TestCase/Traits/PrepareAndTestInvoiceDataTrait.php @@ -18,6 +18,8 @@ trait PrepareAndTestInvoiceDataTrait { + protected $OrderDetail; + public function generateInvoice($customerId, $paidInCash) { $this->get('/admin/invoices/generate.pdf?customerId='.$customerId.'&paidInCash='.$paidInCash.'¤tDay=2018-02-02'); diff --git a/tests/TestCase/src/Controller/CartsControllerTest.php b/tests/TestCase/src/Controller/CartsControllerTest.php index d2ac588aed..fee0f130ca 100644 --- a/tests/TestCase/src/Controller/CartsControllerTest.php +++ b/tests/TestCase/src/Controller/CartsControllerTest.php @@ -24,6 +24,12 @@ class CartsControllerTest extends AppCakeTestCase { + protected $ActionLog; + protected $PickupDay; + protected $ProductAttribute; + protected $PurchasePriceProduct; + protected $Unit; + use AppIntegrationTestTrait; use EmailTrait; use LoginTrait; @@ -1181,25 +1187,16 @@ private function checkOrderDetails($orderDetail, $name, $amount, $productAttribu $this->assertEquals($orderDetail->tax_rate, $taxRate); } - /** - * @param int $productId - * @param int $amount - * @return string - */ - private function changeProductStatus($productId, $status) + private function changeProductStatus($productId, $status): void { $this->Product->changeStatus([[$productId => $status]]); } - private function changeManufacturerStatus($manufacturerId, $status) + private function changeManufacturerStatus($manufacturerId, $status): void { $this->changeManufacturer($manufacturerId, 'active', $status); } - /** - * @param int $productId - * @return string - */ private function removeProduct($productId) { $this->ajaxPost('/warenkorb/ajaxRemove', [ diff --git a/tests/TestCase/src/Controller/CustomersFrontendControllerTest.php b/tests/TestCase/src/Controller/CustomersFrontendControllerTest.php index 12f16c3060..404caecbf8 100644 --- a/tests/TestCase/src/Controller/CustomersFrontendControllerTest.php +++ b/tests/TestCase/src/Controller/CustomersFrontendControllerTest.php @@ -143,7 +143,7 @@ private function doPostNewPasswordRequest($email) ]); } - private $registrationDataEmpty = [ + protected $registrationDataEmpty = [ 'Customers' => [ 'firstname' => '', 'lastname' => '', diff --git a/tests/TestCase/src/Controller/ManufacturersFrontendControllerTest.php b/tests/TestCase/src/Controller/ManufacturersFrontendControllerTest.php index 5a6aef5d7a..db12a8f836 100644 --- a/tests/TestCase/src/Controller/ManufacturersFrontendControllerTest.php +++ b/tests/TestCase/src/Controller/ManufacturersFrontendControllerTest.php @@ -22,9 +22,9 @@ class ManufacturersFrontendControllerTest extends AppCakeTestCase use AppIntegrationTestTrait; use LoginTrait; - private $manufacturerId = 5; - private $today; - private $mustNotBeShownString = 'Lieferpause.'; + protected $manufacturerId = 5; + protected $today; + protected $mustNotBeShownString = 'Lieferpause.'; public function setUp(): void { diff --git a/tests/TestCase/src/Controller/PagesControllerTest.php b/tests/TestCase/src/Controller/PagesControllerTest.php index 4d53b01ee6..ac1c7f0e8d 100644 --- a/tests/TestCase/src/Controller/PagesControllerTest.php +++ b/tests/TestCase/src/Controller/PagesControllerTest.php @@ -21,12 +21,13 @@ class PagesControllerTest extends AppCakeTestCase { + protected $Page; + public $Network; + use AssertPagesForErrorsTrait; use AppIntegrationTestTrait; use LoginTrait; - public $Page; - public function setUp(): void { parent::setUp(); diff --git a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php index f2627d8e3d..2cb77e20c0 100644 --- a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php +++ b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php @@ -20,11 +20,13 @@ class ProductsFrontendControllerTest extends AppCakeTestCase { + + protected $Product; + protected $Unit; + use AppIntegrationTestTrait; use LoginTrait; - public $Product; - public function setUp(): void { parent::setUp(); diff --git a/tests/TestCase/src/Controller/SelfServiceControllerTest.php b/tests/TestCase/src/Controller/SelfServiceControllerTest.php index f3ee09a15d..aec41df4eb 100644 --- a/tests/TestCase/src/Controller/SelfServiceControllerTest.php +++ b/tests/TestCase/src/Controller/SelfServiceControllerTest.php @@ -24,6 +24,11 @@ class SelfServiceControllerTest extends AppCakeTestCase { + protected $ActionLog; + public $Cart; + protected $CartProductUnit; + protected $Invoice; + use AppIntegrationTestTrait; use AssertPagesForErrorsTrait; use LoginTrait; diff --git a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php index 80228fe40f..eeb5621b7d 100644 --- a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php +++ b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php @@ -25,6 +25,9 @@ class DeliveryRhythmTest extends AppCakeTestCase { + protected $Product; + protected $MyTimeHelper; + use DeliveryRhythmConfigsTrait; use IntegrationTestTrait; use LoginTrait; diff --git a/tests/TestCase/src/Lib/HelloCash/HelloCashTest.php b/tests/TestCase/src/Lib/HelloCash/HelloCashTest.php index 67ed9bd9dc..e290eb67c1 100644 --- a/tests/TestCase/src/Lib/HelloCash/HelloCashTest.php +++ b/tests/TestCase/src/Lib/HelloCash/HelloCashTest.php @@ -23,6 +23,7 @@ class HelloCashTest extends AppCakeTestCase { + use AppIntegrationTestTrait; use EmailTrait; use LoginTrait; diff --git a/tests/TestCase/src/Model/Table/CronjobsTableTest.php b/tests/TestCase/src/Model/Table/CronjobsTableTest.php index e65ab65def..556a9be3a8 100644 --- a/tests/TestCase/src/Model/Table/CronjobsTableTest.php +++ b/tests/TestCase/src/Model/Table/CronjobsTableTest.php @@ -19,7 +19,8 @@ */ class CronjobsTableTest extends AppCakeTestCase { - public $Cronjob; + + protected $Cronjob; public function setUp(): void { @@ -377,7 +378,7 @@ public function testInvalidWeekday() $this->expectExceptionMessage('weekday not available'); $executedCronjobs = $this->Cronjob->run(); $this->assertEquals(0, count($executedCronjobs)); - $this->assertEmpty(0, $this->CronjobLogs->find('all')->all()); + $this->assertEmpty(0, $this->Cronjob->CronjobLogs->find('all')->all()); } public function testInvalidDayOfMonth() @@ -393,7 +394,7 @@ public function testInvalidDayOfMonth() $this->expectException(InvalidParameterException::class); $this->expectExceptionMessage('day of month not available or not valid'); $this->Cronjob->run(); - $this->assertEmpty(0, $this->CronjobLogs->find('all')->all()); + $this->assertEmpty(0, $this->Cronjob->CronjobLogs->find('all')->all()); } } \ No newline at end of file diff --git a/tests/TestCase/src/Shell/EmailOrderReminderShellTest.php b/tests/TestCase/src/Shell/EmailOrderReminderShellTest.php index 74ef96e67b..e41f861cab 100644 --- a/tests/TestCase/src/Shell/EmailOrderReminderShellTest.php +++ b/tests/TestCase/src/Shell/EmailOrderReminderShellTest.php @@ -21,6 +21,9 @@ class EmailOrderReminderShellTest extends AppCakeTestCase { + + protected $OrderDetail; + use AppIntegrationTestTrait; use EmailTrait; use LoginTrait; diff --git a/tests/TestCase/src/Shell/PickupReminderShellTest.php b/tests/TestCase/src/Shell/PickupReminderShellTest.php index 7c7c6979fa..ca13dd5c8c 100644 --- a/tests/TestCase/src/Shell/PickupReminderShellTest.php +++ b/tests/TestCase/src/Shell/PickupReminderShellTest.php @@ -22,6 +22,9 @@ class PickupReminderShellTest extends AppCakeTestCase { + + protected $OrderDetail; + use EmailTrait; public function testCustomersDoNotHaveFutureOrders() diff --git a/tests/TestCase/src/Shell/SendInvoicesToCustomersShellTest.php b/tests/TestCase/src/Shell/SendInvoicesToCustomersShellTest.php index 1bef665db5..f98ae86e2d 100644 --- a/tests/TestCase/src/Shell/SendInvoicesToCustomersShellTest.php +++ b/tests/TestCase/src/Shell/SendInvoicesToCustomersShellTest.php @@ -24,6 +24,10 @@ class SendInvoicesToCustomersShellTest extends AppCakeTestCase { + protected $Invoice; + protected $OrderDetail; + protected $Product; + use AppIntegrationTestTrait; use EmailTrait; use LoginTrait; diff --git a/tests/TestCase/src/Shell/SendInvoicesToManufacturersShellTest.php b/tests/TestCase/src/Shell/SendInvoicesToManufacturersShellTest.php index 2d9cdccd0b..5f8c01fb11 100644 --- a/tests/TestCase/src/Shell/SendInvoicesToManufacturersShellTest.php +++ b/tests/TestCase/src/Shell/SendInvoicesToManufacturersShellTest.php @@ -22,6 +22,9 @@ class SendInvoicesToManufacturersShellTest extends AppCakeTestCase { + public $Cart; + protected $OrderDetail; + use AppIntegrationTestTrait; use EmailTrait; use LoginTrait; diff --git a/tests/TestCase/src/Shell/SendOrderListsShellTest.php b/tests/TestCase/src/Shell/SendOrderListsShellTest.php index cde2f73a25..e5a3d8230d 100644 --- a/tests/TestCase/src/Shell/SendOrderListsShellTest.php +++ b/tests/TestCase/src/Shell/SendOrderListsShellTest.php @@ -26,6 +26,11 @@ class SendOrderListsShellTest extends AppCakeTestCase { + protected $ActionLog; + public $Cart; + protected $OrderDetail; + protected $Product; + use AppIntegrationTestTrait; use EmailTrait; use LoginTrait; diff --git a/tests/TestCase/src/View/Helper/MyHtmlHelperTest.php b/tests/TestCase/src/View/Helper/MyHtmlHelperTest.php index bfb484b47a..0d1f500c48 100644 --- a/tests/TestCase/src/View/Helper/MyHtmlHelperTest.php +++ b/tests/TestCase/src/View/Helper/MyHtmlHelperTest.php @@ -19,6 +19,8 @@ class MyHtmlHelperTest extends AppCakeTestCase { + protected $MyHtmlHelper; + public function setUp(): void { parent::setUp(); diff --git a/tests/TestCase/src/View/Helper/MyNumberHelperTest.php b/tests/TestCase/src/View/Helper/MyNumberHelperTest.php index 2c16700b2f..3a89b0eed1 100644 --- a/tests/TestCase/src/View/Helper/MyNumberHelperTest.php +++ b/tests/TestCase/src/View/Helper/MyNumberHelperTest.php @@ -20,6 +20,8 @@ class MyNumberHelperTest extends AppCakeTestCase { + protected $MyNumberHelper; + public function setUp(): void { $this->MyNumberHelper = new MyNumberHelper(new View()); diff --git a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php index 62f6142ccd..b55e2399ba 100644 --- a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php +++ b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php @@ -20,6 +20,8 @@ class MyTimeHelperTest extends AppCakeTestCase { + protected $MyTimeHelper; + use DeliveryRhythmConfigsTrait; public function setUp(): void From 5dba3e0a58e85ac806e8f19f2633439a8581a7c9 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 8 Nov 2022 16:38:34 +0100 Subject: [PATCH 286/646] add strict type to all test files --- phpstan.neon | 3 ++ .../ConfigurationsControllerTest.php | 2 +- tests/TestCase/AppCakeTestCase.php | 2 ++ .../OrderDetailsControllerTestCase.php | 2 ++ .../Traits/AppIntegrationTestTrait.php | 2 ++ .../Traits/AssertPagesForErrorsTrait.php | 1 + .../Traits/DeliveryRhythmConfigsTrait.php | 1 + tests/TestCase/Traits/LoginTrait.php | 1 + .../Traits/PrepareAndTestInvoiceDataTrait.php | 1 + tests/TestCase/Traits/QueueTrait.php | 1 + .../Controller/BlogPostsControllerTest.php | 2 ++ .../src/Controller/CartsControllerTest.php | 30 ++++++++++--------- .../Component/StringComponentTest.php | 1 + .../CustomersFrontendControllerTest.php | 1 + .../ManufacturersFrontendControllerTest.php | 1 + .../src/Controller/PagesControllerTest.php | 1 + .../ProductsFrontendControllerTest.php | 2 ++ .../Controller/SelfServiceControllerTest.php | 2 ++ .../src/Lib/Csv/GlsBankBankingReaderTest.php | 2 ++ .../Lib/Csv/RaiffeisenBankingReaderTest.php | 2 ++ .../Lib/Csv/SparkasseBankingReaderTest.php | 2 ++ .../Lib/Csv/VolksbankBankingReaderTest.php | 2 ++ .../Lib/DeliveryRhythm/DeliveryRhythmTest.php | 2 ++ tests/TestCase/src/Lib/GlobalTest.php | 2 ++ .../src/Lib/HelloCash/HelloCashTest.php | 2 ++ .../src/Model/Table/CronjobsTableTest.php | 1 + .../src/Shell/CheckCreditBalanceShellTest.php | 2 +- .../src/Shell/EmailOrderReminderShellTest.php | 2 ++ .../src/Shell/PickupReminderShellTest.php | 1 + .../src/Shell/SendDeliveryNotesShellTest.php | 1 + .../SendInvoicesToCustomersShellTest.php | 2 ++ .../SendInvoicesToManufacturersShellTest.php | 2 ++ .../src/Shell/SendOrderListsShellTest.php | 1 + .../src/View/Helper/MyHtmlHelperTest.php | 2 ++ .../src/View/Helper/MyNumberHelperTest.php | 2 ++ .../src/View/Helper/MyTimeHelperTest.php | 2 ++ .../View/Helper/PricePerUnitHelperTest.php | 2 ++ tests/bootstrap.php | 2 ++ tests/config/test.config.php | 2 ++ 39 files changed, 78 insertions(+), 16 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index 3625b08000..36ddffafb6 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -5,9 +5,12 @@ parameters: paths: - src - templates + - tests - plugins/Admin/src - plugins/Admin/templates + - plugins/Admin/tests - plugins/Network/src - plugins/Network/templates + - plugins/Network/tests rules: - Ergebnis\PHPStan\Rules\Files\DeclareStrictTypesRule diff --git a/plugins/Admin/tests/TestCase/src/Controller/ConfigurationsControllerTest.php b/plugins/Admin/tests/TestCase/src/Controller/ConfigurationsControllerTest.php index 35d6163330..706a49fd98 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/ConfigurationsControllerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/ConfigurationsControllerTest.php @@ -131,7 +131,7 @@ private function assertShowProductForGuestsEnabledOrLoggedIn($testUrls, $expectP if (!$expectPrice) { $priceAssertFunction = 'assertDoesNotMatchRegularExpressionWithUnquotedString'; } - $this->{$priceAssertFunction}($priceRegExp, $this->_response, 'price expected: ' . $expectPrice); + $this->{$priceAssertFunction}($priceRegExp, $this->_response->getBody()->__toString(), 'price expected: ' . $expectPrice); } } } diff --git a/tests/TestCase/AppCakeTestCase.php b/tests/TestCase/AppCakeTestCase.php index c09b438ba3..8a35372145 100644 --- a/tests/TestCase/AppCakeTestCase.php +++ b/tests/TestCase/AppCakeTestCase.php @@ -1,4 +1,6 @@ loginAsSuperadmin(); - $this->changeProductDeliveryRhythm($this->productId1, '0-individual', '2018-12-14', '2018-07-12'); + $this->changeProductDeliveryRhythm((int) $this->productId1, '0-individual', '2018-12-14', '2018-07-12'); $response = $this->addProductToCart($this->productId1, 1); $this->assertRegExpWithUnquotedString('Das Produkt Artischocke kann nicht mehr bestellt werden.', $response->msg); $this->assertJsonError(); @@ -170,7 +172,7 @@ public function testAddProductDeliveryRhythmIndividualOrderNotPossibleAnyMore() public function testAddProductDeliveryRhythmIndividualOrderPossible() { $this->loginAsSuperadmin(); - $this->changeProductDeliveryRhythm($this->productId1, '0-individual', '2035-12-14', '2035-07-12'); + $this->changeProductDeliveryRhythm((int) $this->productId1, '0-individual', '2035-12-14', '2035-07-12'); $this->addProductToCart($this->productId1, 1); $this->assertJsonOk(); } @@ -309,7 +311,7 @@ public function testAddedProductWithoutAttributesInCartAndOnFinishProductHasAttr $this->ProductAttribute->add($productId, 35); $this->finishCart(); $this->checkValidationError(); - $this->assertRegExpWithUnquotedString('Dem Produkt wurden in der Zwischenzeit Varianten hinzugef', $this->_response); + $this->assertRegExpWithUnquotedString('Dem Produkt wurden in der Zwischenzeit Varianten hinzugef', $this->_response->getBody()->__toString()); } public function testRemoveProductIfProductAttributeWasDeletedAndOtherProductAttributesExistAfterAddingToCart() @@ -376,7 +378,7 @@ public function testProductDeactivatedWhileShopping() $this->changeProductStatus($this->productId1, APP_OFF); $this->finishCart(); $this->checkValidationError(); - $this->assertMatchesRegularExpression('/Das Produkt (.*) ist leider nicht mehr aktiviert und somit nicht mehr bestellbar./', $this->_response); + $this->assertMatchesRegularExpression('/Das Produkt (.*) ist leider nicht mehr aktiviert und somit nicht mehr bestellbar./', $this->_response->getBody()->__toString()); $this->changeProductStatus($this->productId1, APP_ON); } @@ -390,7 +392,7 @@ public function testManufacturerDeactivatedWhileShopping() $this->changeManufacturerStatus($manufacturerId, APP_OFF); $this->finishCart(); $this->checkValidationError(); - $this->assertMatchesRegularExpression('/Der Hersteller des Produktes (.*) hat entweder Lieferpause oder er ist nicht mehr aktiviert und das Produkt ist somit nicht mehr bestellbar./', $this->_response); + $this->assertMatchesRegularExpression('/Der Hersteller des Produktes (.*) hat entweder Lieferpause oder er ist nicht mehr aktiviert und das Produkt ist somit nicht mehr bestellbar./', $this->_response->getBody()->__toString()); $this->changeManufacturerStatus($manufacturerId, APP_ON); } @@ -404,7 +406,7 @@ public function testManufacturerDeliveryBreakActivatedWhileShopping() $this->changeManufacturerNoDeliveryDays($manufacturerId, DeliveryRhythm::getDeliveryDateByCurrentDayForDb()); $this->finishCart(); $this->checkValidationError(); - $this->assertMatchesRegularExpression('/Der Hersteller des Produktes (.*) hat entweder Lieferpause oder er ist nicht mehr aktiviert und das Produkt ist somit nicht mehr bestellbar./', $this->_response); + $this->assertMatchesRegularExpression('/Der Hersteller des Produktes (.*) hat entweder Lieferpause oder er ist nicht mehr aktiviert und das Produkt ist somit nicht mehr bestellbar./', $this->_response->getBody()->__toString()); $this->changeManufacturerNoDeliveryDays($manufacturerId); } @@ -417,7 +419,7 @@ public function testGlobalDeliveryBreakActivatedWhileShopping() $this->loginAsSuperadmin(); $this->finishCart(0, 0); $this->checkValidationError(); - $this->assertMatchesRegularExpression('/(.*) hat die Lieferpause aktiviert und das Produkt (.*) ist nicht mehr bestellbar./', $this->_response); + $this->assertMatchesRegularExpression('/(.*) hat die Lieferpause aktiviert und das Produkt (.*) ist nicht mehr bestellbar./', $this->_response->getBody()->__toString()); } public function testProductStockAvailableDecreasedWhileShopping() @@ -429,7 +431,7 @@ public function testProductStockAvailableDecreasedWhileShopping() $this->changeStockAvailable($this->productId1, 1); $this->finishCart(); $this->checkValidationError(); - $this->assertMatchesRegularExpression('/Anzahl 2/', $this->_response); + $this->assertMatchesRegularExpression('/Anzahl 2/', $this->_response->getBody()->__toString()); $this->assertResponseContains('Menge: 1'); $this->changeStockAvailable($this->productId1, 98); // reset to old stock available } @@ -443,7 +445,7 @@ public function testAttributeStockAvailableDecreasedWhileShopping() $this->changeStockAvailable($this->productId2, 1); $this->finishCart(); $this->checkValidationError(); - $this->assertMatchesRegularExpression('/Anzahl \3/', $this->_response); + $this->assertMatchesRegularExpression('/Anzahl \3/', $this->_response->getBody()->__toString()); $this->assertResponseContains('Menge: 1'); $this->changeStockAvailable($this->productId2, 20); // reset to old stock available } @@ -551,13 +553,13 @@ public function testFinishWithPurchasePriceIncludingProductsWithoutPurchasePrice $this->addAllDifferentProductTypesToCart(); $this->finishCart(1,1); // product and missing pp per piece - $this->assertMatchesRegularExpression('/Das Produkt (.*)Beuschl(.*) kann aufgrund von fehlenden Produktdaten zur Zeit leider nicht bestellt werden./', $this->_response); + $this->assertMatchesRegularExpression('/Das Produkt (.*)Beuschl(.*) kann aufgrund von fehlenden Produktdaten zur Zeit leider nicht bestellt werden./', $this->_response->getBody()->__toString()); // product and missing pp per unit - $this->assertMatchesRegularExpression('/Das Produkt (.*)Forelle(.*) kann aufgrund von fehlenden Produktdaten zur Zeit leider nicht bestellt werden./', $this->_response); + $this->assertMatchesRegularExpression('/Das Produkt (.*)Forelle(.*) kann aufgrund von fehlenden Produktdaten zur Zeit leider nicht bestellt werden./', $this->_response->getBody()->__toString()); // attribute and missing pp per piece - $this->assertMatchesRegularExpression('/Die Variante (.*)1 kg(.*) des Produkts (.*)Lagerprodukt mit Varianten(.*) kann aufgrund von fehlenden Produktdaten zur Zeit leider nicht bestellt werden./', $this->_response); + $this->assertMatchesRegularExpression('/Die Variante (.*)1 kg(.*) des Produkts (.*)Lagerprodukt mit Varianten(.*) kann aufgrund von fehlenden Produktdaten zur Zeit leider nicht bestellt werden./', $this->_response->getBody()->__toString()); // attribute and missing pp per unit - $this->assertMatchesRegularExpression('/Die Variante (.*)1 kg(.*) des Produkts (.*)Rindfleisch(.*) kann aufgrund von fehlenden Produktdaten zur Zeit leider nicht bestellt werden./', $this->_response); + $this->assertMatchesRegularExpression('/Die Variante (.*)1 kg(.*) des Produkts (.*)Rindfleisch(.*) kann aufgrund von fehlenden Produktdaten zur Zeit leider nicht bestellt werden./', $this->_response->getBody()->__toString()); } public function testFinishWithPurchasePriceOk() @@ -1147,7 +1149,7 @@ private function addTooManyProducts($productId, $amount, $expectedAmount, $expec private function checkValidationError() { - $this->assertMatchesRegularExpression('/initCartErrors()/', $this->_response); + $this->assertMatchesRegularExpression('/initCartErrors()/', $this->_response->getBody()->__toString()); } private function changeStockAvailable($productId, $amount) diff --git a/tests/TestCase/src/Controller/Component/StringComponentTest.php b/tests/TestCase/src/Controller/Component/StringComponentTest.php index 763e284565..49728527f5 100644 --- a/tests/TestCase/src/Controller/Component/StringComponentTest.php +++ b/tests/TestCase/src/Controller/Component/StringComponentTest.php @@ -1,4 +1,5 @@ Date: Wed, 9 Nov 2022 17:31:17 +0100 Subject: [PATCH 287/646] ensure to always pass a string --- src/Controller/CartsController.php | 2 +- src/View/Helper/MyNumberHelper.php | 21 ++------------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/Controller/CartsController.php b/src/Controller/CartsController.php index c54250f74a..8afb735261 100644 --- a/src/Controller/CartsController.php +++ b/src/Controller/CartsController.php @@ -325,7 +325,7 @@ public function ajaxAdd() $ids = $this->Product->getProductIdAndAttributeId($initialProductId); $amount = (int) $this->getRequest()->getData('amount'); $orderedQuantityInUnits = Configure::read('app.numberHelper')->getStringAsFloat( - $this->getRequest()->getData('orderedQuantityInUnits') + (string) $this->getRequest()->getData('orderedQuantityInUnits') ); $this->CartProduct = $this->getTableLocator()->get('CartProducts'); diff --git a/src/View/Helper/MyNumberHelper.php b/src/View/Helper/MyNumberHelper.php index afba489e8e..2bf98c4460 100644 --- a/src/View/Helper/MyNumberHelper.php +++ b/src/View/Helper/MyNumberHelper.php @@ -30,29 +30,12 @@ public function addLeadingZerosToNumber(string $number, int $digits): string return str_pad($number, $digits, '0', STR_PAD_LEFT); } - /** - * @param string $string - * @return boolean / float - */ - public function getStringAsFloat($string) + public function getStringAsFloat(string $string) { - - if (is_null($string)) { - return -1; - } - - // sometimes a float is passed to this function, but trim only accepts strings - $float = $string; - if (is_string($string)) { - $float = trim($string); - } - - $float = $this->parseFloatRespectingLocale($float); - + $float = $this->parseFloatRespectingLocale(trim($string)); if ($float === false) { return -1; // do not return false, because 0 is a valid return value! } - return $float; } From 4efc574bf38214a1574293ae243a8f9c3d17da66 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 9 Nov 2022 17:32:44 +0100 Subject: [PATCH 288/646] vendor updates --- composer.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index caf4423b7f..96b00a002a 100644 --- a/composer.lock +++ b/composer.lock @@ -112,16 +112,16 @@ }, { "name": "cakephp/chronos", - "version": "2.3.1", + "version": "2.3.2", "source": { "type": "git", "url": "https://github.com/cakephp/chronos.git", - "reference": "1075511e200c2333793f4625829e40607a4d1cc9" + "reference": "a21b7b633f483c4cf525d200219d200f551ee38b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/chronos/zipball/1075511e200c2333793f4625829e40607a4d1cc9", - "reference": "1075511e200c2333793f4625829e40607a4d1cc9", + "url": "https://api.github.com/repos/cakephp/chronos/zipball/a21b7b633f483c4cf525d200219d200f551ee38b", + "reference": "a21b7b633f483c4cf525d200219d200f551ee38b", "shasum": "" }, "require": { @@ -166,7 +166,7 @@ "issues": "https://github.com/cakephp/chronos/issues", "source": "https://github.com/cakephp/chronos" }, - "time": "2022-10-21T08:22:45+00:00" + "time": "2022-11-08T02:17:04+00:00" }, { "name": "cakephp/migrations", @@ -1760,16 +1760,16 @@ }, { "name": "mobiledetect/mobiledetectlib", - "version": "2.8.39", + "version": "2.8.41", "source": { "type": "git", "url": "https://github.com/serbanghita/Mobile-Detect.git", - "reference": "0fd6753003fc870f6e229bae869cc1337c99bc45" + "reference": "fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/0fd6753003fc870f6e229bae869cc1337c99bc45", - "reference": "0fd6753003fc870f6e229bae869cc1337c99bc45", + "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1", + "reference": "fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1", "shasum": "" }, "require": { @@ -1810,9 +1810,9 @@ ], "support": { "issues": "https://github.com/serbanghita/Mobile-Detect/issues", - "source": "https://github.com/serbanghita/Mobile-Detect/tree/2.8.39" + "source": "https://github.com/serbanghita/Mobile-Detect/tree/2.8.41" }, - "time": "2022-02-17T19:24:25+00:00" + "time": "2022-11-08T18:31:26+00:00" }, { "name": "mustangostang/spyc", From 892572ae763723ec5b1014c5f1092d0cefdf3f59 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 10 Nov 2022 09:20:32 +0100 Subject: [PATCH 289/646] pass only string to method --- src/Model/Table/ProductsTable.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index aad45d49e5..9e6d2b6e90 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -412,7 +412,10 @@ public function changePrice($products) foreach ($products as $product) { $productId = key($product); - $price = Configure::read('app.numberHelper')->getStringAsFloat($product[$productId]['gross_price']); + $price = $product[$productId]['gross_price']; + if (!is_float($product[$productId]['gross_price'])) { + $price = Configure::read('app.numberHelper')->getStringAsFloat($product[$productId]['gross_price']); + } if ($price < 0) { throw new InvalidParameterException('input format not correct: '.$product[$productId]['gross_price']); } @@ -422,7 +425,10 @@ public function changePrice($products) foreach ($products as $product) { $productId = key($product); - $price = Configure::read('app.numberHelper')->getStringAsFloat($product[$productId]['gross_price']); + $price = $product[$productId]['gross_price']; + if (!is_float($product[$productId]['gross_price'])) { + $price = Configure::read('app.numberHelper')->getStringAsFloat($product[$productId]['gross_price']); + } $ids = $this->getProductIdAndAttributeId($productId); $productEntity = $this->find('all', [ @@ -457,7 +463,7 @@ public function changePrice($products) $success |= is_object($result); } - if (isset($product[$productId]['unit_product_price_per_unit_enabled'])) { + if (isset($product[$productId]['unit_product_price_per_unit_enabled']) && isset($product[$productId]['unit_product_price_incl_per_unit'])) { $this->Unit = FactoryLocator::get('Table')->get('Units'); $priceInclPerUnit = Configure::read('app.numberHelper')->getStringAsFloat($product[$productId]['unit_product_price_incl_per_unit']); $quantityInUnits = Configure::read('app.numberHelper')->getStringAsFloat($product[$productId]['unit_product_quantity_in_units']); From 0335c2b3b5b2af33de38a2af4b34667b7765d2fe Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 10 Nov 2022 09:46:45 +0100 Subject: [PATCH 290/646] add return types --- src/View/Helper/MyNumberHelper.php | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/View/Helper/MyNumberHelper.php b/src/View/Helper/MyNumberHelper.php index 2bf98c4460..eb131c4158 100644 --- a/src/View/Helper/MyNumberHelper.php +++ b/src/View/Helper/MyNumberHelper.php @@ -30,7 +30,7 @@ public function addLeadingZerosToNumber(string $number, int $digits): string return str_pad($number, $digits, '0', STR_PAD_LEFT); } - public function getStringAsFloat(string $string) + public function getStringAsFloat(string $string): bool|float { $float = $this->parseFloatRespectingLocale(trim($string)); if ($float === false) { @@ -39,7 +39,7 @@ public function getStringAsFloat(string $string) return $float; } - public function formatAsCurrency($amount) + public function formatAsCurrency($amount): string { $amount = round((float) $amount, 2); // 3.325 was rounded to 3.32 without this line $currency = self::currency($amount, 'USD'); @@ -49,31 +49,30 @@ public function formatAsCurrency($amount) return $currency; } - public function formatAsUnit($amount, $shortcode) + public function formatAsUnit($amount, $shortcode): string { return self::formatAsDecimal($amount) . ' ' . $shortcode; } - public function formatAsPercent($amount, $decimals = 2) + public function formatAsPercent($amount, $decimals = 2): string { return self::formatAsDecimal($amount, $decimals) . '%'; } /** * shows decimals only if necessary - * @param $rate */ - public function formatTaxRate($rate) + public function formatTaxRate($rate): string { return $rate != intval($rate) ? self::formatAsDecimal($rate, 1) : self::formatAsDecimal($rate, 0); } - public function formatUnitAsDecimal($amount) + public function formatUnitAsDecimal($amount): string { return self::formatAsDecimal($amount, 3, true); } - public function formatAsDecimal($amount, $decimals = 2, $removeTrailingZeros = false) + public function formatAsDecimal($amount, $decimals = 2, $removeTrailingZeros = false): string { $options = [ 'locale' => I18n::getLocale() @@ -89,18 +88,17 @@ public function formatAsDecimal($amount, $decimals = 2, $removeTrailingZeros = f } /** - * self::parseFloat($double, ['locale' => I18n::getLocale()]); did not work with travis! - * @return boolean|mixed + * Number::parseFloat($float, ['locale' => I18n::getLocale()]); did not work with travis! */ - public function parseFloatRespectingLocale($double) + public function parseFloatRespectingLocale($float): bool|float { if (I18n::getLocale() == 'de_DE') { - $double = str_replace(',', '.', (string) $double); // then replace decimal places + $float = str_replace(',', '.', (string) $float); // replace decimal places } - if (!is_numeric($double)) { + if (!is_numeric($float)) { return false; } - return $double; + return (float) $float; } } ?> \ No newline at end of file From 618ffb8ede36a81585dc47bed20a88650cd3617f Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 10 Nov 2022 10:16:15 +0100 Subject: [PATCH 291/646] switch vs match --- .../Admin/templates/Configurations/edit.php | 1 - .../Admin/templates/Configurations/index.php | 18 +++------- src/Lib/DeliveryRhythm/DeliveryRhythm.php | 24 ++++--------- src/Model/Table/OrderDetailsTable.php | 34 ++++++------------- src/View/Helper/ConfigurationHelper.php | 12 ------- src/View/Helper/MyTimeHelper.php | 16 +++------ 6 files changed, 27 insertions(+), 78 deletions(-) diff --git a/plugins/Admin/templates/Configurations/edit.php b/plugins/Admin/templates/Configurations/edit.php index 4aa9dba3d7..bb823ea1ea 100644 --- a/plugins/Admin/templates/Configurations/edit.php +++ b/plugins/Admin/templates/Configurations/edit.php @@ -112,7 +112,6 @@ class="btn btn-outline-light cancel"> $label, 'options' => $this->Configuration->getConfigurationDropdownOptions($configuration->name, $appAuth), 'escape' => false, - 'empty' => $this->Configuration->getConfigurationDropdownEmpty($configuration->name), ]); break; } diff --git a/plugins/Admin/templates/Configurations/index.php b/plugins/Admin/templates/Configurations/index.php index db7af1700b..07ea056e70 100644 --- a/plugins/Admin/templates/Configurations/index.php +++ b/plugins/Admin/templates/Configurations/index.php @@ -209,19 +209,11 @@ echo ''; echo ''; - - switch($configuration->name) { - case 'FCS_WEEKLY_PICKUP_DAY': - echo $this->MyTime->getWeekdayName($configuration->value); - break; - case 'FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA': - echo $configuration->value . ' (' . $this->MyTime->getWeekdayName(DeliveryRhythm::getSendOrderListsWeekday()) . ')'; - break; - default: - echo $configuration->value; - break; - } - + echo match($configuration->name) { + 'FCS_WEEKLY_PICKUP_DAY' => $this->MyTime->getWeekdayName($configuration->value), + 'FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA' => $configuration->value . ' (' . $this->MyTime->getWeekdayName(DeliveryRhythm::getSendOrderListsWeekday()) . ')', + default => $configuration->value, + }; echo ''; echo ''; diff --git a/src/Lib/DeliveryRhythm/DeliveryRhythm.php b/src/Lib/DeliveryRhythm/DeliveryRhythm.php index a2b3658483..2737c403ef 100644 --- a/src/Lib/DeliveryRhythm/DeliveryRhythm.php +++ b/src/Lib/DeliveryRhythm/DeliveryRhythm.php @@ -272,23 +272,13 @@ public static function getNextPickupDayForProduct($product, $currentDay=null) } if ($product->delivery_rhythm_type == 'month') { - switch($product->delivery_rhythm_count) { - case '1': - $ordinal = 'first'; - break; - case '2': - $ordinal = 'second'; - break; - case '3': - $ordinal = 'third'; - break; - case '4': - $ordinal = 'fourth'; - break; - case '0': - $ordinal = 'last'; - break; - } + $ordinal = match($product->delivery_rhythm_count) { + 1 => 'first', + 2 => 'second', + 3 => 'third', + 4 => 'fourth', + 0 => 'last', + }; $deliveryDayAsWeekdayInEnglish = strtolower(date('l', strtotime($pickupDay))); $calculatedPickupDay = date(Configure::read('app.timeHelper')->getI18Format('DatabaseAlt'), strtotime($currentDay . ' ' . $ordinal . ' ' . $deliveryDayAsWeekdayInEnglish . ' of this month')); diff --git a/src/Model/Table/OrderDetailsTable.php b/src/Model/Table/OrderDetailsTable.php index 9c9729f2e1..9e94ae5e12 100644 --- a/src/Model/Table/OrderDetailsTable.php +++ b/src/Model/Table/OrderDetailsTable.php @@ -407,17 +407,11 @@ public function getDepositSum($manufacturerId, $groupBy) ]; $sql = 'SELECT SUM(od.deposit) as sumDepositDelivered '; - - switch($groupBy) { - case 'month': - $sql .= ', DATE_FORMAT(od.pickup_day, \'%Y-%c\') as monthAndYear '; - break; - case 'year': - $sql .= ', DATE_FORMAT(od.pickup_day, \'%Y\') as Year '; - break; - default: - break; - } + $sql .= match($groupBy) { + 'month' => ', DATE_FORMAT(od.pickup_day, \'%Y-%c\') as monthAndYear ', + 'year' => ', DATE_FORMAT(od.pickup_day, \'%Y\') as Year ', + default => '', + }; $sql .= 'FROM '.$this->tablePrefix.'order_detail od '; $sql .= 'LEFT JOIN '.$this->tablePrefix.'product p ON p.id_product = od.product_id '; @@ -430,19 +424,11 @@ public function getDepositSum($manufacturerId, $groupBy) $sql .= 'AND DATE_FORMAT(od.pickup_day, \'%Y-%m-%d\') >= :depositForManufacturersStartDate '; - switch($groupBy) { - case 'month': - $sql .= 'GROUP BY monthAndYear '; - $sql .= 'ORDER BY monthAndYear DESC;'; - break; - case 'year': - $sql .= 'GROUP BY Year '; - $sql .= 'ORDER BY Year DESC;'; - break; - default: - $sql .= 'ORDER BY od.pickup_day DESC;'; - break; - } + $sql .= match($groupBy) { + 'month' => 'GROUP BY monthAndYear ORDER BY monthAndYear DESC;', + 'year' => 'GROUP BY Year ORDER BY Year DESC;', + default => 'ORDER BY od.pickup_day DESC;', + }; $statement = $this->getConnection()->prepare($sql); $statement->execute($params); diff --git a/src/View/Helper/ConfigurationHelper.php b/src/View/Helper/ConfigurationHelper.php index a437eac0aa..77ca829246 100644 --- a/src/View/Helper/ConfigurationHelper.php +++ b/src/View/Helper/ConfigurationHelper.php @@ -84,18 +84,6 @@ public function getConfigurationDropdownOption($name, $value, $appAuth) return self::getConfigurationDropdownOptions($name, $appAuth)[$value]; } - public function getConfigurationDropdownEmpty($name) - { - switch($name) { - case 'FCS_MEMBER_FEE_PRODUCTS': - return null; - break; - default: - return null; - break; - } - } - public function getConfigurationMultipleDropdownOptions($name, $value) { switch($name) { diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index 7e35a44cec..48561c4bd6 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -25,17 +25,11 @@ class MyTimeHelper extends TimeHelper public function getTranslatedTimeInterval($timeInterval) { - switch($timeInterval) { - case 'day': - return __('daily'); - break; - case 'week': - return __('weekly'); - break; - case 'month': - return __('monthly'); - break; - } + return match($timeInterval) { + 'day' => __('daily'), + 'week' => __('weekly'), + 'month' => __('monthly'), + }; } public function convertSecondsInMinutesAndSeconds($seconds) From a006ff1885a5cdce92d2770f9185a65e2e38447f Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 11 Nov 2022 19:55:15 +0100 Subject: [PATCH 292/646] switch vs match --- src/Model/Table/CronjobsTable.php | 24 +++++++-------------- src/View/Helper/MyHtmlHelper.php | 36 ++++++++++--------------------- 2 files changed, 19 insertions(+), 41 deletions(-) diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 32b8c54019..3d58b04ec0 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -67,14 +67,10 @@ public function validationDefault(Validator $validator): Validator if ($value == '') { return true; } else { - switch($context['data']['time_interval']) { - case 'day'; - $timeInterval = __('daily'); - break; - case 'week'; - $timeInterval = __('weekly'); - break; - } + $timeInterval = match($context['data']['time_interval']) { + 'day' => __('daily'), + 'week' => __('weekly'), + }; return __('No_day_of_month_allowed_for_time_interval_{0}.', [ $timeInterval, ]); @@ -91,14 +87,10 @@ public function validationDefault(Validator $validator): Validator if ($value == '') { return true; } else { - switch($context['data']['time_interval']) { - case 'day'; - $timeInterval = __('daily'); - break; - case 'month'; - $timeInterval = __('monthly'); - break; - } + $timeInterval = match($context['data']['time_interval']) { + 'day' => __('daily'), + 'month' => __('monthly'), + }; return __('No_weekday_allowed_for_time_interval_{0}.', [ $timeInterval, ]); diff --git a/src/View/Helper/MyHtmlHelper.php b/src/View/Helper/MyHtmlHelper.php index 48383b2bd1..1ec8b2699e 100644 --- a/src/View/Helper/MyHtmlHelper.php +++ b/src/View/Helper/MyHtmlHelper.php @@ -181,20 +181,12 @@ public function getDeliveryRhythmTypesForDropdown() public function getOrderStateFontawesomeIcon($orderState) { - switch($orderState) - { - case ORDER_STATE_ORDER_PLACED: - return 'fas fa-cart-arrow-down ok'; - break; - case ORDER_STATE_ORDER_LIST_SENT_TO_MANUFACTURER: - return 'far fa-envelope ok'; - break; - case ORDER_STATE_BILLED_CASHLESS: - case ORDER_STATE_BILLED_CASH: - return 'fa fa-lock not-ok'; - break; - } - return ''; + return match($orderState) { + ORDER_STATE_ORDER_PLACED => 'fas fa-cart-arrow-down ok', + ORDER_STATE_ORDER_LIST_SENT_TO_MANUFACTURER => 'far fa-envelope ok', + ORDER_STATE_BILLED_CASHLESS, ORDER_STATE_BILLED_CASH => 'fa fa-lock not-ok', + default => '', + }; } public function wrapJavascriptBlock($content) { @@ -222,17 +214,11 @@ public function getYesNoArray() public function getCurrencyName($currencySymbol) { - switch($currencySymbol) { - case '€': - return 'Euro'; - break; - case '$': - return 'Dollar'; - break; - default: - return ''; - break; - } + return match($currencySymbol) { + '€' => 'Euro', + '$' => 'Dollar', + default => '', + }; } public function getCurrencyIsoCode($currencySymbol) From 7ca2dbdd4eb382a5346b2a1f8ee57098aab3bfb8 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 11 Nov 2022 19:59:41 +0100 Subject: [PATCH 293/646] vendor updates --- composer.lock | 142 +++++++++++++++++++------------------- webroot/package-lock.json | 28 ++++---- webroot/package.json | 2 +- 3 files changed, 86 insertions(+), 86 deletions(-) diff --git a/composer.lock b/composer.lock index 96b00a002a..78fa14c496 100644 --- a/composer.lock +++ b/composer.lock @@ -655,16 +655,16 @@ }, { "name": "hisorange/browser-detect", - "version": "4.5.3", + "version": "4.5.4", "source": { "type": "git", "url": "https://github.com/hisorange/browser-detect.git", - "reference": "2a54d202491edda3c6a8c5bb2eeacb7191430769" + "reference": "2a7c2b140209aa8477424614eb3aa6f7a7b9f429" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hisorange/browser-detect/zipball/2a54d202491edda3c6a8c5bb2eeacb7191430769", - "reference": "2a54d202491edda3c6a8c5bb2eeacb7191430769", + "url": "https://api.github.com/repos/hisorange/browser-detect/zipball/2a7c2b140209aa8477424614eb3aa6f7a7b9f429", + "reference": "2a7c2b140209aa8477424614eb3aa6f7a7b9f429", "shasum": "" }, "require": { @@ -724,9 +724,9 @@ ], "support": { "issues": "https://github.com/hisorange/browser-detect/issues", - "source": "https://github.com/hisorange/browser-detect/tree/4.5.3" + "source": "https://github.com/hisorange/browser-detect/tree/4.5.4" }, - "time": "2022-09-28T20:23:32+00:00" + "time": "2022-11-10T01:43:55+00:00" }, { "name": "ifsnop/mysqldump-php", @@ -925,16 +925,16 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.20.0", + "version": "2.21.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "10696c809866bebd9d71dca14de6c0d6c1cac2f8" + "reference": "e5b6419fea007b8b4a71034edc8ec96c88d4c57d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/10696c809866bebd9d71dca14de6c0d6c1cac2f8", - "reference": "10696c809866bebd9d71dca14de6c0d6c1cac2f8", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/e5b6419fea007b8b4a71034edc8ec96c88d4c57d", + "reference": "e5b6419fea007b8b4a71034edc8ec96c88d4c57d", "shasum": "" }, "require": { @@ -957,9 +957,9 @@ "http-interop/http-factory-tests": "^0.9.0", "laminas/laminas-coding-standard": "^2.4.0", "php-http/psr7-integration-tests": "^1.1.1", - "phpunit/phpunit": "^9.5.25", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.28" + "phpunit/phpunit": "^9.5.26", + "psalm/plugin-phpunit": "^0.18.0", + "vimeo/psalm": "^4.29.0" }, "type": "library", "extra": { @@ -1018,7 +1018,7 @@ "type": "community_bridge" } ], - "time": "2022-10-25T13:35:54+00:00" + "time": "2022-11-11T09:01:24+00:00" }, { "name": "laminas/laminas-httphandlerrunner", @@ -3018,16 +3018,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "shasum": "" }, "require": { @@ -3042,7 +3042,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3080,7 +3080,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" }, "funding": [ { @@ -3096,20 +3096,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "433d05519ce6990bf3530fba6957499d327395c2" + "reference": "511a08c03c1960e08a883f4cffcacd219b758354" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2", - "reference": "433d05519ce6990bf3530fba6957499d327395c2", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", + "reference": "511a08c03c1960e08a883f4cffcacd219b758354", "shasum": "" }, "require": { @@ -3121,7 +3121,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3161,7 +3161,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" }, "funding": [ { @@ -3177,20 +3177,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd" + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", "shasum": "" }, "require": { @@ -3202,7 +3202,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3245,7 +3245,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" }, "funding": [ { @@ -3261,20 +3261,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "shasum": "" }, "require": { @@ -3289,7 +3289,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3328,7 +3328,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" }, "funding": [ { @@ -3344,7 +3344,7 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/service-contracts", @@ -5176,16 +5176,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.9.1", + "version": "1.9.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "a59c8b5bfd4a236f27efc8b5ce72c313c2b54b5f" + "reference": "d6fdf01c53978b6429f1393ba4afeca39cc68afa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a59c8b5bfd4a236f27efc8b5ce72c313c2b54b5f", - "reference": "a59c8b5bfd4a236f27efc8b5ce72c313c2b54b5f", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d6fdf01c53978b6429f1393ba4afeca39cc68afa", + "reference": "d6fdf01c53978b6429f1393ba4afeca39cc68afa", "shasum": "" }, "require": { @@ -5215,7 +5215,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.1" + "source": "https://github.com/phpstan/phpstan/tree/1.9.2" }, "funding": [ { @@ -5231,7 +5231,7 @@ "type": "tidelift" } ], - "time": "2022-11-04T13:35:59+00:00" + "time": "2022-11-10T09:56:11+00:00" }, { "name": "phpunit/php-code-coverage", @@ -6944,16 +6944,16 @@ }, { "name": "slevomat/coding-standard", - "version": "8.6.2", + "version": "8.6.3", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "080f592b16f021a3a8e43d95ca8f57b87ddcf4e6" + "reference": "94fd4f9263e65a5006444890b1615c025ff58f1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/080f592b16f021a3a8e43d95ca8f57b87ddcf4e6", - "reference": "080f592b16f021a3a8e43d95ca8f57b87ddcf4e6", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/94fd4f9263e65a5006444890b1615c025ff58f1a", + "reference": "94fd4f9263e65a5006444890b1615c025ff58f1a", "shasum": "" }, "require": { @@ -6965,11 +6965,11 @@ "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.10|1.8.10", + "phpstan/phpstan": "1.4.10|1.9.0", "phpstan/phpstan-deprecation-rules": "1.0.0", - "phpstan/phpstan-phpunit": "1.0.0|1.1.1", + "phpstan/phpstan-phpunit": "1.0.0|1.2.2", "phpstan/phpstan-strict-rules": "1.4.4", - "phpunit/phpunit": "7.5.20|8.5.21|9.5.25" + "phpunit/phpunit": "7.5.20|8.5.21|9.5.26" }, "type": "phpcodesniffer-standard", "extra": { @@ -6993,7 +6993,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.6.2" + "source": "https://github.com/slevomat/coding-standard/tree/8.6.3" }, "funding": [ { @@ -7005,7 +7005,7 @@ "type": "tidelift" } ], - "time": "2022-10-22T15:42:49+00:00" + "time": "2022-11-10T15:24:40+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -7129,16 +7129,16 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85" + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", "shasum": "" }, "require": { @@ -7147,7 +7147,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7188,7 +7188,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" }, "funding": [ { @@ -7204,20 +7204,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", "shasum": "" }, "require": { @@ -7226,7 +7226,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7271,7 +7271,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" }, "funding": [ { @@ -7287,7 +7287,7 @@ "type": "tidelift" } ], - "time": "2022-05-10T07:21:04+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/process", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index cb106bb67e..f55d234199 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -9,7 +9,7 @@ "license": "AGPL-3.0", "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.4", - "@ericblade/quagga2": "^1.7.6", + "@ericblade/quagga2": "^1.7.7", "@fortawesome/fontawesome-free": "^6.2.0", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.2", @@ -29,7 +29,7 @@ "lazysizes": "^5.3.2", "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", - "svelte": "^3.52.0", + "svelte": "^3.53.1", "swiper": "8.4.4", "tooltipster": "^4.2.8", "uglify-js": "^3.17.4", @@ -54,9 +54,9 @@ } }, "node_modules/@ericblade/quagga2": { - "version": "1.7.6", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.6.tgz", - "integrity": "sha512-4+A1AonUwkoy9qr5S+N0z9owCN3lAxjy15Bh6I0Vl/mW8+hhYxhGieHgUq7bGplrwtZEnVyM4vp4b3ZxcCB69g==", + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.7.tgz", + "integrity": "sha512-cuTgtEgr8O86kFEAjCg5BYOiKdXVk71DYQ1SwWlyA09+JWySL5GDgSSi3Pg7jc3m8SMaKvVoVxye4mgRo9nEPw==", "dependencies": { "@babel/polyfill": "^7.12.1", "get-pixels": "^3.3.3", @@ -990,9 +990,9 @@ "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==" }, "node_modules/svelte": { - "version": "3.52.0", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.52.0.tgz", - "integrity": "sha512-FxcnEUOAVfr10vDU5dVgJN19IvqeHQCS1zfe8vayTfis9A2t5Fhx+JDe5uv/C3j//bB1umpLJ6quhgs9xyUbCQ==", + "version": "3.53.1", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.53.1.tgz", + "integrity": "sha512-Q4/hHkktZogGhN5iqxqSi9sjEVoe/NbIxX4hXEHoasTxj+TxEQVAq66LnDMdAZxjmsodkoI5F3slqsS68U7FNw==", "engines": { "node": ">= 8" } @@ -1149,9 +1149,9 @@ } }, "@ericblade/quagga2": { - "version": "1.7.6", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.6.tgz", - "integrity": "sha512-4+A1AonUwkoy9qr5S+N0z9owCN3lAxjy15Bh6I0Vl/mW8+hhYxhGieHgUq7bGplrwtZEnVyM4vp4b3ZxcCB69g==", + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.7.tgz", + "integrity": "sha512-cuTgtEgr8O86kFEAjCg5BYOiKdXVk71DYQ1SwWlyA09+JWySL5GDgSSi3Pg7jc3m8SMaKvVoVxye4mgRo9nEPw==", "requires": { "@babel/polyfill": "^7.12.1", "fsevents": "2.3.2", @@ -1869,9 +1869,9 @@ "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==" }, "svelte": { - "version": "3.52.0", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.52.0.tgz", - "integrity": "sha512-FxcnEUOAVfr10vDU5dVgJN19IvqeHQCS1zfe8vayTfis9A2t5Fhx+JDe5uv/C3j//bB1umpLJ6quhgs9xyUbCQ==" + "version": "3.53.1", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.53.1.tgz", + "integrity": "sha512-Q4/hHkktZogGhN5iqxqSi9sjEVoe/NbIxX4hXEHoasTxj+TxEQVAq66LnDMdAZxjmsodkoI5F3slqsS68U7FNw==" }, "swiper": { "version": "8.4.4", diff --git a/webroot/package.json b/webroot/package.json index 48f600a436..4c829847ba 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -35,7 +35,7 @@ "lazysizes": "^5.3.2", "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", - "svelte": "^3.52.0", + "svelte": "^3.53.1", "swiper": "8.4.4", "tooltipster": "^4.2.8", "uglify-js": "^3.17.4", From 854460fbc7f6ba3e0dc631969d2da42ae38ab06a Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 13 Nov 2022 20:02:17 +0100 Subject: [PATCH 294/646] use dataprovider in test --- .../src/View/Helper/MyHtmlHelperTest.php | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/tests/TestCase/src/View/Helper/MyHtmlHelperTest.php b/tests/TestCase/src/View/Helper/MyHtmlHelperTest.php index fe989bcba6..5e6eca8d8f 100644 --- a/tests/TestCase/src/View/Helper/MyHtmlHelperTest.php +++ b/tests/TestCase/src/View/Helper/MyHtmlHelperTest.php @@ -29,25 +29,30 @@ public function setUp(): void $this->MyHtmlHelper = new MyHtmlHelper(new View()); } - public function testRemoveTimestampFromFileValidTimestamp() + /** + * @dataProvider removeTimestampFromFileDataProvider + */ + public function testRemoveTimestampFromFile(string $filename, string $result): void { - $filename = 'asdf.jpg?1539847477'; - $result = 'asdf.jpg'; $this->assertEquals($result, $this->MyHtmlHelper->removeTimestampFromFile($filename)); } - public function testRemoveTimestampFromFileNoTimestamp() + public function removeTimestampFromFileDataProvider() { - $filename = 'asdf.jpg'; - $result = 'asdf.jpg'; - $this->assertEquals($result, $this->MyHtmlHelper->removeTimestampFromFile($filename)); - } - - public function testRemoveTimestampFromFileInvalidTimestamp() - { - $filename = 'asdf.jpg?adfs'; - $result = 'asdf.jpg'; - $this->assertEquals($result, $this->MyHtmlHelper->removeTimestampFromFile($filename)); + return [ + 'correct-timestamp' => [ + 'asdf.jpg?1539847477', + 'asdf.jpg', + ], + 'no-timestamp' => [ + 'asdf.jpg', + 'asdf.jpg', + ], + 'invalid-timestamp' => [ + 'asdf.jpg?adfs', + 'asdf.jpg', + ], + ]; } } From b5f44a8bd49b9508baa7e225169fa048e163a7b3 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 13 Nov 2022 20:57:48 +0100 Subject: [PATCH 295/646] update actions/checkout version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e6c4ff025..be8322332a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: name: FoodCoopShop CI steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Run Docker Compose run: CURRENT_UID=$(id -u):$(id -g) docker compose up php-nginx -d From 0b8bd3c79d832d72fe8111f753b7a82d434e6e2a Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 14 Nov 2022 08:42:07 +0100 Subject: [PATCH 296/646] add type --- src/Model/Table/ProductsTable.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index 9e6d2b6e90..a3c5a7a81e 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -768,6 +768,7 @@ public function getProductsForBackend($appAuth, $productIds, $manufacturerId, $a if (is_int($condition) || !is_array($condition)) { continue; } + $condition = (string) $condition; if (preg_match('/'.$this->getIsQuantityMinFilterSetCondition().'/', $condition)) { $this->getAssociation('ProductAttributes')->setConditions( [ From 0cba8d5a72ae59793896c5921aea7d1669aaf983 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 14 Nov 2022 12:05:08 +0100 Subject: [PATCH 297/646] remove deprecated File and Folder calls --- .../src/Controller/AdminAppController.php | 30 ++++--------- .../Controller/ManufacturersController.php | 20 +++------ .../src/Controller/ProductsController.php | 9 ++-- .../src/Controller/ListsControllerTest.php | 13 +++--- src/Lib/Folder/Folder.php | 44 +++++++++++++++++++ src/Lib/PdfWriter/PdfWriter.php | 14 +++--- src/Model/Table/ConfigurationsTable.php | 14 ++---- src/Model/Table/ProductsTable.php | 13 ++---- .../SavedLocalizedJsAsStaticFileShell.php | 6 +-- tests/TestCase/AppCakeTestCase.php | 34 +++++++------- 10 files changed, 102 insertions(+), 95 deletions(-) create mode 100644 src/Lib/Folder/Folder.php diff --git a/plugins/Admin/src/Controller/AdminAppController.php b/plugins/Admin/src/Controller/AdminAppController.php index b558bd08b4..04ab2a611d 100644 --- a/plugins/Admin/src/Controller/AdminAppController.php +++ b/plugins/Admin/src/Controller/AdminAppController.php @@ -5,8 +5,6 @@ use App\Controller\AppController; use Intervention\Image\ImageManagerStatic as Image; -use Cake\Filesystem\File; -use Cake\Filesystem\Folder; /** * FoodCoopShop - The open source software for your foodcoop @@ -35,31 +33,20 @@ public function setReferer() $this->set('referer', ! empty($this->getRequest()->getData('referer')) ? $this->getRequest()->getData('referer') : $this->referer()); } - /** - * deletes physical files (thumbs) - */ - protected function deleteUploadedImage($imageId, $thumbsPath) + protected function deleteUploadedImage(int $imageId, string $thumbsPath): void { - $dir = new Folder($thumbsPath); - $files = $dir->read(); - if (!empty($files[1])) { - foreach($files[1] as $file) { - if (preg_match('/^' . $imageId . '-/', $file)) { - $file = new File($thumbsPath . DS . $file); - $file->delete(); + $dir = new \DirectoryIterator($thumbsPath); + foreach ($dir as $fileinfo) { + if (!$fileinfo->isDot()) { + $filename = $fileinfo->getFilename(); + if (preg_match('/^' . $imageId . '-/', $filename)) { + unlink($thumbsPath . DS . $filename); } } } } - /** - * - * @param int $imageId - * @param string $filename - * @param string $thumbsPath - * @param array $imageSizes - */ - protected function saveUploadedImage($imageId, $filename, $thumbsPath, $imageSizes) + protected function saveUploadedImage(int $imageId, string $filename, string $thumbsPath, array $imageSizes): string { $this->deleteUploadedImage($imageId, $thumbsPath); @@ -83,5 +70,6 @@ protected function saveUploadedImage($imageId, $filename, $thumbsPath, $imageSiz } return $imageId . $options['suffix'] . '.' . $extension; + } } diff --git a/plugins/Admin/src/Controller/ManufacturersController.php b/plugins/Admin/src/Controller/ManufacturersController.php index c366394a13..cd634e436c 100644 --- a/plugins/Admin/src/Controller/ManufacturersController.php +++ b/plugins/Admin/src/Controller/ManufacturersController.php @@ -11,8 +11,6 @@ use App\Lib\PdfWriter\OrderListByCustomerPdfWriter; use Cake\Core\Configure; use Cake\Event\EventInterface; -use Cake\Filesystem\File; -use Cake\Filesystem\Folder; use Cake\Http\Exception\NotFoundException; use App\Lib\DeliveryRhythm\DeliveryRhythm; @@ -220,20 +218,12 @@ private function _processForm($manufacturer, $isEditMode) $this->set('manufacturer', $manufacturer); } - private function saveUploadedGeneralTermsAndConditions($manufacturerId, $filename) + private function saveUploadedGeneralTermsAndConditions(int $manufacturerId, string $filename): void { - - $newFileName = Configure::read('app.htmlHelper')->getManufacturerTermsOfUseSrcTemplate($manufacturerId); - - $fileObject = new File(WWW_ROOT . $filename); - - // assure that folder structure exists - $dir = new Folder(); - $path = dirname(WWW_ROOT . $newFileName); - $dir->create($path); - $dir->chmod($path, 0755); - - $fileObject->copy(WWW_ROOT . $newFileName); + $newFilename = Configure::read('app.htmlHelper')->getManufacturerTermsOfUseSrcTemplate($manufacturerId); + $path = dirname(WWW_ROOT . $newFilename); + mkdir($path, 0755, true); + copy(WWW_ROOT . $filename, WWW_ROOT . $newFilename); } private function deleteUploadedGeneralTermsAndConditions($manufacturerId) diff --git a/plugins/Admin/src/Controller/ProductsController.php b/plugins/Admin/src/Controller/ProductsController.php index cf0000e540..9ad9659131 100644 --- a/plugins/Admin/src/Controller/ProductsController.php +++ b/plugins/Admin/src/Controller/ProductsController.php @@ -5,10 +5,10 @@ use App\Controller\Component\StringComponent; use App\Lib\Error\Exception\InvalidParameterException; +use App\Lib\Folder\Folder; use App\Lib\PdfWriter\ProductCardsPdfWriter; use Cake\Datasource\Exception\RecordNotFoundException; use Cake\Event\EventInterface; -use Cake\Filesystem\Folder; use Cake\Core\Configure; use Cake\Http\Exception\ForbiddenException; use Cake\I18n\FrozenTime; @@ -457,11 +457,8 @@ public function saveUploadedImageProduct() $imageIdAsPath = Configure::read('app.htmlHelper')->getProductImageIdAsPath($image->id_image); $thumbsPath = Configure::read('app.htmlHelper')->getProductThumbsPath($imageIdAsPath); - // recursively create path - $dir = new Folder(); - $dir->delete($thumbsPath); - $dir->create($thumbsPath); - $dir->chmod($thumbsPath, 0755); + Folder::rrmdir($thumbsPath); + mkdir($thumbsPath, 0755, true); foreach (Configure::read('app.productImageSizes') as $thumbSize => $options) { diff --git a/plugins/Admin/tests/TestCase/src/Controller/ListsControllerTest.php b/plugins/Admin/tests/TestCase/src/Controller/ListsControllerTest.php index cce7bbb97e..845ccd2f7b 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/ListsControllerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/ListsControllerTest.php @@ -6,7 +6,6 @@ use App\Test\TestCase\Traits\LoginTrait; use App\Test\TestCase\Traits\PrepareAndTestInvoiceDataTrait; use Cake\Core\Configure; -use Cake\Filesystem\Folder; /** * FoodCoopShop - The open source software for your foodcoop @@ -88,10 +87,14 @@ public function testAccessOrderListPageAndDownloadableFile() $listPageUrl = $this->Slug->getOrderLists().'?dateFrom=02.02.2018'; - $folder = new Folder(Configure::read('app.folder_order_lists').DS.'2018'.DS.'02'); - $objects = $folder->read(); - $downloadFileName = $objects[1][0]; - $orderListDownloadUrl = '/admin/lists/getOrderList?file=2018/02/'.$downloadFileName; + $dir = new \DirectoryIterator(Configure::read('app.folder_order_lists').DS.'2018'.DS.'02'); + foreach ($dir as $fileinfo) { + if (!$fileinfo->isDot()) { + $downloadFileName = $fileinfo->getFilename(); + } + } + + $orderListDownloadUrl = '/admin/lists/getOrderList?file=2018/02/' . $downloadFileName; // check list page as manufacturer $this->loginAsMeatManufacturer(); diff --git a/src/Lib/Folder/Folder.php b/src/Lib/Folder/Folder.php new file mode 100644 index 0000000000..b51de85204 --- /dev/null +++ b/src/Lib/Folder/Folder.php @@ -0,0 +1,44 @@ + + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ +namespace App\Lib\Folder; + +class Folder +{ + + /** + * recursively removes an empty and non-empty directory including all sub-directories + */ + public static function rrmdir(string $dir): void + { + if (!is_dir($dir)) { + return; + } + $objects = scandir($dir); + foreach ($objects as $object) { + if ($object != '.' && $object != '..') { + if (filetype($dir . '/' . $object) == 'dir') { + self::rrmdir($dir . '/' . $object); + } else { + unlink($dir . '/' . $object); + } + } + } + reset($objects); + rmdir($dir); + } + +} \ No newline at end of file diff --git a/src/Lib/PdfWriter/PdfWriter.php b/src/Lib/PdfWriter/PdfWriter.php index ce6203ae89..905f77b9ba 100644 --- a/src/Lib/PdfWriter/PdfWriter.php +++ b/src/Lib/PdfWriter/PdfWriter.php @@ -15,7 +15,8 @@ * @link https://www.foodcoopshop.com */ namespace App\Lib\PdfWriter; -use Cake\Filesystem\Folder; + +use App\Lib\Folder\Folder; use Cake\Utility\Inflector; use Cake\View\ViewBuilder; @@ -87,9 +88,6 @@ public function writeAttachment() return $this->pdfLibrary->Output('', 'S'); } - /** - * creates folder structure if not yet existings - */ public function writeFile() { $this->setContent(); @@ -98,11 +96,11 @@ public function writeFile() if (file_exists($this->getFilename())) { unlink($this->getFilename()); } - // assure that folder structure exists - $dir = new Folder(); + $path = dirname($this->getFilename()); - $dir->create($path); - $dir->chmod($path, 0755); + if (!file_exists($path)) { + mkdir($path, 0755, true); + } return $this->pdfLibrary->Output($this->getFilename(), 'F'); } diff --git a/src/Model/Table/ConfigurationsTable.php b/src/Model/Table/ConfigurationsTable.php index 4cbea493ad..0695d99483 100644 --- a/src/Model/Table/ConfigurationsTable.php +++ b/src/Model/Table/ConfigurationsTable.php @@ -6,7 +6,6 @@ use Cake\Core\Configure; use App\Lib\Error\Exception\ConfigFileMissingException; use App\Model\Traits\ProductCacheClearAfterSaveTrait; -use Cake\Filesystem\File; use Cake\Validation\Validator; /** @@ -37,21 +36,14 @@ public function initialize(array $config): void $this->setPrimaryKey('id_configuration'); } - /** - * @param string $plugin - * @throws ConfigFileMissingException - * @return string (version) - */ - public function getVersion() + public function getVersion(): string { $versionFileWithPath = ROOT . DS . 'VERSION.txt'; - if (!file_exists($versionFileWithPath)) { throw new ConfigFileMissingException('version file not found: ' . $versionFileWithPath); } - $file = new File($versionFileWithPath); - $version = $file->read(true, 'r'); - + $file = fopen($versionFileWithPath, "r"); + $version = fgets($file); return $version; } diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index a3c5a7a81e..9fe2d95c20 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -4,13 +4,13 @@ namespace App\Model\Table; use App\Controller\Component\StringComponent; +use App\Lib\Folder\Folder; use App\Lib\Catalog\Catalog; use App\Lib\DeliveryRhythm\DeliveryRhythm; use App\Lib\Error\Exception\InvalidParameterException; use App\Lib\RemoteFile\RemoteFile; use App\Model\Traits\ProductCacheClearAfterSaveTrait; use Cake\Core\Configure; -use Cake\Filesystem\Folder; use Cake\Datasource\FactoryLocator; use Cake\Utility\Hash; use Cake\Validation\Validator; @@ -1379,11 +1379,8 @@ public function changeImage($products) if ($imageFromRemoteServer != 'no-image') { - // recursively create path - $dir = new Folder(); - $dir->delete($thumbsPath); - $dir->create($thumbsPath); - $dir->chmod($thumbsPath, 0755); + Folder::rrmdir($thumbsPath); + mkdir($thumbsPath, 0755, true); foreach (Configure::read('app.productImageSizes') as $thumbSize => $options) { $thumbsFileName = $thumbsPath . DS . $image->id_image . $options['suffix'] . '.' . $extension; @@ -1398,9 +1395,7 @@ public function changeImage($products) 'Images.id_image' => $image->id_image ]); - // delete physical files - $dir = new Folder(); - $dir->delete($thumbsPath); + Folder::rrmdir($thumbsPath); } } diff --git a/src/Shell/SavedLocalizedJsAsStaticFileShell.php b/src/Shell/SavedLocalizedJsAsStaticFileShell.php index fcc0b5db9f..055b7ed68e 100644 --- a/src/Shell/SavedLocalizedJsAsStaticFileShell.php +++ b/src/Shell/SavedLocalizedJsAsStaticFileShell.php @@ -17,7 +17,6 @@ namespace App\Shell; -use Cake\Filesystem\File; use Cake\TestSuite\IntegrationTestTrait; class SavedLocalizedJsAsStaticFileShell extends AppShell @@ -40,8 +39,9 @@ class SavedLocalizedJsAsStaticFileShell extends AppShell public function main() { $this->get('/js/localized-javascript.js'); - $jsFile = new File(WWW_ROOT . '/cache/localized-javascript-static.js'); - $jsFile->write($this->_response->getBody()->__toString()); + $jsFile = fopen(WWW_ROOT . '/cache/localized-javascript-static.js', 'w'); + fwrite($jsFile, $this->_response->getBody()->__toString()); + fclose($jsFile); } } diff --git a/tests/TestCase/AppCakeTestCase.php b/tests/TestCase/AppCakeTestCase.php index 8a35372145..074fd5c515 100644 --- a/tests/TestCase/AppCakeTestCase.php +++ b/tests/TestCase/AppCakeTestCase.php @@ -4,6 +4,7 @@ namespace App\Test\TestCase; use App\Lib\DeliveryRhythm\DeliveryRhythm; +use App\Lib\Folder\Folder; use App\Test\TestCase\Traits\AppIntegrationTestTrait; use App\Test\TestCase\Traits\LoginTrait; use App\Test\TestCase\Traits\QueueTrait; @@ -14,8 +15,6 @@ use Cake\Console\TestSuite\ConsoleIntegrationTestTrait; use Cake\Core\Configure; use Cake\Datasource\ConnectionManager; -use Cake\Filesystem\Folder; -use Cake\Filesystem\File; use Cake\View\View; use Cake\TestSuite\TestCase; use Cake\TestSuite\TestEmailTransport; @@ -89,17 +88,17 @@ public function setUp(): void TestEmailTransport::clearMessages(); } - private function getLogFile($name) + private function getLogFile(string $name): string { - return new File(ROOT . DS . 'logs' . DS . $name . '.log'); + return ROOT . DS . 'logs' . DS . $name . '.log'; } - protected function resetLogs() + protected function resetLogs(): void { - $this->getLogFile('debug')->write(''); - $this->getLogFile('error')->write(''); - $this->getLogFile('cli-debug')->write(''); - $this->getLogFile('cli-error')->write(''); + file_put_contents($this->getLogFile('debug'), ''); + file_put_contents($this->getLogFile('error'), ''); + file_put_contents($this->getLogFile('cli-debug'), ''); + file_put_contents($this->getLogFile('cli-error'), ''); } public function tearDown(): void @@ -110,10 +109,10 @@ public function tearDown(): void protected function assertLogFilesForErrors() { - $log = $this->getLogFile('debug')->read(true, 'r'); - $log .= $this->getLogFile('error')->read(true, 'r'); - $log .= $this->getLogFile('cli-debug')->read(true, 'r'); - $log .= $this->getLogFile('cli-error')->read(true, 'r'); + $log = file_get_contents($this->getLogFile('debug')); + $log .= file_get_contents($this->getLogFile('error')); + $log .= file_get_contents($this->getLogFile('cli-debug')); + $log .= file_get_contents($this->getLogFile('cli-error')); $this->assertDoesNotMatchRegularExpression('/(Warning|Notice)/', $log); } @@ -394,11 +393,12 @@ protected function resetCustomerCreditBalance() { private function prepareSendingOrderListsOrInvoices($contentFolder) { - $folder = new Folder(); - $folder->delete($contentFolder); - $file = new File($contentFolder . DS . '.gitignore', true); - $file->append('/* + Folder::rrmdir($contentFolder); + mkdir($contentFolder, 0755, true); + $file = fopen($contentFolder . DS . '.gitignore', 'w'); + fwrite($file, '/* !.gitignore'); + fclose($file); } } From 1c1a4c13167c17465327c5584a449a4c0cf77012 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 14 Nov 2022 15:14:50 +0100 Subject: [PATCH 298/646] sort files --- .../tests/TestCase/src/Controller/ListsControllerTest.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/Admin/tests/TestCase/src/Controller/ListsControllerTest.php b/plugins/Admin/tests/TestCase/src/Controller/ListsControllerTest.php index 845ccd2f7b..fc76e59667 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/ListsControllerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/ListsControllerTest.php @@ -88,13 +88,14 @@ public function testAccessOrderListPageAndDownloadableFile() $listPageUrl = $this->Slug->getOrderLists().'?dateFrom=02.02.2018'; $dir = new \DirectoryIterator(Configure::read('app.folder_order_lists').DS.'2018'.DS.'02'); + $files = []; foreach ($dir as $fileinfo) { if (!$fileinfo->isDot()) { - $downloadFileName = $fileinfo->getFilename(); + $files[] = $fileinfo->getFilename(); } } - - $orderListDownloadUrl = '/admin/lists/getOrderList?file=2018/02/' . $downloadFileName; + sort($files); + $orderListDownloadUrl = '/admin/lists/getOrderList?file=2018/02/' . $files[0]; // check list page as manufacturer $this->loginAsMeatManufacturer(); From 0df395ea21b7e731d5f6dad706648b464aee9673 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 14 Nov 2022 15:33:43 +0100 Subject: [PATCH 299/646] 905 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8832bd71e5..0a3fef663c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,10 +19,10 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe - Im Produkt-Admin kann jetzt der Status (aktiviert, deaktiviert) von mehreren markierten Produkten auf einmal geändert werden. [I#895](https://github.com/foodcoopshop/foodcoopshop/issues/895) / [PR#897](https://github.com/foodcoopshop/foodcoopshop/pull/897) - Hersteller können ihre Bestellungen über [eine neue API](https://foodcoopshop.github.io/de/netzwerk-modul.html#6-api-zum-abrufen-von-bestellungen) abrufen und sie so im eigenen System weiterverarbeiten. [I#894](https://github.com/foodcoopshop/foodcoopshop/issues/894) / [PR#899](https://github.com/foodcoopshop/foodcoopshop/pull/899) - ### For developers - New 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) and [Gitpod-Integration](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop). [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) / [PR#879](https://github.com/foodcoopshop/foodcoopshop/pull/879) / [PR#881](https://github.com/foodcoopshop/foodcoopshop/pull/881) - Enable strict typing in every php file to improve code quality. [I#872](https://github.com/foodcoopshop/foodcoopshop/issues/872) / [PR#893](https://github.com/foodcoopshop/foodcoopshop/pull/893) +- Replace CakePHP's deprecated File and Folder class. [I#902](https://github.com/foodcoopshop/foodcoopshop/issues/902) / [PR#905](https://github.com/foodcoopshop/foodcoopshop/pull/905) # v3.5.0 From 3a4e2ae910439802d7a622c43ab542e2c886061c Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 15 Nov 2022 11:25:44 +0100 Subject: [PATCH 300/646] refactor deprecated shell class --- .../AppShell.php => Command/AppCommand.php} | 29 ++--------- .../BackupDatabaseCommand.php} | 48 +++++++++---------- .../ChangeWeeklyPickupDayByOneDayCommand.php} | 29 ++++++----- .../CheckCreditBalanceCommand.php} | 21 ++++---- .../EmailOrderReminderCommand.php} | 31 ++++++------ .../PickupReminderCommand.php} | 25 +++++----- .../SavedLocalizedJsAsStaticFileCommand.php} | 13 +++-- .../SendDeliveryNotesCommand.php} | 18 +++---- .../SendInvoicesToCustomersCommand.php} | 18 +++---- .../SendInvoicesToManufacturersCommand.php} | 21 ++++---- .../SendOrderListsCommand.php} | 23 ++++----- .../TestCronjobCommand.php} | 12 +++-- ...bWithInvalidParameterExceptionCommand.php} | 10 ++-- src/Model/Table/CronjobsTable.php | 27 ++++++----- .../CheckCreditBalanceCommandTest.php} | 2 +- .../EmailOrderReminderCommandTest.php} | 2 +- .../PickupReminderCommandTest.php} | 2 +- .../SendDeliveryNotesCommandTest.php} | 2 +- .../SendInvoicesToCustomersCommandTest.php} | 2 +- ...endInvoicesToManufacturersCommandTest.php} | 2 +- .../SendOrderListsCommandTest.php} | 2 +- 21 files changed, 172 insertions(+), 167 deletions(-) rename src/{Shell/AppShell.php => Command/AppCommand.php} (58%) rename src/{Shell/BackupDatabaseShell.php => Command/BackupDatabaseCommand.php} (84%) rename src/{Shell/ChangeWeeklyPickupDayByOneDayShell.php => Command/ChangeWeeklyPickupDayByOneDayCommand.php} (76%) rename src/{Shell/CheckCreditBalanceShell.php => Command/CheckCreditBalanceCommand.php} (88%) rename src/{Shell/EmailOrderReminderShell.php => Command/EmailOrderReminderCommand.php} (84%) rename src/{Shell/PickupReminderShell.php => Command/PickupReminderCommand.php} (86%) rename src/{Shell/SavedLocalizedJsAsStaticFileShell.php => Command/SavedLocalizedJsAsStaticFileCommand.php} (81%) rename src/{Shell/SendDeliveryNotesShell.php => Command/SendDeliveryNotesCommand.php} (92%) rename src/{Shell/SendInvoicesToCustomersShell.php => Command/SendInvoicesToCustomersCommand.php} (88%) rename src/{Shell/SendInvoicesToManufacturersShell.php => Command/SendInvoicesToManufacturersCommand.php} (96%) rename src/{Shell/SendOrderListsShell.php => Command/SendOrderListsCommand.php} (95%) rename src/{Shell/TestCronjobShell.php => Command/TestCronjobCommand.php} (68%) rename src/{Shell/TestCronjobWithInvalidParameterExceptionShell.php => Command/TestCronjobWithInvalidParameterExceptionCommand.php} (72%) rename tests/TestCase/src/{Shell/CheckCreditBalanceShellTest.php => Command/CheckCreditBalanceCommandTest.php} (98%) rename tests/TestCase/src/{Shell/EmailOrderReminderShellTest.php => Command/EmailOrderReminderCommandTest.php} (98%) rename tests/TestCase/src/{Shell/PickupReminderShellTest.php => Command/PickupReminderCommandTest.php} (98%) rename tests/TestCase/src/{Shell/SendDeliveryNotesShellTest.php => Command/SendDeliveryNotesCommandTest.php} (95%) rename tests/TestCase/src/{Shell/SendInvoicesToCustomersShellTest.php => Command/SendInvoicesToCustomersCommandTest.php} (99%) rename tests/TestCase/src/{Shell/SendInvoicesToManufacturersShellTest.php => Command/SendInvoicesToManufacturersCommandTest.php} (98%) rename tests/TestCase/src/{Shell/SendOrderListsShellTest.php => Command/SendOrderListsCommandTest.php} (99%) diff --git a/src/Shell/AppShell.php b/src/Command/AppCommand.php similarity index 58% rename from src/Shell/AppShell.php rename to src/Command/AppCommand.php index 0b3b35cedc..08183d6424 100644 --- a/src/Shell/AppShell.php +++ b/src/Command/AppCommand.php @@ -1,10 +1,10 @@ * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ -class AppShell extends Shell +class AppCommand extends Command { public $timeStart; public $timeEnd; - public function main() - { - $this->Customer = $this->getTableLocator()->get('Customers'); - $this->ActionLog = $this->getTableLocator()->get('ActionLogs'); - } - public function startTimeLogging() { $this->timeStart = microtime(true); @@ -48,17 +42,4 @@ public function getRuntime() return __('Runtime') . ': ' . Configure::read('app.timeHelper')->convertSecondsInMinutesAndSeconds($time); } - public function out($message, int $newlines = 1, int $level = Shell::NORMAL): ?int - { - if ($this->isCalledFromUnitTest()) { - return null; - } else { - return parent::out($message, $newlines, $level); - } - } - - private function isCalledFromUnitTest() - { - return php_sapi_name() == 'cli' && $_SERVER['argv'][0] && preg_match('/phpunit/', $_SERVER['argv'][0]); - } -} +} \ No newline at end of file diff --git a/src/Shell/BackupDatabaseShell.php b/src/Command/BackupDatabaseCommand.php similarity index 84% rename from src/Shell/BackupDatabaseShell.php rename to src/Command/BackupDatabaseCommand.php index 122927da23..caec0b3b27 100644 --- a/src/Shell/BackupDatabaseShell.php +++ b/src/Command/BackupDatabaseCommand.php @@ -1,6 +1,17 @@ * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ - -namespace App\Shell; - -use Cake\Mailer\Mailer; -use Cake\Core\Configure; -use Cake\Datasource\ConnectionManager; -use Cake\I18n\Number; -use Ifsnop\Mysqldump as IMysqldump; -use App\Controller\Component\StringComponent; - -class BackupDatabaseShell extends AppShell +class BackupDatabaseCommand extends AppCommand { - public function main() + public function execute(Arguments $args, ConsoleIo $io) { - parent::main(); ini_set('max_execution_time', 300); ini_set('memory_limit', '256M'); - $this->ActionLog = $this->getTableLocator()->get('ActionLogs'); - $this->startTimeLogging(); $dbConfig = ConnectionManager::getConfig('default'); @@ -47,10 +45,10 @@ public function main() $filename = $backupdir . DS . $preparedHostWithoutProtocol . '-' . date('Y-m-d_H-i-s', time()) . '.bz2'; if (! is_dir($backupdir)) { - $this->out(' ', 1); - $this->out('Will create "' . $backupdir . '" directory!'); + $io->out(' ', 1); + $io->out('Will create "' . $backupdir . '" directory!'); if (mkdir($backupdir, 0755, true)) { - $this->out('Directory created!'); + $io->out('Directory created!'); } } @@ -75,20 +73,22 @@ public function main() // email zipped file via Mailer (to avoid queue's max 16MB mediumtext limit of AppMailer) $email = new Mailer(false); $email->setProfile('debug'); - $email->setTo(Configure::read('app.hostingEmail')) + $email->setTo(Configure::read('app.hostingEmail')) ->setSubject($message . ': ' . Configure::read('App.fullBaseUrl')) ->setAttachments([ $filename ]) ->send(); - $this->out($message); + $io->out($message); $this->stopTimeLogging(); + $this->ActionLog = $this->getTableLocator()->get('ActionLogs'); $this->ActionLog->customSave('cronjob_backup_database', 0, 0, '', $message . '
' . $this->getRuntime()); - $this->out($this->getRuntime()); + $io->out($this->getRuntime()); - return true; + return static::CODE_SUCCESS; } -} + +} \ No newline at end of file diff --git a/src/Shell/ChangeWeeklyPickupDayByOneDayShell.php b/src/Command/ChangeWeeklyPickupDayByOneDayCommand.php similarity index 76% rename from src/Shell/ChangeWeeklyPickupDayByOneDayShell.php rename to src/Command/ChangeWeeklyPickupDayByOneDayCommand.php index e65227d46d..2640dbd0b5 100644 --- a/src/Shell/ChangeWeeklyPickupDayByOneDayShell.php +++ b/src/Command/ChangeWeeklyPickupDayByOneDayCommand.php @@ -8,30 +8,32 @@ * For full copyright and license information, please see LICENSE * Redistributions of files must retain the above copyright notice. * - * @since FoodCoopShop 2.4.0 + * @since FoodCoopShop 3.6.0 * @license https://opensource.org/licenses/AGPL-3.0 * @author Mario Rothauer * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ -namespace App\Shell; +namespace App\Command; -use Cake\Console\Shell; +use Cake\Command\Command; +use Cake\Console\Arguments; +use Cake\Console\ConsoleIo; use Cake\Core\Configure; use App\Lib\Error\Exception\InvalidParameterException; -class ChangeWeeklyPickupDayByOneDayShell extends Shell +class ChangeWeeklyPickupDayByOneDayCommand extends Command { - public function main() + public function execute(Arguments $args, ConsoleIo $io) { - if (empty($this->args)) { + if (empty($args->getArguments())) { throw new InvalidParameterException('args not set'); } - if (!in_array($this->args[0], ['increase', 'decrease'])) { + if (!in_array($args->getArgumentAt(0), ['increase', 'decrease'])) { throw new InvalidParameterException('args wrong'); } @@ -42,10 +44,10 @@ public function main() "UPDATE fcs_configuration SET value = :newWeeklyPickupDay WHERE name = 'FCS_WEEKLY_PICKUP_DAY';" ); - if ($this->args[0] == 'increase') { + if ($args->getArgumentAt(0) == 'increase') { $newWeeklyPickupDay = Configure::read('app.timeHelper')->getNthWeekdayAfterWeekday(1, Configure::read('appDb.FCS_WEEKLY_PICKUP_DAY')); } - if ($this->args[0] == 'decrease') { + if ($args->getArgumentAt(0) == 'decrease') { $newWeeklyPickupDay = Configure::read('app.timeHelper')->getNthWeekdayBeforeWeekday(1, Configure::read('appDb.FCS_WEEKLY_PICKUP_DAY')); } @@ -56,10 +58,10 @@ public function main() $products = $this->Product->find('all'); foreach($products as $product) { - if ($this->args[0] == 'increase') { + if ($args->getArgumentAt(0) == 'increase') { $newDeliveryRhythmSendOrderListWeekday = Configure::read('app.timeHelper')->getNthWeekdayAfterWeekday(1, $product->delivery_rhythm_send_order_list_weekday); } - if ($this->args[0] == 'decrease') { + if ($args->getArgumentAt(0) == 'decrease') { $newDeliveryRhythmSendOrderListWeekday = Configure::read('app.timeHelper')->getNthWeekdayBeforeWeekday(1, $product->delivery_rhythm_send_order_list_weekday); } $statement = $this->Product->getConnection()->prepare( @@ -72,9 +74,10 @@ public function main() $statement->execute($params); } - $this->out('Changed FCS_WEEKLY_PICKUP_DAY to ' . Configure::read('app.timeHelper')->getWeekdayName($newWeeklyPickupDay) . '.'); + $io->out('Changed FCS_WEEKLY_PICKUP_DAY to ' . Configure::read('app.timeHelper')->getWeekdayName($newWeeklyPickupDay) . '.'); + + return static::CODE_SUCCESS; } } - diff --git a/src/Shell/CheckCreditBalanceShell.php b/src/Command/CheckCreditBalanceCommand.php similarity index 88% rename from src/Shell/CheckCreditBalanceShell.php rename to src/Command/CheckCreditBalanceCommand.php index b58bfba966..18967a926b 100644 --- a/src/Shell/CheckCreditBalanceShell.php +++ b/src/Command/CheckCreditBalanceCommand.php @@ -8,24 +8,26 @@ * For full copyright and license information, please see LICENSE * Redistributions of files must retain the above copyright notice. * - * @since FoodCoopShop 1.0.0 + * @since FoodCoopShop 3.6.0 * @license https://opensource.org/licenses/AGPL-3.0 * @author Mario Rothauer * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ -namespace App\Shell; +namespace App\Command; use App\Mailer\AppMailer; use Cake\Core\Configure; +use Cake\Console\Arguments; +use Cake\Console\ConsoleIo; -class CheckCreditBalanceShell extends AppShell + +class CheckCreditBalanceCommand extends AppCommand { - public function main() + public function execute(Arguments $args, ConsoleIo $io) { - parent::main(); if (!Configure::read('app.htmlHelper')->paymentIsCashless()) { return; @@ -33,6 +35,7 @@ public function main() $this->startTimeLogging(); + $this->Customer = $this->getTableLocator()->get('Customers'); $this->Customer->dropManufacturersInNextFind(); $conditions = [ 'Customers.active' => 1, @@ -105,12 +108,14 @@ public function main() $this->stopTimeLogging(); + $this->ActionLog = $this->getTableLocator()->get('ActionLogs'); $this->ActionLog->customSave('cronjob_check_credit_balance', 0, 0, '', $outString . '
' . $this->getRuntime()); - $this->out($outString); - $this->out($this->getRuntime()); + $io->out($outString); + $io->out($this->getRuntime()); - return true; + return static::CODE_SUCCESS; } + } diff --git a/src/Shell/EmailOrderReminderShell.php b/src/Command/EmailOrderReminderCommand.php similarity index 84% rename from src/Shell/EmailOrderReminderShell.php rename to src/Command/EmailOrderReminderCommand.php index 0e62dd8c6a..9f469427b9 100644 --- a/src/Shell/EmailOrderReminderShell.php +++ b/src/Command/EmailOrderReminderCommand.php @@ -11,35 +11,36 @@ * Cronjob works properly if it's called on Configure::read('app.timeHelper')->getSendOrderListsDay() -1 or -2 * eg: Order lists are sent on Wednesday => EmailOrderReminder can be called on Tuesday or Monday * - * @since FoodCoopShop 1.0.0 + * @since FoodCoopShop 3.6.0 * @license https://opensource.org/licenses/AGPL-3.0 * @author Mario Rothauer * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ -namespace App\Shell; +namespace App\Command; use App\Lib\DeliveryRhythm\DeliveryRhythm; use App\Mailer\AppMailer; +use Cake\Console\Arguments; +use Cake\Console\ConsoleIo; use Cake\Core\Configure; use Cake\Database\Expression\QueryExpression; -class EmailOrderReminderShell extends AppShell +class EmailOrderReminderCommand extends AppCommand { - public function main() + public function execute(Arguments $args, ConsoleIo $io) { - // $this->cronjobRunDay can is set in unit test - if (!isset($this->args[0])) { + if (!$args->getArgumentAt(0)) { $this->cronjobRunDay = Configure::read('app.timeHelper')->getCurrentDateTimeForDatabase(); } else { - $this->cronjobRunDay = $this->args[0]; + $this->cronjobRunDay = $args->getArgumentAt(0); } if (! Configure::read('app.emailOrderReminderEnabled')) { - return true; + return static::CODE_SUCCESS; } $productsTable = $this->getTableLocator()->get('Products'); @@ -53,18 +54,17 @@ public function main() if (Configure::read('appDb.FCS_NO_DELIVERY_DAYS_GLOBAL') != '') { $this->Product = $this->getTableLocator()->get('Products'); if ($this->Product->deliveryBreakEnabled(Configure::read('appDb.FCS_NO_DELIVERY_DAYS_GLOBAL'), $nextDeliveryDay)) { - return true; + return static::CODE_SUCCESS; } } - parent::main(); - $this->startTimeLogging(); $conditions = [ 'Customers.email_order_reminder_enabled' => 1, - 'Customers.active' => 1 + 'Customers.active' => 1, ]; + $this->Customer = $this->getTableLocator()->get('Customers'); $conditions[] = $this->Customer->getConditionToExcludeHostingUser(); $this->Customer->dropManufacturersInNextFind(); @@ -109,12 +109,13 @@ public function main() $this->stopTimeLogging(); + $this->ActionLog = $this->getTableLocator()->get('ActionLogs'); $this->ActionLog->customSave('cronjob_email_order_reminder', 0, 0, '', $outString . '
' . $this->getRuntime()); - $this->out($outString); - $this->out($this->getRuntime()); + $io->out($outString); + $io->out($this->getRuntime()); - return true; + return static::CODE_SUCCESS; } } diff --git a/src/Shell/PickupReminderShell.php b/src/Command/PickupReminderCommand.php similarity index 86% rename from src/Shell/PickupReminderShell.php rename to src/Command/PickupReminderCommand.php index ecb64e711d..9de922324c 100644 --- a/src/Shell/PickupReminderShell.php +++ b/src/Command/PickupReminderCommand.php @@ -8,35 +8,34 @@ * For full copyright and license information, please see LICENSE * Redistributions of files must retain the above copyright notice. * - * @since FoodCoopShop 2.2.0 + * @since FoodCoopShop 3.6.0 * @license https://opensource.org/licenses/AGPL-3.0 * @author Mario Rothauer * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ -namespace App\Shell; +namespace App\Command; use App\Mailer\AppMailer; use Cake\Core\Configure; +use Cake\Console\Arguments; +use Cake\Console\ConsoleIo; use Cake\Database\Expression\QueryExpression; use App\Lib\DeliveryRhythm\DeliveryRhythm; -class PickupReminderShell extends AppShell +class PickupReminderCommand extends AppCommand { public $cronjobRunDay; - public function main() + public function execute(Arguments $args, ConsoleIo $io) { - parent::main(); - - // $this->cronjobRunDay can is set in unit test - if (!isset($this->args[0])) { + if (!$args->getArgumentAt(0)) { $this->cronjobRunDay = Configure::read('app.timeHelper')->getCurrentDateTimeForDatabase(); } else { - $this->cronjobRunDay = $this->args[0]; + $this->cronjobRunDay = $args->getArgumentAt(0); } $this->startTimeLogging(); @@ -45,6 +44,7 @@ public function main() 'Customers.pickup_day_reminder_enabled' => 1, 'Customers.active' => 1, ]; + $this->Customer = $this->getTableLocator()->get('Customers'); $conditions[] = $this->Customer->getConditionToExcludeHostingUser(); $this->Customer->dropManufacturersInNextFind(); @@ -106,12 +106,13 @@ public function main() $this->stopTimeLogging(); + $this->ActionLog = $this->getTableLocator()->get('ActionLogs'); $this->ActionLog->customSave('cronjob_pickup_reminder', 0, 0, '', $outString . '
' . $this->getRuntime()); - $this->out($outString); - $this->out($this->getRuntime()); + $io->out($outString); + $io->out($this->getRuntime()); - return true; + return static::CODE_SUCCESS; } } diff --git a/src/Shell/SavedLocalizedJsAsStaticFileShell.php b/src/Command/SavedLocalizedJsAsStaticFileCommand.php similarity index 81% rename from src/Shell/SavedLocalizedJsAsStaticFileShell.php rename to src/Command/SavedLocalizedJsAsStaticFileCommand.php index 055b7ed68e..5300199f41 100644 --- a/src/Shell/SavedLocalizedJsAsStaticFileShell.php +++ b/src/Command/SavedLocalizedJsAsStaticFileCommand.php @@ -8,18 +8,20 @@ * For full copyright and license information, please see LICENSE * Redistributions of files must retain the above copyright notice. * - * @since FoodCoopShop 3.4.0 + * @since FoodCoopShop 3.6.0 * @license https://opensource.org/licenses/AGPL-3.0 * @author Mario Rothauer * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ -namespace App\Shell; +namespace App\Command; +use Cake\Console\Arguments; +use Cake\Console\ConsoleIo; use Cake\TestSuite\IntegrationTestTrait; -class SavedLocalizedJsAsStaticFileShell extends AppShell +class SavedLocalizedJsAsStaticFileCommand extends AppCommand { use IntegrationTestTrait; @@ -34,14 +36,15 @@ class SavedLocalizedJsAsStaticFileShell extends AppShell * * run this script to generate a static file for production use * - * @see AppShell::main() + * @see AppCommand::main() */ - public function main() + public function execute(Arguments $args, ConsoleIo $io) { $this->get('/js/localized-javascript.js'); $jsFile = fopen(WWW_ROOT . '/cache/localized-javascript-static.js', 'w'); fwrite($jsFile, $this->_response->getBody()->__toString()); fclose($jsFile); + return static::CODE_SUCCESS; } } diff --git a/src/Shell/SendDeliveryNotesShell.php b/src/Command/SendDeliveryNotesCommand.php similarity index 92% rename from src/Shell/SendDeliveryNotesShell.php rename to src/Command/SendDeliveryNotesCommand.php index 1dadf18200..1143be8be7 100644 --- a/src/Shell/SendDeliveryNotesShell.php +++ b/src/Command/SendDeliveryNotesCommand.php @@ -8,37 +8,39 @@ * For full copyright and license information, please see LICENSE * Redistributions of files must retain the above copyright notice. * - * @since FoodCoopShop 3.4.0 + * @since FoodCoopShop 3.6.0 * @license https://opensource.org/licenses/AGPL-3.0 * @author Mario Rothauer * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ -namespace App\Shell; +namespace App\Command; use App\Lib\DeliveryNote\GenerateDeliveryNote; use App\Mailer\AppMailer; +use Cake\Console\Arguments; +use Cake\Console\ConsoleIo; use Cake\Core\Configure; use Cake\Http\Exception\ForbiddenException; -class SendDeliveryNotesShell extends AppShell +class SendDeliveryNotesCommand extends AppCommand { public $cronjobRunDay; - public function main() + public function execute(Arguments $args, ConsoleIo $io) { - parent::main(); if (!Configure::read('appDb.FCS_PURCHASE_PRICE_ENABLED')) { throw new ForbiddenException(); } + $this->startTimeLogging(); - if (!isset($this->args[0])) { + if (!$args->getArgumentAt(0)) { $this->cronjobRunDay = Configure::read('app.timeHelper')->getCurrentDateTimeForDatabase(); } else { - $this->cronjobRunDay = $this->args[0]; + $this->cronjobRunDay = $args->getArgumentAt(0); } $dateFrom = Configure::read('app.timeHelper')->getFirstDayOfLastMonth($this->cronjobRunDay); @@ -116,7 +118,7 @@ public function main() } - return true; + return static::CODE_SUCCESS; } diff --git a/src/Shell/SendInvoicesToCustomersShell.php b/src/Command/SendInvoicesToCustomersCommand.php similarity index 88% rename from src/Shell/SendInvoicesToCustomersShell.php rename to src/Command/SendInvoicesToCustomersCommand.php index b9171f90a8..45e8039bfc 100644 --- a/src/Shell/SendInvoicesToCustomersShell.php +++ b/src/Command/SendInvoicesToCustomersCommand.php @@ -8,27 +8,28 @@ * For full copyright and license information, please see LICENSE * Redistributions of files must retain the above copyright notice. * - * @since FoodCoopShop 3.2.0 + * @since FoodCoopShop 3.6.0 * @license https://opensource.org/licenses/AGPL-3.0 * @author Mario Rothauer * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ -namespace App\Shell; +namespace App\Command; use App\Lib\HelloCash\HelloCash; use App\Lib\Invoice\GenerateInvoiceToCustomer; +use Cake\Console\Arguments; +use Cake\Console\ConsoleIo; use Cake\Core\Configure; use Cake\Http\Exception\ForbiddenException; -class SendInvoicesToCustomersShell extends AppShell +class SendInvoicesToCustomersCommand extends AppCommand { public $cronjobRunDay; - public function main() + public function execute(Arguments $args, ConsoleIo $io) { - parent::main(); if (!Configure::read('appDb.FCS_SEND_INVOICES_TO_CUSTOMERS')) { throw new ForbiddenException(); @@ -39,11 +40,10 @@ public function main() $this->Invoice = $this->getTableLocator()->get('Invoices'); $invoiceToCustomer = new GenerateInvoiceToCustomer(); - // $this->cronjobRunDay can is set in unit test - if (!isset($this->args[0])) { + if (!$args->getArgumentAt(0)) { $this->cronjobRunDay = Configure::read('app.timeHelper')->getCurrentDateTimeForDatabase(); } else { - $this->cronjobRunDay = $this->args[0]; + $this->cronjobRunDay = $args->getArgumentAt(0); } $this->Customer->dropManufacturersInNextFind(); @@ -86,7 +86,7 @@ public function main() $message = __('{0,plural,=1{1_invoice_was} other{#_invoices_were}}_generated_successfully.', [$i]); $this->ActionLog->customSave('invoice_added', 0, 0, 'invoices', $message . '
' . $this->getRuntime()); - return true; + return static::CODE_SUCCESS; } diff --git a/src/Shell/SendInvoicesToManufacturersShell.php b/src/Command/SendInvoicesToManufacturersCommand.php similarity index 96% rename from src/Shell/SendInvoicesToManufacturersShell.php rename to src/Command/SendInvoicesToManufacturersCommand.php index d270e813bd..a436224aef 100644 --- a/src/Shell/SendInvoicesToManufacturersShell.php +++ b/src/Command/SendInvoicesToManufacturersCommand.php @@ -8,37 +8,37 @@ * For full copyright and license information, please see LICENSE * Redistributions of files must retain the above copyright notice. * - * @since FoodCoopShop 1.0.0 + * @since FoodCoopShop 3.6.0 * @license https://opensource.org/licenses/AGPL-3.0 * @author Mario Rothauer * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ -namespace App\Shell; +namespace App\Command; use App\Mailer\AppMailer; +use Cake\Console\Arguments; +use Cake\Console\ConsoleIo; use Cake\Core\Configure; use Cake\Database\Expression\QueryExpression; use Cake\I18n\FrozenTime; -class SendInvoicesToManufacturersShell extends AppShell +class SendInvoicesToManufacturersCommand extends AppCommand { public $cronjobRunDay; - public function main() + public function execute(Arguments $args, ConsoleIo $io) { - parent::main(); $this->ActionLog = $this->getTableLocator()->get('ActionLogs'); $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); $this->Manufacturer = $this->getTableLocator()->get('Manufacturers'); - // $this->cronjobRunDay can is set in unit test - if (!isset($this->args[0])) { + if (!$args->getArgumentAt(0)) { $this->cronjobRunDay = Configure::read('app.timeHelper')->getCurrentDateTimeForDatabase(); } else { - $this->cronjobRunDay = $this->args[0]; + $this->cronjobRunDay = $args->getArgumentAt(0); } $dateFrom = Configure::read('app.timeHelper')->getFirstDayOfLastMonth($this->cronjobRunDay); @@ -111,7 +111,7 @@ public function main() } $outString .= $actionLogDatas; $actionLog = $this->ActionLog->customSave('cronjob_send_invoices', 0, 0, '', $outString, new FrozenTime($this->cronjobRunDay)); - $this->out($outString); + $io->out($outString); // 6) trigger queue invoice generation $this->QueuedJobs = $this->getTableLocator()->get('Queue.QueuedJobs'); @@ -144,7 +144,7 @@ public function main() ->addToQueue(); } - return true; + return static::CODE_SUCCESS; } @@ -219,7 +219,6 @@ protected function getActionLogData($manufacturers) $outString .= ''; } - return $outString; } diff --git a/src/Shell/SendOrderListsShell.php b/src/Command/SendOrderListsCommand.php similarity index 95% rename from src/Shell/SendOrderListsShell.php rename to src/Command/SendOrderListsCommand.php index b0662271c3..ddd732ed20 100644 --- a/src/Shell/SendOrderListsShell.php +++ b/src/Command/SendOrderListsCommand.php @@ -8,35 +8,36 @@ * For full copyright and license information, please see LICENSE * Redistributions of files must retain the above copyright notice. * - * @since FoodCoopShop 1.0.0 + * @since FoodCoopShop 3.6.0 * @license https://opensource.org/licenses/AGPL-3.0 * @author Mario Rothauer * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ -namespace App\Shell; +namespace App\Command; use App\Lib\DeliveryRhythm\DeliveryRhythm; +use Cake\Console\Arguments; +use Cake\Console\ConsoleIo; use Cake\Core\Configure; use Cake\I18n\FrozenDate; use Cake\Utility\Hash; -class SendOrderListsShell extends AppShell +class SendOrderListsCommand extends AppCommand { - public function main() + public function execute(Arguments $args, ConsoleIo $io) { - parent::main(); - $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); + $this->ActionLog = $this->getTableLocator()->get('ActionLogs'); $this->Manufacturer = $this->getTableLocator()->get('Manufacturers'); + $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); $this->QueuedJobs = $this->getTableLocator()->get('Queue.QueuedJobs'); - // $this->cronjobRunDay can is set in unit test - if (!isset($this->args[0])) { + if (!$args->getArgumentAt(0)) { $this->cronjobRunDay = Configure::read('app.timeHelper')->getCurrentDateForDatabase(); } else { - $this->cronjobRunDay = $this->args[0]; + $this->cronjobRunDay = $args->getArgumentAt(0); } if (Configure::read('appDb.FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY')) { @@ -136,9 +137,9 @@ public function main() $this->resetQuantityToDefaultQuantity($allOrderDetails); - $this->out($outString); + $io->out($outString); - return true; + return static::CODE_SUCCESS; } diff --git a/src/Shell/TestCronjobShell.php b/src/Command/TestCronjobCommand.php similarity index 68% rename from src/Shell/TestCronjobShell.php rename to src/Command/TestCronjobCommand.php index 6440360e4e..74a75d7bc9 100644 --- a/src/Shell/TestCronjobShell.php +++ b/src/Command/TestCronjobCommand.php @@ -8,21 +8,23 @@ * For full copyright and license information, please see LICENSE * Redistributions of files must retain the above copyright notice. * - * @since FoodCoopShop 2.3.0 + * @since FoodCoopShop 3.6.0 * @license https://opensource.org/licenses/AGPL-3.0 * @author Mario Rothauer * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ -namespace App\Shell; +namespace App\Command; +use Cake\Console\Arguments; +use Cake\Console\ConsoleIo; -class TestCronjobShell extends AppShell +class TestCronjobCommand extends AppCommand { - public function main() + public function execute(Arguments $args, ConsoleIo $io) { - return true; + return static::CODE_SUCCESS; } } diff --git a/src/Shell/TestCronjobWithInvalidParameterExceptionShell.php b/src/Command/TestCronjobWithInvalidParameterExceptionCommand.php similarity index 72% rename from src/Shell/TestCronjobWithInvalidParameterExceptionShell.php rename to src/Command/TestCronjobWithInvalidParameterExceptionCommand.php index 05fa08a5cd..96ba85de86 100644 --- a/src/Shell/TestCronjobWithInvalidParameterExceptionShell.php +++ b/src/Command/TestCronjobWithInvalidParameterExceptionCommand.php @@ -8,21 +8,23 @@ * For full copyright and license information, please see LICENSE * Redistributions of files must retain the above copyright notice. * - * @since FoodCoopShop 2.3.0 + * @since FoodCoopShop 3.6.0 * @license https://opensource.org/licenses/AGPL-3.0 * @author Mario Rothauer * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ -namespace App\Shell; +namespace App\Command; +use Cake\Console\Arguments; +use Cake\Console\ConsoleIo; use App\Lib\Error\Exception\InvalidParameterException; -class TestCronjobWithInvalidParameterExceptionShell extends AppShell +class TestCronjobWithInvalidParameterExceptionCommand extends AppCommand { - public function main() + public function execute(Arguments $args, ConsoleIo $io) { throw new InvalidParameterException(); } diff --git a/src/Model/Table/CronjobsTable.php b/src/Model/Table/CronjobsTable.php index 3d58b04ec0..5651db4f29 100644 --- a/src/Model/Table/CronjobsTable.php +++ b/src/Model/Table/CronjobsTable.php @@ -3,13 +3,16 @@ namespace App\Model\Table; -use Cake\Core\Configure; -use Cake\Database\Expression\QueryExpression; use Cake\I18n\I18n; -use App\Lib\Error\Exception\InvalidParameterException; -use Cake\I18n\FrozenTime; use Cake\ORM\Query; +use Cake\Console\Arguments; +use Cake\Console\ConsoleIo; +use Cake\Core\Configure; +use Cake\I18n\FrozenTime; use Cake\Validation\Validator; +use Cake\Database\Expression\QueryExpression; +use App\Lib\Error\Exception\InvalidParameterException; +use Queue\Console\Io; /** * FoodCoopShop - The open source software for your foodcoop @@ -276,12 +279,12 @@ public function run() private function executeCronjobAndSaveLog($cronjob, $cronjobRunDayObject) { - $shellName = $cronjob->getOriginalValues()['name'] . 'Shell'; - if (!file_exists(ROOT . DS . 'src' . DS . 'Shell' . DS . $shellName . '.php')) { - throw new InvalidParameterException('shell not found: ' . $shellName); + $commandName = $cronjob->getOriginalValues()['name'] . 'Command'; + if (!file_exists(ROOT . DS . 'src' . DS . 'Command' . DS . $commandName . '.php')) { + throw new InvalidParameterException('command not found: ' . $commandName); } - $shellClass = '\\App\\Shell\\' . $shellName; - $shell = new $shellClass(); + $commandClass = '\\App\\Command\\' . $commandName; + $command = new $commandClass(); $databasePreparedCronjobRunDay = Configure::read('app.timeHelper')->getTimeObjectUTC( $cronjobRunDayObject->i18nFormat(Configure::read('DateFormat.DatabaseWithTime') @@ -296,8 +299,10 @@ private function executeCronjobAndSaveLog($cronjob, $cronjobRunDayObject) $this->CronjobLogs->save($entity); try { - $success = $shell->main(); - $success = $success !== true ? CronjobLogsTable::FAILURE : CronjobLogsTable::SUCCESS; + $args = new Arguments([], [], []); + $io = new ConsoleIo(); + $success = $command->execute($args, $io); + $success = $success !== $command::CODE_SUCCESS ? CronjobLogsTable::FAILURE : CronjobLogsTable::SUCCESS; } catch (\Exception $e) { $success = CronjobLogsTable::FAILURE; } diff --git a/tests/TestCase/src/Shell/CheckCreditBalanceShellTest.php b/tests/TestCase/src/Command/CheckCreditBalanceCommandTest.php similarity index 98% rename from tests/TestCase/src/Shell/CheckCreditBalanceShellTest.php rename to tests/TestCase/src/Command/CheckCreditBalanceCommandTest.php index e9eba9c39a..2468b72a84 100644 --- a/tests/TestCase/src/Shell/CheckCreditBalanceShellTest.php +++ b/tests/TestCase/src/Command/CheckCreditBalanceCommandTest.php @@ -23,7 +23,7 @@ * @link https://www.foodcoopshop.com */ -class CheckCreditBalanceShellTest extends AppCakeTestCase +class CheckCreditBalanceCommandTest extends AppCakeTestCase { use AppIntegrationTestTrait; diff --git a/tests/TestCase/src/Shell/EmailOrderReminderShellTest.php b/tests/TestCase/src/Command/EmailOrderReminderCommandTest.php similarity index 98% rename from tests/TestCase/src/Shell/EmailOrderReminderShellTest.php rename to tests/TestCase/src/Command/EmailOrderReminderCommandTest.php index 7e1d323222..9a49f20eb1 100644 --- a/tests/TestCase/src/Shell/EmailOrderReminderShellTest.php +++ b/tests/TestCase/src/Command/EmailOrderReminderCommandTest.php @@ -21,7 +21,7 @@ use Cake\Core\Configure; use Cake\TestSuite\EmailTrait; -class EmailOrderReminderShellTest extends AppCakeTestCase +class EmailOrderReminderCommandTest extends AppCakeTestCase { protected $OrderDetail; diff --git a/tests/TestCase/src/Shell/PickupReminderShellTest.php b/tests/TestCase/src/Command/PickupReminderCommandTest.php similarity index 98% rename from tests/TestCase/src/Shell/PickupReminderShellTest.php rename to tests/TestCase/src/Command/PickupReminderCommandTest.php index 99827176a2..3c1a67edd7 100644 --- a/tests/TestCase/src/Shell/PickupReminderShellTest.php +++ b/tests/TestCase/src/Command/PickupReminderCommandTest.php @@ -21,7 +21,7 @@ * @link https://www.foodcoopshop.com */ -class PickupReminderShellTest extends AppCakeTestCase +class PickupReminderCommandTest extends AppCakeTestCase { protected $OrderDetail; diff --git a/tests/TestCase/src/Shell/SendDeliveryNotesShellTest.php b/tests/TestCase/src/Command/SendDeliveryNotesCommandTest.php similarity index 95% rename from tests/TestCase/src/Shell/SendDeliveryNotesShellTest.php rename to tests/TestCase/src/Command/SendDeliveryNotesCommandTest.php index 2974821539..0c5d3b3209 100644 --- a/tests/TestCase/src/Shell/SendDeliveryNotesShellTest.php +++ b/tests/TestCase/src/Command/SendDeliveryNotesCommandTest.php @@ -21,7 +21,7 @@ * @link https://www.foodcoopshop.com */ -class SendDeliveryNotesShellTest extends AppCakeTestCase +class SendDeliveryNotesCommandTest extends AppCakeTestCase { use AppIntegrationTestTrait; diff --git a/tests/TestCase/src/Shell/SendInvoicesToCustomersShellTest.php b/tests/TestCase/src/Command/SendInvoicesToCustomersCommandTest.php similarity index 99% rename from tests/TestCase/src/Shell/SendInvoicesToCustomersShellTest.php rename to tests/TestCase/src/Command/SendInvoicesToCustomersCommandTest.php index 9cc00683a7..79a83fc5c4 100644 --- a/tests/TestCase/src/Shell/SendInvoicesToCustomersShellTest.php +++ b/tests/TestCase/src/Command/SendInvoicesToCustomersCommandTest.php @@ -23,7 +23,7 @@ use Cake\I18n\FrozenTime; use Cake\TestSuite\EmailTrait; -class SendInvoicesToCustomersShellTest extends AppCakeTestCase +class SendInvoicesToCustomersCommandTest extends AppCakeTestCase { protected $Invoice; diff --git a/tests/TestCase/src/Shell/SendInvoicesToManufacturersShellTest.php b/tests/TestCase/src/Command/SendInvoicesToManufacturersCommandTest.php similarity index 98% rename from tests/TestCase/src/Shell/SendInvoicesToManufacturersShellTest.php rename to tests/TestCase/src/Command/SendInvoicesToManufacturersCommandTest.php index 52bc00d8a0..f8e5b0179a 100644 --- a/tests/TestCase/src/Shell/SendInvoicesToManufacturersShellTest.php +++ b/tests/TestCase/src/Command/SendInvoicesToManufacturersCommandTest.php @@ -21,7 +21,7 @@ use Cake\Core\Configure; use Cake\TestSuite\EmailTrait; -class SendInvoicesToManufacturersShellTest extends AppCakeTestCase +class SendInvoicesToManufacturersCommandTest extends AppCakeTestCase { public $Cart; diff --git a/tests/TestCase/src/Shell/SendOrderListsShellTest.php b/tests/TestCase/src/Command/SendOrderListsCommandTest.php similarity index 99% rename from tests/TestCase/src/Shell/SendOrderListsShellTest.php rename to tests/TestCase/src/Command/SendOrderListsCommandTest.php index efe387cc98..0e05f61db3 100644 --- a/tests/TestCase/src/Shell/SendOrderListsShellTest.php +++ b/tests/TestCase/src/Command/SendOrderListsCommandTest.php @@ -24,7 +24,7 @@ * @link https://www.foodcoopshop.com */ -class SendOrderListsShellTest extends AppCakeTestCase +class SendOrderListsCommandTest extends AppCakeTestCase { protected $ActionLog; From 0b1b40173820ed5ec313fba8e9e50266f08c5a77 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 15 Nov 2022 11:28:39 +0100 Subject: [PATCH 301/646] 907 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a3fef663c..665bc33dfa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,8 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe ### For developers - New 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) and [Gitpod-Integration](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop). [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) / [PR#879](https://github.com/foodcoopshop/foodcoopshop/pull/879) / [PR#881](https://github.com/foodcoopshop/foodcoopshop/pull/881) - Enable strict typing in every php file to improve code quality. [I#872](https://github.com/foodcoopshop/foodcoopshop/issues/872) / [PR#893](https://github.com/foodcoopshop/foodcoopshop/pull/893) -- Replace CakePHP's deprecated File and Folder class. [I#902](https://github.com/foodcoopshop/foodcoopshop/issues/902) / [PR#905](https://github.com/foodcoopshop/foodcoopshop/pull/905) +- Replace CakePHP's deprecated classes: File, Folder, Shell. [I#902](https://github.com/foodcoopshop/foodcoopshop/issues/902) [I#906](https://github.com/foodcoopshop/foodcoopshop/issues/906) / [PR#905](https://github.com/foodcoopshop/foodcoopshop/pull/905) / [PR#907](https://github.com/foodcoopshop/foodcoopshop/pull/907) + # v3.5.0 From 905ec2f8738d5b72a8e840882af38c960a26a59b Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 15 Nov 2022 11:34:39 +0100 Subject: [PATCH 302/646] fix phpstan errors --- src/Command/BackupDatabaseCommand.php | 2 ++ src/Command/ChangeWeeklyPickupDayByOneDayCommand.php | 3 +++ src/Command/CheckCreditBalanceCommand.php | 3 +++ src/Command/EmailOrderReminderCommand.php | 5 +++++ src/Command/PickupReminderCommand.php | 3 +++ src/Command/SendDeliveryNotesCommand.php | 3 +++ src/Command/SendInvoicesToCustomersCommand.php | 3 +++ src/Command/SendInvoicesToManufacturersCommand.php | 4 ++++ src/Command/SendOrderListsCommand.php | 7 +++++++ 9 files changed, 33 insertions(+) diff --git a/src/Command/BackupDatabaseCommand.php b/src/Command/BackupDatabaseCommand.php index caec0b3b27..6dd0989f72 100644 --- a/src/Command/BackupDatabaseCommand.php +++ b/src/Command/BackupDatabaseCommand.php @@ -28,6 +28,8 @@ class BackupDatabaseCommand extends AppCommand { + public $ActionLog; + public function execute(Arguments $args, ConsoleIo $io) { diff --git a/src/Command/ChangeWeeklyPickupDayByOneDayCommand.php b/src/Command/ChangeWeeklyPickupDayByOneDayCommand.php index 2640dbd0b5..8091398d06 100644 --- a/src/Command/ChangeWeeklyPickupDayByOneDayCommand.php +++ b/src/Command/ChangeWeeklyPickupDayByOneDayCommand.php @@ -26,6 +26,9 @@ class ChangeWeeklyPickupDayByOneDayCommand extends Command { + public $Product; + public $Configuration; + public function execute(Arguments $args, ConsoleIo $io) { diff --git a/src/Command/CheckCreditBalanceCommand.php b/src/Command/CheckCreditBalanceCommand.php index 18967a926b..14a81e8cb3 100644 --- a/src/Command/CheckCreditBalanceCommand.php +++ b/src/Command/CheckCreditBalanceCommand.php @@ -26,6 +26,9 @@ class CheckCreditBalanceCommand extends AppCommand { + public $ActionLog; + public $Customer; + public function execute(Arguments $args, ConsoleIo $io) { diff --git a/src/Command/EmailOrderReminderCommand.php b/src/Command/EmailOrderReminderCommand.php index 9f469427b9..75b7048eac 100644 --- a/src/Command/EmailOrderReminderCommand.php +++ b/src/Command/EmailOrderReminderCommand.php @@ -30,6 +30,11 @@ class EmailOrderReminderCommand extends AppCommand { + public $cronjobRunDay; + public $ActionLog; + public $Customer; + public $Product; + public function execute(Arguments $args, ConsoleIo $io) { diff --git a/src/Command/PickupReminderCommand.php b/src/Command/PickupReminderCommand.php index 9de922324c..c87c3316ab 100644 --- a/src/Command/PickupReminderCommand.php +++ b/src/Command/PickupReminderCommand.php @@ -28,6 +28,9 @@ class PickupReminderCommand extends AppCommand { public $cronjobRunDay; + public $Customer; + public $OrderDetail; + public $ActionLog; public function execute(Arguments $args, ConsoleIo $io) { diff --git a/src/Command/SendDeliveryNotesCommand.php b/src/Command/SendDeliveryNotesCommand.php index 1143be8be7..f47e04a956 100644 --- a/src/Command/SendDeliveryNotesCommand.php +++ b/src/Command/SendDeliveryNotesCommand.php @@ -27,6 +27,9 @@ class SendDeliveryNotesCommand extends AppCommand { public $cronjobRunDay; + public $ActionLog; + public $Manufacturer; + public $OrderDetail; public function execute(Arguments $args, ConsoleIo $io) { diff --git a/src/Command/SendInvoicesToCustomersCommand.php b/src/Command/SendInvoicesToCustomersCommand.php index 45e8039bfc..968bb1e306 100644 --- a/src/Command/SendInvoicesToCustomersCommand.php +++ b/src/Command/SendInvoicesToCustomersCommand.php @@ -27,6 +27,9 @@ class SendInvoicesToCustomersCommand extends AppCommand { public $cronjobRunDay; + public $ActionLog; + public $Customer; + public $Invoice; public function execute(Arguments $args, ConsoleIo $io) { diff --git a/src/Command/SendInvoicesToManufacturersCommand.php b/src/Command/SendInvoicesToManufacturersCommand.php index a436224aef..79086949d9 100644 --- a/src/Command/SendInvoicesToManufacturersCommand.php +++ b/src/Command/SendInvoicesToManufacturersCommand.php @@ -27,6 +27,10 @@ class SendInvoicesToManufacturersCommand extends AppCommand { public $cronjobRunDay; + public $ActionLog; + public $OrderDetail; + public $Manufacturer; + public $QueuedJobs; public function execute(Arguments $args, ConsoleIo $io) { diff --git a/src/Command/SendOrderListsCommand.php b/src/Command/SendOrderListsCommand.php index ddd732ed20..5aa2844831 100644 --- a/src/Command/SendOrderListsCommand.php +++ b/src/Command/SendOrderListsCommand.php @@ -26,6 +26,13 @@ class SendOrderListsCommand extends AppCommand { + public $cronjobRunDay; + public $ActionLog; + public $Manufacturer; + public $OrderDetail; + public $QueuedJobs; + public $Product; + public function execute(Arguments $args, ConsoleIo $io) { From bc1d2043687691ad0883af8bde7ef7602b234314 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 16 Nov 2022 10:13:33 +0100 Subject: [PATCH 303/646] npm is already included in node image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fb8cfda802..e158279c21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ COPY --from=node /usr/local/bin/node /usr/local/bin/node RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm RUN apk update && \ - apk add npm gettext && \ + apk add gettext && \ npm install -g npm-check-updates && \ npm install -g eslint From 14becd39c88d6ad243d53720ec64ee3548b10e45 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 16 Nov 2022 10:13:57 +0100 Subject: [PATCH 304/646] docker container was started with current id --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be8322332a..94c6fd4efb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,8 +24,8 @@ jobs: # do not use ./devtools/init-dev-setup.sh because dev db is not needed bash ./devtools/installation/set-permissions.sh bash ./devtools/setup-dev/copy-config-files.sh - CURRENT_UID=$(id -u):$(id -g) docker exec -w /app fcs.php composer install - CURRENT_UID=$(id -u):$(id -g) docker exec -w /app/webroot fcs.php npm install + docker exec -w /app fcs.php composer install + docker exec -w /app/webroot fcs.php npm install - name: Apply secrets run: | From dd3b6e62ebf036f9c1ad8424c46018d641489c22 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 16 Nov 2022 16:02:49 +0100 Subject: [PATCH 305/646] calculate first and last order date for various dropdowns --- .../src/Controller/CustomersController.php | 16 +++++++++++-- .../src/Controller/StatisticsController.php | 13 +++++++--- plugins/Admin/templates/Customers/index.php | 13 ++++++---- src/Model/Table/OrderDetailsTable.php | 24 +++++++++++++++++++ src/View/Helper/MyTimeHelper.php | 7 +++++- 5 files changed, 63 insertions(+), 10 deletions(-) diff --git a/plugins/Admin/src/Controller/CustomersController.php b/plugins/Admin/src/Controller/CustomersController.php index 37f21700f9..47d44e330c 100644 --- a/plugins/Admin/src/Controller/CustomersController.php +++ b/plugins/Admin/src/Controller/CustomersController.php @@ -674,7 +674,20 @@ public function index() } $this->set('year', $year); - $this->set('years', Configure::read('app.timeHelper')->getAllYearsUntilThisYear(date('Y'), 2017, __d('admin', 'Member_fee') . ' ')); + $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); + + $firstOrderYear = $this->OrderDetail->getFirstOrderYear(); + $this->set('firstOrderYear', $firstOrderYear); + + $lastOrderYear = $this->OrderDetail->getLastOrderYear(); + $this->set('lastOrderYear', $lastOrderYear); + + if ($lastOrderYear !== false && $firstOrderYear !== false) { + $years = Configure::read('app.timeHelper')->getAllYearsUntilThisYear($lastOrderYear, $firstOrderYear, __d('admin', 'Member_fee') . ' '); + } else { + $years = null; + } + $this->set('years', $years); $conditions = []; if ($active != 'all') { @@ -734,7 +747,6 @@ public function index() $i = 0; $this->Payment = $this->getTableLocator()->get('Payments'); - $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); foreach ($customers as $customer) { if (Configure::read('app.htmlHelper')->paymentIsCashless()) { diff --git a/plugins/Admin/src/Controller/StatisticsController.php b/plugins/Admin/src/Controller/StatisticsController.php index dde0e4e93c..2311d31270 100644 --- a/plugins/Admin/src/Controller/StatisticsController.php +++ b/plugins/Admin/src/Controller/StatisticsController.php @@ -104,7 +104,15 @@ public function index() } $this->set('title_for_layout', $titleForLayout); - $this->set('years', Configure::read('app.timeHelper')->getAllYearsUntilThisYear(date('Y'), 2014)); + $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); + $firstOrderYear = $this->OrderDetail->getFirstOrderYear(); + $lastOrderYear = $this->OrderDetail->getLastOrderYear(); + if ($lastOrderYear !== false && $firstOrderYear !== false) { + $years = Configure::read('app.timeHelper')->getAllYearsUntilThisYear($lastOrderYear, $firstOrderYear); + } else { + $years = null; + } + $this->set('years', $years); $excludeMemberFeeCondition = []; if (Configure::read('appDb.FCS_MEMBER_FEE_PRODUCTS') != '') { @@ -113,7 +121,6 @@ public function index() ]; } - $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); $monthlySumProducts = $this->OrderDetail->getMonthlySumProductByManufacturer($manufacturerId, $year); if (!empty($excludeMemberFeeCondition)) { $monthlySumProducts->where($excludeMemberFeeCondition); @@ -130,7 +137,7 @@ public function index() return; } - $monthsAndYear = Configure::read('app.timeHelper')->getAllMonthsUntilThisYear(date('Y'), 2014); + $monthsAndYear = Configure::read('app.timeHelper')->getAllMonthsUntilThisYear($lastOrderYear, $firstOrderYear); $monthsWithTurnoverMonthAndYear = $monthlySumProducts->all()->extract('MonthAndYear')->toArray(); $monthsWithTurnoverSumTotalPaid = $monthlySumProducts->all()->extract('SumTotalPaid')->toArray(); diff --git a/plugins/Admin/templates/Customers/index.php b/plugins/Admin/templates/Customers/index.php index 06604fe1d0..16825b293e 100644 --- a/plugins/Admin/templates/Customers/index.php +++ b/plugins/Admin/templates/Customers/index.php @@ -138,10 +138,15 @@ ]).'"> ' . $customerName; } - echo '' . $this->Html->link($customerName, '/admin/order-details?&pickupDay[]='.Configure::read('app.timeHelper')->formatToDateShort('2014-01-01').'&pickupDay[]=' . Configure::read('app.timeHelper')->formatToDateShort('2022-12-31') . '&customerId=' . $customer->id_customer . '&sort=OrderDetails.pickup_day&direction=desc', [ - 'title' => __d('admin', 'Show_all_orders_from_{0}', [$this->Html->getNameRespectingIsDeleted($customer)]), - 'escape' => false - ]) . ''; + if ($lastOrderYear === false && $firstOrderYear === false) { + $customerLink = $customerName; + } else { + $customerLink = $this->Html->link($customerName, '/admin/order-details?&pickupDay[]='.Configure::read('app.timeHelper')->formatToDateShort($firstOrderYear . '-01-01').'&pickupDay[]=' . Configure::read('app.timeHelper')->formatToDateShort($lastOrderYear . '-12-31') . '&customerId=' . $customer->id_customer . '&sort=OrderDetails.pickup_day&direction=desc', [ + 'title' => __d('admin', 'Show_all_orders_from_{0}', [$this->Html->getNameRespectingIsDeleted($customer)]), + 'escape' => false + ]); + } + echo '' . $customerLink . ''; echo '
'; $imageSrc = $this->Html->getCustomerImageSrc($customer->id_customer, 'small'); diff --git a/src/Model/Table/OrderDetailsTable.php b/src/Model/Table/OrderDetailsTable.php index 9e94ae5e12..22fa7b0e64 100644 --- a/src/Model/Table/OrderDetailsTable.php +++ b/src/Model/Table/OrderDetailsTable.php @@ -125,6 +125,29 @@ public function getLastOrderDate($customerId) return $query; } + private function getLastOrFirstOrderYear(string $sort): int|false + { + $orderDetail = $this->find('all', [ + 'order' => [ + 'OrderDetails.pickup_day' => $sort, + ] + ])->first(); + if (empty($orderDetail)) { + return false; + } + return (int) $orderDetail->pickup_day->i18nFormat(Configure::read('app.timeHelper')->getI18Format('Year')); + } + + public function getLastOrderYear(): int|false + { + return $this->getLastOrFirstOrderYear('DESC'); + } + + public function getFirstOrderYear(): int|false + { + return $this->getLastOrFirstOrderYear('ASC'); + } + public function getOrderDetailsForOrderListPreview($pickupDay) { $query = $this->find('all', [ @@ -750,4 +773,5 @@ public function getOrderDetailParams($appAuth, $manufacturerId, $productId, $cus return $odParams; } + } diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index 48561c4bd6..23a7bc3dc3 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -48,7 +48,7 @@ public function convertSecondsInMinutesAndSeconds($seconds) return join(' ', $result); } - public function getAllYearsUntilThisYear($thisYear, $firstYear, $labelPrefix='') + public function getAllYearsUntilThisYear(int $thisYear, int $firstYear, $labelPrefix=''): array { $years = []; while($thisYear >= $firstYear) { @@ -230,6 +230,11 @@ public function formatAsWeekday($day) return date('N', $day); } + public function formatAsYear($date) + { + return date('N', $date); + } + public function getCurrentDay() { return time(); From 8fc9291181c7c5be6c4436f14516072d6d6c9a92 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 16 Nov 2022 16:04:08 +0100 Subject: [PATCH 306/646] better coding style --- plugins/Admin/src/Controller/CustomersController.php | 3 +-- plugins/Admin/src/Controller/StatisticsController.php | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/Admin/src/Controller/CustomersController.php b/plugins/Admin/src/Controller/CustomersController.php index 47d44e330c..c20e59b965 100644 --- a/plugins/Admin/src/Controller/CustomersController.php +++ b/plugins/Admin/src/Controller/CustomersController.php @@ -682,10 +682,9 @@ public function index() $lastOrderYear = $this->OrderDetail->getLastOrderYear(); $this->set('lastOrderYear', $lastOrderYear); + $years = null; if ($lastOrderYear !== false && $firstOrderYear !== false) { $years = Configure::read('app.timeHelper')->getAllYearsUntilThisYear($lastOrderYear, $firstOrderYear, __d('admin', 'Member_fee') . ' '); - } else { - $years = null; } $this->set('years', $years); diff --git a/plugins/Admin/src/Controller/StatisticsController.php b/plugins/Admin/src/Controller/StatisticsController.php index 2311d31270..57e4550440 100644 --- a/plugins/Admin/src/Controller/StatisticsController.php +++ b/plugins/Admin/src/Controller/StatisticsController.php @@ -107,10 +107,10 @@ public function index() $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); $firstOrderYear = $this->OrderDetail->getFirstOrderYear(); $lastOrderYear = $this->OrderDetail->getLastOrderYear(); + + $years = null; if ($lastOrderYear !== false && $firstOrderYear !== false) { $years = Configure::read('app.timeHelper')->getAllYearsUntilThisYear($lastOrderYear, $firstOrderYear); - } else { - $years = null; } $this->set('years', $years); From 982aea6546c1a2514d42117cb1ffb126c0913292 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 16 Nov 2022 17:14:20 +0100 Subject: [PATCH 307/646] pass correct type --- src/View/Helper/MyTimeHelper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index 23a7bc3dc3..0a9c48ad51 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -179,8 +179,8 @@ public function getAllCalendarWeeksUntilNow($timestampStart) { $startCalendarWeek = date('W', $timestampStart); - $startYear = date('Y', $timestampStart); - $currentYear = date('Y'); + $startYear = (int) date('Y', $timestampStart); + $currentYear = (int) date('Y'); $allYears = array_reverse($this->getAllYearsUntilThisYear($currentYear, $startYear)); $currentCalendarWeek = date('W'); From 83b5a5c1ececfda80d0266d33b230e9ac49b5dfb Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 16 Nov 2022 17:16:41 +0100 Subject: [PATCH 308/646] add month-range-filter --- .../Admin/resources/locales/de_DE/admin.mo | Bin 71034 -> 71108 bytes .../Admin/resources/locales/de_DE/admin.po | 13 +- plugins/Admin/resources/locales/default.pot | 11 +- .../Admin/resources/locales/en_US/admin.mo | Bin 66427 -> 66475 bytes .../Admin/resources/locales/en_US/admin.po | 13 +- .../src/Controller/StatisticsController.php | 52 +++++-- plugins/Admin/templates/Statistics/index.php | 11 +- resources/locales/de_DE/default.po | 140 +++++++++--------- resources/locales/default.pot | 140 +++++++++--------- resources/locales/en_US/default.po | 140 +++++++++--------- src/Model/Table/OrderDetailsTable.php | 22 +++ 11 files changed, 303 insertions(+), 239 deletions(-) diff --git a/plugins/Admin/resources/locales/de_DE/admin.mo b/plugins/Admin/resources/locales/de_DE/admin.mo index be2f26907a68a45bb396d697c59d375aaa7b05af..2cf4d5fc3b824caef759b0aef62bfc6224276c95 100644 GIT binary patch delta 17275 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 delta 17196 zcmYk@2Xq$2-pBDxNCDCdgcL}CkOW8w1dvW3(o^Ui1nD5sqzS@9?^2~GMJY<}Dn(FG zItYkJRf=AvNE4)kyx(7D@*eh_@iT2_X8$w0dGwyUZ>`6(H6E@@!5(uRu7bH7Ckj2n z9Vgzyac-4St>a8ebDSbL8GUda=Edz;9e=<8bbr%vyf7Hm9*!C!7UQr5M&k(d!^K9I zvzCl66+2K99I&3kV9J*;KmLOen7fwa1Y%JvjO9=ZXo0!08)}@s7>dI&1ZQF-u0Snt z5BfST$2m$S9~I|N1KhDb#zK^x+UCY+)Pz;A54J}Qd<=u|3hF`bV;H_dEi|l-iA)0e zQ%*)jpgLA$ekX%WCXPp<@BEA@cpEigOkFcz8ft-Uup@TH8n_P?8P9rVK{2R>m%|ur zig|D#vLC3*!kJhA z=c6LB3AGiwu?n6-MZmuS@z+364cJeNM{i8G<))|shM@L%94gcwVG@3U+Pc%It+`gZAAr)!?vhHI0j4L3eDs0g<}KOBxMz~xLPqbHh&3e9FzC=a4P{)(F5Z(DweTDfl{ zGf=oS9<_DlF#t1Br@cLDi`{>dWInB(I`Jx&MpeM%Jaw6uX zTp4xfYNI064nuJ)>dY)aEo2w!3D072yn;!Xx4BtxMbw#U(46=eBh#A-IUDogcGQy{ z$6&mIdZGtd2VY`YtkuGCmf=v;lSj5R3oVJ-nm15eR~_?VTMWbgs0W$clKAWO`iu%a z@eb6X`_7h+qat(~HNX|rM2}Es#;cXNFANo-f|!U2s3&iZ<Pz|nb?5@#GUX^N zPr0JC59(~JK<;xn>&a-3zrzA}3bmlWF%(~*CJO3cwjvz0kYcF&s-d=|5o+L$)}E-h zY5?l&46)_Ws7O!10($>9k`6U#MdXUDbg|$X67n!%n=*F(r{;0z^0yV){>jK-p-nzrOA2rcWsDXdQ z5WI@H@S$ygii(&=C-b0T=u(GRGP*GVHBgf6P!V-QZPcE(LWQzB>P+;vx=^pvhp78k zpgV3vg?bB?!Cz7R{5zYoR;)AeFGWQf6-BW>>d?)_BDf0`%FC!5pQ83Uu#4HU7}P?_ zpe9a5ZD9k{f?J{%+zr*QA8M;dVm!|1Lj1L|ZB%F>H&7uj(A6BqB-FrlPy;o#<+iAP z-B90!;nrEGg|0+x>9?qUN354o3;Wl$=W=y39Rg4{#G(c$jT*QvYQ^o*3;Up+WDu(V zSk!Ueq873R6~XPO1%8hlQkU~189m8WOv2k(2P1o$Ph}_6KufVA zev9mq^Vqhx>t+7jF2oq>uc9L1{*HO_6jTJ8qrMy6P#>z1SWfT%CuI6jaRO^#jo#+3 z*k~+9c@gRfzDFNCWIc^ul&_$+%u&coq5aa9k6|9lXHf%O#qxN^mSYE)_A;miRly3_0M%~{ zPR8x1ElG2|XI5Arbwf+kg1TWKj>90Fi@9(ms^3~HiaSw<^b+cQ_84d;io-a{?NCoV z78ThAs0Y}9y3e(pOemR4sEHn+I(iN=dmV||no_76E1(uw6SaU2s7Q@PMPxc^j~AlO z%vw|gHleoeI_ePn49?y{mlIE>Ar&>SHqOLkJcGK?YY5@P>X?C(vANn&AELye*}q?% z4C_+NPyHiQyWjhclZ8pBE&c#Y;6f~>_x}Kyx2d>=I=xxLOeotSKaQM{*aR=4PHm~- zoEL10?QsKELEjI|?}d7(t(cAF@Jmd?8@4`ig!zzVVO8dLCX$KAeW)kDg^e+4q?w=( z>WPk_Lih)kLj8ECj^$D1f!Gw6V`+ShwJ>3n`R({FY9T8z0&k-04Kkji&BRqvq3MmP zpO5;`9LM(f48yS17=B7)Kh)M8LoFa`thp~8b-2dho45*F;Vo1|YL7GhhK(csm8jTE zh4%h$tcqpEn^5<`Xv%X?18l`q^qpXyFawKG9)a3|<){a^j0u=`qWSlPvZ#f2$0*!} z_3-pWLe!f~!AYiK3f83jGiu^|ysYV19t+`U|8*AfVE;0&H;xzNV_QS%I=iBlQ)S+Qcq4=R~Uxu-ix1t`%b&gC3na3E1KGV&6oq{QpTVO$)j0)XKRLJ+C&cIFdz&bO` z2Pz%&Qf`P^NE_7Q?TCpu1ht?QNJL!D4l<3XIF0dGY^GU2CTc zN4D%Y%Y0Jvp&}H8K3ERbzXodI^)LqeV6@)<8Dxr5u`#=Xy+^J50oK5$s0dV^ZT7Mi zYA+{YOI(g6@Hr|HadS*0N}~2U8I!RU>Tpj&JtOBT*qvLSL+e>R$)Fun}sUmY9wm(GS;Q0PdVm{PUAJLWMtGMGbV% zc6f=}JHG{H!hEO&#-j$PhU%Y*>emK!_&T8$_O7je-`0;tMQ|Dxz@-a_zxHS+6~Xui z>XbjS9YQ`f^@*qurlLaL8ns1(tdmg#F2->D8pH4;YP{>H1$%yC&Q?BD#3Nl~wDM?d zhw-+O1vTJ5=#CFj{hpw<@`K2Mc1zQnSZpP&Z^^O&p4aaVN&Q@o%#jMcHk+In{+wp-x0a z;0;t{hoc@~D(bM#!V0(qi!;A-hKvSwR+vLm1T}DFR0LY0PJKVrfD^3qP^b9|RKIU9 z0#Bn3^YAEU}&+VamBP5BOLV*fA9Yg!2PBuS`= zD`OlsMYi1;hFWmgN^@TlYT|0Bw;~;NXgjYY{$6ATQXz-ij$=?CjG3q}-LDvnC03cg zdJQp=@(i4WyHMYc+N;f<=Vqw;enh=Jk!wr@s-q&^6pP}ZHN-zRnUASxh|5rWcpr5L zUtliuUu!}cj2fUgdSE)Le@jvQ2iR9&R8?_!2vEZ3hhYLp_q;e z)d9?lr!fXEqax(2H#d5to;U;*$|BaXSc-Bj)I{&0ws00|OE#m<#6e6z*CjG~LhlV` zAwH-ljI>t6c*-3x4kuy^Zop(bVau;j_r+{9p-n?QaX0kDeyD{GMn9a0M8M_DC8H-@ zih94-*$#WqpYn0kll+F-%jc*=T4R3wg}4$%WtzpyRlkXAPHPk>YFaUd@7Ca0U@(HMj&O~2ah`MhT zYW%&Z$ecu%LJ{$$xgiD>>XMkpjZPRyx#?Htr&AZygi}!UpP)WeYf%#&vh}~9H|4*u z9p1slnEo~YnHLwMBG`T#@$XA!+%|K%|3!uFIp#x;?Pg&S7(%%ihG8XZV+^I-6N7Oi zD%7)3_pd^2(YLn#chth4Vi4xtLHrAliP~XqERQN@pbk@4RLESY0jHy0!xgAVtVIp@ z4MyTI)Zx62+B)x@=BHgU>U+@(^?-e`G!Y)^BI8MB^*3gqjl0ZuU=M1Ko?r~7?KTnU zj9SnT)Wj1|p`MQo@KfxFH}Mdre`^*RO5C+Yv8Xdr2KCyzs*s5wlZw&U1{Hx});Xvr zUWYoQTWxtSD&&Vy_g_Ta_XxE`0ej4A7LS@Z2^Epb7=@iMS?|A#OdBdTVk6AE*MzDq zs$)k?#1XcB4Z2g_h&uIKFay7}`h0JG^|r!>)E~olG3p0?Q{WU-IdC6~(EC49mg8R`%fJ75-C0d+{5q4u~3Dnk7+9LJ%yZV4(P>oNO( z|KCZb5)}_n?`_gSbJ!|cvoMbOE~to1MNPB{y>S=n)bB$bzKf`do}tc29u9)~N1zr~ z3iY5B(501BwH5WT8s#k1MAJ}Duo|_nU8pBMh%NCvw!$)pP5TrqO?fV=-vP{x=THl} ziUsi=YGM9Ih<|l5(MQYxZ=omUp4PsoLpKPu(6P3DCTd~xP!p|2_4@`j@L|-17f@Sx z1NFoYQIU9tn#cbr`>%mRkD7+UsB(GK>yd`Ku@3rRI%?pSs58+G^&N1b56(a>V4-y# z#!%jkdGQizyc<{%@90K_GX9wPfVhy?!dZw7@F-Tr{6CuilF=0PA)1IKa4~A{51}_+ z#ss{EicsKjv#_G5g(q99+j>_f8LhZADm1-N3mAzta08~|UDOjNpD?dqJ@loVj(W0I zw%i%@J?Muz^;1z_#?Mg;+lzj96B*CtJR##xMbJsJ;uutivZxP9P4vOmsDZm;0FFXE z;Y`#*mZSa_Y{Ed?kBZD0EQPmG<3#;rK4=LTp!YwSj3!FO#@G_IfYq3e+fW1MI%W1U z6t$4@7>$ik6Zb>iKOTeeENa4=sK`D-MKJHr=J!HT^k#mi4jH{BS=N>qLb)U6!GTx> zM`A17iA^x%v>B)yYU0T_5HF$@-sl(eMO}nNDBng!BJhm)6sMvqgo^HD^x+tevG@tr z!0&JpI%my*lhK{xFQ|depX@G-_ehu{731MPvZ#0r#OIa1J%`a|}iA3&dYf z5Ou*=1T{edYR}7}R$L2xcT1O+anY3e1liP!F`!Jo~k6P(K)QzK1ACBp$3FhD%_yrcm->^8oLOp5mU(J?gpd#=NYQZkl zJd07|xVDnfN)DhpoZJ!x+@zJA?0`bKU&zABgoR{)7!M;)a>HD>kM){s!@HO6DvTMX=;ezJ{2E zs-KG*_y(58kiX4`s6O^mJ8DauTP9**s1HqfY=B)+5!-}~@RDs$zHQn&+$R1tX;?#r zCcK5(^BQ-|C$}}0r92lotrdzp~vRm1$&?do{l=KmvKD4#11(2 ziP`%|6PR&tIG7R(J zO7z6ds0Y}F{qa1O#PpXYQbW*-@97Dt}$Y9xA4o``vInk~=Af-Wi+k*S3{F%(~6IEFfI*{8e| zDr6tyNB9zJ<7_v#?8A5tlPQ;Ucgy}Vw#5+2T~HAkirzQ|3*rtkTRlC@!V@ro`Z=fw>_T_kYuopExVf@d zp3J`jYrqaz8W*D`JdWCu`?j3q<(3_x#;7OghT4L`m=71>Fx-NAjg!3HoWWQJQ*bw` z|2hHI#m#`B*+a$yPd$5N<>RYQfg9_s8g!6596TG$}# zc+{DhYh8|t;AYf#+g)VZkvV89Vma~}s4V8k+Nc5AS$knH<)NqrOvNyqi+bYqsQV6} z7V;bB#@pzNk5H#SmyfyM6+lJ};ixB$L)};$ld%$dVo%gt(H9kgsn&U@1usQy!B*6S zhpnej4{#Cn#5XV+pCIG8oC3b)iOQi4NnL9OYM{nA2-~1ScM=uyvlxZfQHRje&-4#R zJz){l+f)km0B@qkua9~gvM`TMK?^dysOX65c+__I2{qAq)DzxB4g3NX`rQ6**`MlQ z)S<11jq!cV#G|OQ6CPmd3t}_MeX$en!!|mF@qupHKc~l_I&4M_=oRFa{nx7kR-)V$ zwV+Q?q27dw$N`MNA5o|KI%+HZgH1UIb;c^7zB3FT&3F zAL@(NDb(!QbkqbJuoRxgCYURqd0kte8|Bs{ot@dNB9IV7P&tKsqE^LK6#J0!=OX@J zli_>gd|=v~BjoFo{-Aux*1b(xm!A3z{j*5FlIJixGs%}EEg43PP*ex{7;ZsX(wooqv`z<-m`a&vTY|Qw<7;F$&-8j!&g|H`WB=Sln;?~ zb*7#lL)q7J@@b^qw4EevCA~#C`_lf0Q_+!%k>ppAKF?_+pPzgs(of`bE}aD;oqhG^ zpA$&cbiciCJmw?p^YJuoxov&+4gBL@%H!<)t_@T)&uPJTNyF_8YiuV!%3%!nJ?h|m zK?)-OGwCn#&FI&j{8G}Jlvh*UK)waW;P-Z%jo6>EzBe6^%awg{^^KoOV=hyf{ec-x zc>whf?9HpJx+^dJs*@I}z}1qZNLCCs_f>zy>G?a=Rw&Of3M4HAxGi_Z3^6!$e=o`dST(|WUolDdoCG{jq!1Ienr_AuiEyHsqaoYPu&)* zO#KQ{AM(0t+kVQQ(Ld}JPk$d$2#cyipRs!W?KJ*E;l918ARXLE%X03*a+C{UC+una z)g=E9=^M(Q+PagJFO&R9x)$S5n_rI~(T|U2_TQVb8115R44G4;A4%@4tPM9NkRO4Y zaU|&}sgND$81*|yx?UR0XP7>BDIcKUC*;4g{ij;hbt3h;^lM9h3tY4L$3ZIF(&<`G z#~f*ULcTXP!Mmgg7Wg*h!FHg2%N{(ju4vLx(p#j-4DbLeUb~OMH%S59 zr~g;wMCx+W_6^o0>1s`R67J>qr*oUmH7R^gDnMS>7gpt)&}S@V{l3#xo>VS7$G}Wb z#PC_kbS(klPv^OPCx<*}; zsdl1m`$@_z=%a2=NI#H@*tUH*h18yOi?oZ>lC+u5Khn=zfB$vGQ>kA%y5`V0LZfjV zCxy`VlBBB)zDX)T8b)~*$zKhxUB_rU_geWK@}8t08S_utekVVS{0#EFwEs7$Sc?s* z+=fpndyxPCi;y3p(3kWr?JLxP_vmw&Y%uu+q?~Jz&3{Sz@z=+p!vWgn*}7ur>PJNb z(i=3Evp2RU|2B=EymoU<+VASS_&Uicuevkd9mX6xnYdGVLf_LzZ1)2BieM;#_g1K{f>)Cg~`8V z>s0@T%^$J%sP290KB8QVeCnKOR8fq`A~RA?>0r=lYgRBkC%WJ|GPz={iWCyzFmv$}3Hk`3)3Dp$3h6(1XS*=8 zq@p<;U$Yza^=-Kld0l=C{ENvt7r4I}`7X5OC)KijY_n5>@(^2ay=xn%Q!#)WuV6!4 zmr1@gb-EI)^Gq@OpOH*@p4@$sJ|?>2=y#u#YRjKc7fO1AavJGR+FFuUtFxZJJC*CG z&^5^5yuklaKNH_UUA|1#)Amz2oqGL((UnG8X8T>i2h{JQE{ptBEKTBerx@kYv{fbF z1^u-DO{ol~pz8qXf23H-;n);C@D1Bum%h3hkmAVuXw=uP|Hu!b?`O7uPSZKcrzm*S zzZ3T@qnx5XdjBp^v5!Ke?cJRG6*Y3@;f65Udz11}_bGLqNNsHUYHUN>cv3^^HAFbWJ(8{;Y=7l5s2h%rsdH^3b4#`M`VME&FqTds\n" "Language: de_DE\n" @@ -696,6 +696,12 @@ msgstr "Umsatz- und Gewinnstatistik" msgid "Turnover_statistics" msgstr "Umsatzstatistik" +msgid "Last_{0}_months" +msgstr "Letzte {0} Monate" + +msgid "Total" +msgstr "Gesamt" + msgid "December" msgstr "Dezember" @@ -2403,9 +2409,6 @@ msgstr "Die Gesamtsumme ganz rechts (Preis inkl.) wird so bald wie möglich auf msgid "Detail_view" msgstr "Detailübersicht" -msgid "Total" -msgstr "Gesamt" - msgid "The_delivered_weight_will_eventually_be_adapted_which_means_the_price_can_change_slightly." msgstr "Das tatsächlich gelieferte Gewicht wird evtl. noch angepasst, d. h. der Preis kann sich noch geringfügig ändern." diff --git a/plugins/Admin/resources/locales/default.pot b/plugins/Admin/resources/locales/default.pot index 837fcc1ab7..fa76a2616e 100644 --- a/plugins/Admin/resources/locales/default.pot +++ b/plugins/Admin/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-10-28 20:44+0200\n" +"POT-Creation-Date: 2022-11-16 17:08+0100\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -695,6 +695,12 @@ msgstr "" msgid "Turnover_statistics" msgstr "" +msgid "Last_{0}_months" +msgstr "" + +msgid "Total" +msgstr "" + msgid "December" msgstr "" @@ -2393,9 +2399,6 @@ msgstr "" msgid "Detail_view" msgstr "" -msgid "Total" -msgstr "" - msgid "The_delivered_weight_will_eventually_be_adapted_which_means_the_price_can_change_slightly." msgstr "" diff --git a/plugins/Admin/resources/locales/en_US/admin.mo b/plugins/Admin/resources/locales/en_US/admin.mo index 2fdb4754334890ef5fa0d8f5d1f8823b8604220a..ff6298273f968af5797e3ae129491c971700839e 100644 GIT binary patch delta 16883 zcmZA82Y65C|NrqLLn4wGNyLaGM14Vgp*rMS({wxx zBZ(_w25g1&#YsWUz$$b##ha;k;vrPek6CY`7x5d^2t8|=y%2)BK^$t&B%rQqi|KJ7 zvW*-UH6t@oOYt36#I2|q_+KsNUpMlq?Kn}G34O4XjVq#Vkc?X6Zm5oYjzw@HYU#G4 zMt%x4pqr@co}>0o`Z{JHxlwUmRL9HLVg9wYO-ba#KB$q*unpH(_oGJeC+dNZY~Hu7 z>2L(4fj*eH5H7-}Tt zur$_3UmS%QaXf12W};@~Ths&BVo}_Q{^;JPq8q+M-5^_ivlJ1SpEv=v3AjTuT_ee6EIS3UOLCtVH24Fj+1FqAXiaIb1H8rzPQ@I8MaWCotr)_)# z)$=E)8>MSt%!FFH+?WZ=pmuvAYEOM_^QoxUdNJnF`@e@uW)jy?BYui{a9Bh0;6kX) zQW-V1Ev+f28~4GsI2iNdMbv}ephjH1k>hm4&ZrqXiJIwim__gZ6)IY*$EXMYhw7nE zV-x2`jkFAEV6l{)rf9Wkx%Rir-|cu z69=Li2BRP5MQyqwsF|vc!Pph``VL2RWC?17JFy@hz#{kv)#1pG%$_Rw5%V8Sq6rB( z7_|o$pc-z%tat!5qKjAqZ(u1b+>}vbThz!so0*OVp_V2bwRHJ01QRe6Tc8HgyBYJZ z*KQmMjd&qy36|M-6KZC*qi%2j^`J|rJ#!y*-CNWQc{it1m>D(l%2*mZVqKhz`qlg! zwd4id7UmmW1a(1u)QN%UfkRQ7W;m9|u~-RrV<&ur^{``0$KjsNMjVELADahGz(K?p zkZt8OX=OUR47t>CS5whQd|I2S%8tc|%b?b{18NV9$55P&nxXZmDc+4*s)ML6=|$A0 zduC&=Hr$Ii(%KZYH^w8^xz02yTH|Gy9k-%7bQ**4I_g2sQA?37*>ofTbzL-SN#am9 zu4&_jHvR-Pqg_yYsHcqwVL_hn45Ok4FGoFiH);f@P#w68weSgQ3gg?F8JU9mBF;y( zJA_)Q%czdt#2oktwKx1fF@F(-q6Sn8y<92{sp!I{s0&+LJEJyNf7AnpSSQ=_-&xmL zcc3105H;f8FbL11e%|ld^AAxo_X=H&G}EW1K^W@7NYss@QRj=JE~t!J`v$0~Oh)aE z&eqRRuhkgT^>fh!mtjHt9!ubFsCMbwG5=vyaPSJ8B_L46>t-Qcxg}gq?ilBP&X)mx^Wd$ zk3Yinn1UKfchm!hpl&!8_4-anb$CB|<4M#^p2a-)0wd84>u3^{QHf;haEu^ch`Dh$ zYN;;U{3~l1U!idFl~7auF>0ipP)jrvb=?G1N4`hR;98`EuCtYjcIiIUNX}ysyn!_^ zsI&QGwnW`%7RKQwWR;wM?fE8M%+GErMv^~|nu!;vk;is5GguGxA!~!V^!^W^Qkuk6 z?1jH#RgCLqe$579H1Rj65p2bbxXXG3(-WUVEy-onjNL;Y%-G#5MG$JB;ix4oiQ#(x zYf@>89nlvLpe{U#0eBwufLo|FzK{CUzQ#hBqlfwTLLzEp15xcJqZiIce_VpP&pOoo ze?m8a$}TF}T*qvK%cv>4Y4aI+nwiLnx?vgA_n-pu4R`8UlWo2?>b|2xSLKaXYbrj5h; znDYfu9V&(8uo|k}VEhu-x>U3#75bVUet^0l3Du!Cm>ECEEI0u@aXzZuVvNG|s7-nX z^?tuXJt(}N`I0t4jd%!ZW+$Tt;4Y=23)f;Woc%!)z%&C=vYU04j&!SbjM zG(*kQ5Y&u(fm-8K)Sg+4nt|o0rTYun#IEBxz^q{eCUGJT6LB0C!(*rm-(YPl`5@6@1D30;iA z?WmDo$A%a@%se0kHKM(!DZGe9@eRgf5pJfq8#cx{SRDVw>KHlP{0-Rw)sgw==A?3! zN?Cl3dT{9x<}aJ}sQe_64My_4$4;oF+l%Tz@F;U#0%~RlV*)O~=6D@7 zBb7%p|9U{5(WYlBP-}k;H6sPbn5j;|2;#3%H&}^P(CZ5`!s-}J+#j_Bb1)XqVgd9R zYyQ1Z2-VSK48t{JnVOnZj*#evA>&Lu5!#KGCx)W zQ0;f1X7W#Lg#llixC?5=XJY}}=u%0fatSp>`No^~wG-wco@C>7s7-kez40b$3I4&f znV4W6TpjhjXpd^wA2Z+(48}3`{A|oe?5?Du5uLyw{1@}1=S1^f$6`t1`j{I>pr&p< zYRb2x_P|y2!uUz%1C@Y=zM(g?MAn`2?@iFC+y=2Fp=tiuL)1Yx6e?P?u^5HRYxC3)x#%ZP_F<6w?#Yp@C`{HrTfeF)1zBRgKNerW+soIF1 zcoakMB>Lhl)FygheSv|*UNg*ZMG$I=qtPErpxVb{daQ}MPZHL_<`{rWW-$MmsH`WE z4fmjKd>(b9+oyQ$)xikV`7)^XiKupsP@AtMs$(5&zPHT}Le1dlnaqE7 zDzivr#r3G&y$_YYYV$8qQx`bPOmzX&(p0xL#~j4nFciN)-De)EgWFJh=`d=BPog^d zyGx}Nl|OBR3bRc|s$yR9jZrrkfSSrLP*XVpGvjpB4VR$@u0*x_0ks4hQLpDtR0nd+ zF%Qmzy02T1ibh`Eo~VnOx+WNj$*5gD9Bbi9Ou(n82bP~}zL=G;I`J5+kB3n0b9`&A zZ-<45Ct^w5ihKuL=N^?v5;^CYwXKMn`g*7yr=X^~8*29tM~!%ajhA3W;=LG;&V2K_ zRzY=OIBEcgumL{B)>vbKzJM;fkV{vc5qrmERKc zw&cc~#HCStAqmydwy3ooiP|euQTLgH`YtR(?fx_9YQ%S`sE0n^nFnXZwATxDgEH25 z)NA@7>bf?l2M)$jI2YBy$faf}OJUk;iFzv{60E;lpNAGLQTVPEqI%xa+Q;UWmf&bXN$7<8z9Oz9x4{8ZxFaSS5e@rsE zPAe+9L1*+u7xf!34mD*nP_O4&)JTun{9mZ4eU5qyoF7aFbD?IUB)e zBO@?S@BcScN|IQN>e(684X>eY@CLOMK5NW-TL`rY8(}Q=!w8&@>d;P9NB3LLp?3Wp z)J(jzamZR`Snq#+Dgjsr)qxhMB}hTd%t%bzEEq_<8uftfHa>>B?oZTx?pXgrEnWI` zX6?hV7I9J3o*Ia5CMv_JgyUq?RIkCzcog&FCDenx*P90iqxMRE)YK+elTbJQ81;#5 zhkD(1qu#RXs67?Cfn~v@4fg%tOhQxrGiJeGQEPP`_25gW4&Jk||Bq&*xlki7h?=3Y zsO#&XmasKyfCDiDjzhJdia|L4N9JFN4J0&myHF!KX1!qZH&JW*#Kte}`3xJ)rVByM zRAFmlOh-Hz^%i`N8sJE*jbEdd;*3j0J&xRD{wghrrHPxPrg#FXgWsdtZN{v45dH8E ztbw<%3KreWM#dhfk!StMw9AWHnj)zCmcbBo8&T0F>4e#EIA+HgsGhGyEx{%m??cVd zVbl%Iq8@Y)wP#+Vt_$2^+67|?;z*3fMpyv{VqKo^Y@m|%yS>${c@@k~gX&laTig7X z=s`RYwG>mZ0?x!lJdIs3$2Rk?<}uiV_$-dZ8r#ip%0c{wICO{p`Of;UqM{!A{LEiF z7=Ri{chpo3!!kGr3*$-DUU`F>IsctzhVr4NxD;xsDxzNFdZ;DrjGDOtSQ1A{m&!&e z+8no07e2Il?lLnGg6dFF)cGo?2Q@_9um!3k9Z-8?C~8S2qwc%F#w$>7!4}lp^$WU6 z9I%N~sF9w<92l_MJU9k5f;bGuMAYtWiOp~cYDQk6zKDK%OuI6urK*kUXhYO}TcbAb zXM33cvQ$Qr(1^C6dbS&N;eOPGN3G{kOLYU)k-Jvs7t=1pn#WoM^`P>o`&LK2_qEUy zTmRyk2A`17)OACR)U^%9qb{6`y3sUyegUcjt5I*q9@I>pM9suS>)#ko{0wz{w!LN( z=fQ%+`CKa1sMJTjep67JZaJ31eHeq!F&gviGdKJYHI*rt_S&Ks@eI^nnTzVkYE;Lz zp$4`O)!|b%?_QyzhIdgHK1V&!Z@<~4C9ybh2h@nCqX(`;jpzr|1Gd=s7gW1rsPDry z>vPm5&Gf5Tsu-l5>y$DTrzWart!;yDHb2nD6Hp_ah3fEHREK}Y^myFn&!G0qb=3VH zU@?4)>Tt0GW)D@swEy=%RjKI4^{@)IN8MlvR>HNY2i`+X`AgJ;Lk^nj@}s7@GYVBWP zG`>Y|j6P;MTF6=swIm4`fVHszHb);Eff?}2W30bMno2@nwq>Y4K(=5Ko<(1bIc_d2 zj=EtS>H#${5bL2j)(VSZGSL+ zb-od5%35G%{2X)Q1k??eqrM-jQP=IVp0fGtsQW%cb=3Q$nK56NiZ(|uX2OD)56h!E z)W({EdQcC{f_o#) zYANQRrfv&n!E@+`cThKcYU9AuW=(UTu8%_fmK3*fiap;KHNc@*PVfIBDr$HEXJh8y z%#^Q0^>96Ejd!6sbR09|J)3`np2Pvan|4_+mN*g%V;$7y8;C`5A?C*u7|ipXXH-H+ z_@6N&$cqJu3u7=gMUA{Gs@+h`im9m0xfHdV*I?S_#VF#lsF`|+nvwKp%@PNpmNE*< z>HRN2MQhg<_4SF})VjKTr&3?gr zu)3qpk4CpXl_gZP#*a}`m-V8tGJZ_l3AGe^F%O=?miPo4VbULFO&6i!U$Hgj{L}nT zGXqi2`4M%!=Oy#M6-8fS{;QGbLP952V|hGo8)Ud_rm{X3Bi{!b;38~;k1-oI`pe8< zXVe;x$9UX^y6y!w!PqP2t#PqB@wzLn`6KdwB-D`-SIukF4>iS;usHsTG58-g!^msq zkJEveOuPg`(d)XIu`txq4McV50G7pPs4r*H8)iwHxKuQivr!Lxikg8UH;o-Jk$53i z!dsXR^W8FQSPPpIcg8BX2i0MZ+vY)~up)5_)Y4AF0=NrHq5C%#O-=5<&5ubRtVuix zyWu(f02A*R$6^HWL9By+V>p(%%V@C)rr=Smfu;X3?T4V2Vh*;#!$?P6r@%ck z>xc93ThxqHx^Ldsewc@Nj*WMqFY$Hs#(SvO?lIQJ(0|RI_!NVP$DrEH!VEYcL-qcz zppu!yZq(GCLXGGd>cVUfOb2374`_%bu|MX<p2R)S5Bs1x zG8993zB7tSah#(B9zpHu>)04yqSiR+k!iOawVBRiY0UiC?CM1HA^r??y=&v?n4WkZ z=D_bTBkn|37aXRd8=b~T^nGI1tRQN{wQSrS)$<9cO_hpS@i=N}u3}E~dTRaZVW&Vp%xlKavYxe({*Qy!nMx(F-&O<%mJO<%QYo=$Wqfr=4J^{O8 zbIgT%u^Ik_MKSI_Gr*46k9gdF%)h4OwLKB~+)Qm8dXVpl>Tw_R#{sBKHwv|h##^Uj zAn^jsf@@Gyyc>1hQB?a2sHM1$y3bvgN=+(HFaRsRFh3G?FdOm5s2le|-Dre8KM}Qb z^H2|5iXr%uJ%0?<{t~L)UDW1#jOy4Mn|J+QniE-3J+ooLU`KrPKu)LXI*GvPU8FS*WbDw^W^s0Tj6PWZw!aN4~xBk7De$qzu? zU5^C0`9@wcnfo(x2L%v4}L&g7sGHOro&Lma4Ow3-yDUhXQv*GjKvv1{W=C?S8`uc z+ECBu!TfI}=u9vOgBeB-d`*0T@;4W?CZ0w81Z6p;4e@l!4(dBNpOI^};W)}Ra_=A2 ziFdu1SVVn2*SrRl?i{n3+K=0!%>_a(8(Xku*<9IIGM_ETallTMbYpM6ec;c&+ zTEr2=?~dlgI$Bf8lV3&A#@6u}r3UeA+GL_Ie*StP(SV==^`@8|dy~^9=}deSbp%n@ zv6eEFdR9j9warzgy^a{l@8p_dQ*s|F$x+3&TT0G{>-2-ynEmG*q7p^vU>o$r3ASDq z?{dLD&cA=$wC6pzQ3`c^U`E&mi)bH4ZU#=mPsuO9*~H&qqS{e!Pe~j9zi@!ycghtS zjKTEy{&AZ4A&Cu`pVE*vVUoX<(TpAtYlH1(6RLGFjt z-aj65cJF(+d7P|7`I5X2FYeU9*28I6|Gl>DIX}^!Q`=>f%AB8X+f?A(Klc1{W7_-S z9HwD+8f7C{mwH!9ulH`8jfd(;FgOSB8f}MD22uZqQiJw>`n2l8 zxk8k##5-{!MZcTgc9K3LzGd(HIrSEl_m4STSB`{!56lXLhz`F=KjcfsZNuD{Q@8=OdIJNvGUY(RO%`2rqE>`*G5 zxG>IMoPoF!^-idRzh0a-#FuS+3;&=jA@4=L5cO32miX7yDdmIQCqz0@>=i|^CUGEL ziRaun%4p)B$v44!*d295Qr}BCNd0RZhL>ocol=gtKV>MT75Oui*3@;J;(STUR(%Q6 z^Pt-#r*JX@$&UClW})cFP23Ql5qnYJla@9ASxB5jz8_^b^&B`CFL8PSB?IMSaysgw zKiQQ@j7zpC^|}z`;l_m#@Xq>yJIG~ z0OGP(i)0TxOZkL)Mm$ByWZR#iuA`KGjej60MafSoL$VCM;30+5nwbBDaN%8Y#|eFL z9;N4d=eu#uUK{V{+`Hoxl`X_S+C*<`M7+kv?OZNALc*5^yr8ZlvsLw8)B`zxf$|%1 z8%j<)iXW)+UO0bo&YyPS)QjU9dwp#@Ou0ijLec++V;!3)&nUlA%Fp8BI4a*z7E|Ae z?~e6UMvyy0Y0C|CjHSMU@>%NhN>T3THrt#tv1D}&#Gi1NJ-3?r7v#RuNqh9QmLmTP z^>$bdcj1rrI)B?;HT{l!1jU=8o50__9oS-XQk-4M)9-x zO|+j(JqDMP-$?n6(#k%dJoR_S;M8>SrQFiA?#QbwA2f;@XrTa?6NI;B(>%)Ynu08*ieHP=@#J$VpzuBekJK+4wK& z1<2>ZXOu0fQ~dNn%}b&s!B+eqkBb9Y0ZTY3uumKP5guoCA|69Io?%|2`q8 zMrq5*Mx#@5Ci+$J-&fTOGCpQ^4+I&UoqsZx~zu}{555h7g z4=Fx0xqHtZ{W|sCP&GNZT0n^+CCWyYC|99)`9j4@Y*@AMYPcUwB5jj#yB=5jKgoD^ AZU6uP delta 16845 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\n" "Language: en_US\n" @@ -696,6 +696,12 @@ msgstr "Turnover and profit statistics" msgid "Turnover_statistics" msgstr "Turnover statistics" +msgid "Last_{0}_months" +msgstr "Last {0} months" + +msgid "Total" +msgstr "Total" + msgid "December" msgstr "December" @@ -2400,9 +2406,6 @@ msgstr "The total sum to the right (price incl.) will be transferred to your ban msgid "Detail_view" msgstr "Detail view" -msgid "Total" -msgstr "Total" - msgid "The_delivered_weight_will_eventually_be_adapted_which_means_the_price_can_change_slightly." msgstr "The delivered weight will eventually be adapted, so the price can change slightly." diff --git a/plugins/Admin/src/Controller/StatisticsController.php b/plugins/Admin/src/Controller/StatisticsController.php index 57e4550440..ab6bbf5004 100644 --- a/plugins/Admin/src/Controller/StatisticsController.php +++ b/plugins/Admin/src/Controller/StatisticsController.php @@ -2,6 +2,8 @@ declare(strict_types=1); namespace Admin\Controller; + +use App\Lib\Error\Exception\InvalidParameterException; use Cake\Core\Configure; /** @@ -65,11 +67,23 @@ public function index() { $manufacturerId = $this->getManufacturerId(); - $year = ''; - if (!empty($this->getRequest()->getQuery('year'))) { - $year = h($this->getRequest()->getQuery('year')); + $range = 'last-months-12'; + if (in_array('range', array_keys($this->getRequest()->getQueryParams()))) { + $range = h($this->getRequest()->getQuery('range')); + } + $this->set('range', $range); + + $year = null; + $lastMonths = null; + if (preg_match('`year-`', $range)) { + $year = preg_replace('`year-`', '', $range); + } + if (preg_match('`last-months-`', $range)) { + $lastMonths = preg_replace('`last-months-`', '', $range); + if (!in_array($lastMonths, [12,24])) { + throw new InvalidParameterException($lastMonths . ' not valid as last-months parameter'); + } } - $this->set('year', $year); $this->Manufacturer = $this->getTableLocator()->get('Manufacturers'); $manufacturersForDropdown = []; @@ -108,11 +122,18 @@ public function index() $firstOrderYear = $this->OrderDetail->getFirstOrderYear(); $lastOrderYear = $this->OrderDetail->getLastOrderYear(); - $years = null; + $rangesForDropdown = [ + 'last-months-12' => __d('admin', 'Last_{0}_months', [12]), + 'last-months-24' => __d('admin', 'Last_{0}_months', [24]), + '' => __d('admin', 'Total'), + ]; if ($lastOrderYear !== false && $firstOrderYear !== false) { - $years = Configure::read('app.timeHelper')->getAllYearsUntilThisYear($lastOrderYear, $firstOrderYear); + $allYears = Configure::read('app.timeHelper')->getAllYearsUntilThisYear($lastOrderYear, $firstOrderYear); + foreach($allYears as $y) { + $rangesForDropdown['year-' . $y] = $y; + } } - $this->set('years', $years); + $this->set('ranges', $rangesForDropdown); $excludeMemberFeeCondition = []; if (Configure::read('appDb.FCS_MEMBER_FEE_PRODUCTS') != '') { @@ -121,7 +142,14 @@ public function index() ]; } - $monthlySumProducts = $this->OrderDetail->getMonthlySumProductByManufacturer($manufacturerId, $year); + if ($lastMonths !== null) { + $monthlySumProducts = $this->OrderDetail->getMonthlySumProductByManufacturer($manufacturerId, ''); + $firstDayOfLastOrderMonth = $this->OrderDetail->getFirstDayOfLastOrderMonth(); + $monthlySumProducts = $this->OrderDetail->addLastMonthsCondition($monthlySumProducts, $firstDayOfLastOrderMonth, $lastMonths); + } else { + $monthlySumProducts = $this->OrderDetail->getMonthlySumProductByManufacturer($manufacturerId, $year); + } + if (!empty($excludeMemberFeeCondition)) { $monthlySumProducts->where($excludeMemberFeeCondition); } @@ -260,7 +288,13 @@ public function index() $data = []; foreach($manufacturers as $manufacturer) { - $monthlySumProductsQuery = $this->OrderDetail->getMonthlySumProductByManufacturer($manufacturer->id_manufacturer, $year); + if ($lastMonths !== null) { + $monthlySumProductsQuery = $this->OrderDetail->getMonthlySumProductByManufacturer($manufacturer->id_manufacturer, $year); + $monthlySumProductsQuery = $this->OrderDetail->addLastMonthsCondition($monthlySumProductsQuery, $firstDayOfLastOrderMonth, $lastMonths); + } else { + $monthlySumProductsQuery = $this->OrderDetail->getMonthlySumProductByManufacturer($manufacturer->id_manufacturer, $year); + } + if (!empty($excludeMemberFeeCondition)) { $monthlySumProductsQuery->where($excludeMemberFeeCondition); } diff --git a/plugins/Admin/templates/Statistics/index.php b/plugins/Admin/templates/Statistics/index.php index a5f875012c..40b4fc54ed 100644 --- a/plugins/Admin/templates/Statistics/index.php +++ b/plugins/Admin/templates/Statistics/index.php @@ -35,12 +35,11 @@ ]); } - echo $this->Form->control('year', [ + echo $this->Form->control('range', [ 'type' => 'select', 'label' => '', - 'empty' => __d('admin', 'Show_all_years'), - 'options' => $years, - 'default' => $year != '' ? $year : '' + 'options' => $ranges, + 'default' => $range != '' ? $range : '' ]); ?> @@ -74,7 +73,7 @@ "'" . __d('admin', 'Surcharge') . " %'". ");" ]); -if ($year == '' && count($xAxisDataLineChart) > 1) { +if ($range == '' && count($xAxisDataLineChart) > 1) { $this->element('addScript', [ 'script' => Configure::read('app.jsNamespace') . ".AppChart.initLineChart(".json_encode($xAxisDataLineChart).", ".json_encode($yAxisDataLineChart).");" @@ -136,7 +135,7 @@ ?>

- 1) { ?> + 1) { ?> diff --git a/resources/locales/de_DE/default.po b/resources/locales/de_DE/default.po index 9ffc8eef89..ec044fff0f 100644 --- a/resources/locales/de_DE/default.po +++ b/resources/locales/de_DE/default.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-10-29 09:12+0200\n" +"POT-Creation-Date: 2022-11-16 17:08+0100\n" "PO-Revision-Date: 2022-10-29 09:12+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -111,6 +111,75 @@ msgstr "abgeschlossen" msgid "route_self_service" msgstr "selbstbedienung" +msgid "Runtime" +msgstr "Laufzeit" + +msgid "Database_backup_successful" +msgstr "Datenbank-Backup erfolgreich" + +msgid "Please_add_credit" +msgstr "Bitte lade dein Guthaben auf" + +msgid "Sum" +msgstr "Summe" + +msgid "Sent_emails" +msgstr "Versendete E-Mails" + +msgid "Order_reminder" +msgstr "Bestell-Erinnerung" + +msgid "today" +msgstr "heute" + +msgid "tomorrow" +msgstr "morgen" + +msgid "Pickup_reminder_for" +msgstr "Abhol-Erinnerung für" + +msgid "{0,plural,=1{1_delivery_note_was} other{#_delivery_notes_were}}_generated_successfully." +msgstr "{0,plural,=1{1 Lieferschein wurde} other{# Lieferscheine wurden}} erfolgreich erstellt." + +msgid "Delivery_note_for_{0}" +msgstr "Lieferschein für {0}" + +msgid "{0,plural,=1{1_invoice_was} other{#_invoices_were}}_generated_successfully." +msgstr "{0,plural,=1{1 Rechnung wurde} other{# Rechnungen wurden}} erfolgreich erstellt." + +msgid "to_(time_context)" +msgstr "bis" + +msgid "Generated_invoices" +msgstr "Generierte Rechnungen" + +msgid "Invoices_for_{0}_have_been_sent" +msgstr "Rechnungen für {0} wurden verschickt" + +msgid "{0,plural,=1{1_product} other{#_products}}" +msgstr "{0,plural,=1{1 Produkt} other{# Produkte}}" + +msgid "Manufacturer" +msgstr "Hersteller" + +msgid "Invoice_number_abbreviation" +msgstr "Re. Nr." + +msgid "Sent" +msgstr "Versendet" + +msgid "Products" +msgstr "Produkte" + +msgid "Total_sum" +msgstr "Gesamtsumme" + +msgid "Sent_order_lists" +msgstr "Verschickte Bestelllisten" + +msgid "Delivery_day" +msgstr "Liefertag" + msgid "You_have_been_signed_out." msgstr "Du hast dich erfolgreich abgemeldet." @@ -1056,9 +1125,6 @@ msgstr "Bestellbar bis zu einer Anzahl von" msgid "zero_or_smaller_zero" msgstr "0 oder kleiner als 0" -msgid "Manufacturer" -msgstr "Hersteller" - msgid "For_manufacturers_and_contact_persons._Can_be_changed_in_manufacturer_settings." msgstr "An Hersteller bzw. Ansprechperson, kann in den Hersteller-Einstellungen geändert werden." @@ -1080,9 +1146,6 @@ msgstr "Lieferrhythmus ändern" msgid "First_delivery_day" msgstr "Erster Liefertag" -msgid "Delivery_day" -msgstr "Liefertag" - msgid "First_delivery_day_info_(one_product)." msgstr "Produkt ist ab sofort bestellbar." @@ -1278,9 +1341,6 @@ msgstr "Preis exkl." msgid "Price_incl." msgstr "Preis inkl." -msgid "Total_sum" -msgstr "Gesamtsumme" - msgid "Price_net" msgstr "Nettopreis" @@ -1881,9 +1941,6 @@ msgstr "Bitte gib dein Feedback ein." msgid "Please_enter_a_correct_number." msgstr "Bitte gib eine korrekte Zahl ein." -msgid "{0,plural,=1{1_product} other{#_products}}" -msgstr "{0,plural,=1{1 Produkt} other{# Produkte}}" - msgid "The_amount_(money)_needs_to_be_greater_than_0." msgstr "Der Betrag muss größer als 0 sein." @@ -2007,63 +2064,6 @@ msgstr "Mitglied" msgid "Order_lists_for_the_day" msgstr "Bestellungen für den" -msgid "Runtime" -msgstr "Laufzeit" - -msgid "Database_backup_successful" -msgstr "Datenbank-Backup erfolgreich" - -msgid "Please_add_credit" -msgstr "Bitte lade dein Guthaben auf" - -msgid "Sum" -msgstr "Summe" - -msgid "Sent_emails" -msgstr "Versendete E-Mails" - -msgid "Order_reminder" -msgstr "Bestell-Erinnerung" - -msgid "today" -msgstr "heute" - -msgid "tomorrow" -msgstr "morgen" - -msgid "Pickup_reminder_for" -msgstr "Abhol-Erinnerung für" - -msgid "{0,plural,=1{1_delivery_note_was} other{#_delivery_notes_were}}_generated_successfully." -msgstr "{0,plural,=1{1 Lieferschein wurde} other{# Lieferscheine wurden}} erfolgreich erstellt." - -msgid "Delivery_note_for_{0}" -msgstr "Lieferschein für {0}" - -msgid "{0,plural,=1{1_invoice_was} other{#_invoices_were}}_generated_successfully." -msgstr "{0,plural,=1{1 Rechnung wurde} other{# Rechnungen wurden}} erfolgreich erstellt." - -msgid "to_(time_context)" -msgstr "bis" - -msgid "Generated_invoices" -msgstr "Generierte Rechnungen" - -msgid "Invoices_for_{0}_have_been_sent" -msgstr "Rechnungen für {0} wurden verschickt" - -msgid "Invoice_number_abbreviation" -msgstr "Re. Nr." - -msgid "Sent" -msgstr "Versendet" - -msgid "Products" -msgstr "Produkte" - -msgid "Sent_order_lists" -msgstr "Verschickte Bestelllisten" - msgid "Customer_adds_payment_manually" msgstr "Mitglieder tragen die Guthaben-Aufladungen selbst ein" diff --git a/resources/locales/default.pot b/resources/locales/default.pot index 7023410ddb..9a6a1aae2d 100644 --- a/resources/locales/default.pot +++ b/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-10-29 09:12+0200\n" +"POT-Creation-Date: 2022-11-16 17:08+0100\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -110,6 +110,75 @@ msgstr "" msgid "route_self_service" msgstr "" +msgid "Runtime" +msgstr "" + +msgid "Database_backup_successful" +msgstr "" + +msgid "Please_add_credit" +msgstr "" + +msgid "Sum" +msgstr "" + +msgid "Sent_emails" +msgstr "" + +msgid "Order_reminder" +msgstr "" + +msgid "today" +msgstr "" + +msgid "tomorrow" +msgstr "" + +msgid "Pickup_reminder_for" +msgstr "" + +msgid "{0,plural,=1{1_delivery_note_was} other{#_delivery_notes_were}}_generated_successfully." +msgstr "" + +msgid "Delivery_note_for_{0}" +msgstr "" + +msgid "{0,plural,=1{1_invoice_was} other{#_invoices_were}}_generated_successfully." +msgstr "" + +msgid "to_(time_context)" +msgstr "" + +msgid "Generated_invoices" +msgstr "" + +msgid "Invoices_for_{0}_have_been_sent" +msgstr "" + +msgid "{0,plural,=1{1_product} other{#_products}}" +msgstr "" + +msgid "Manufacturer" +msgstr "" + +msgid "Invoice_number_abbreviation" +msgstr "" + +msgid "Sent" +msgstr "" + +msgid "Products" +msgstr "" + +msgid "Total_sum" +msgstr "" + +msgid "Sent_order_lists" +msgstr "" + +msgid "Delivery_day" +msgstr "" + msgid "You_have_been_signed_out." msgstr "" @@ -1055,9 +1124,6 @@ msgstr "" msgid "zero_or_smaller_zero" msgstr "" -msgid "Manufacturer" -msgstr "" - msgid "For_manufacturers_and_contact_persons._Can_be_changed_in_manufacturer_settings." msgstr "" @@ -1079,9 +1145,6 @@ msgstr "" msgid "First_delivery_day" msgstr "" -msgid "Delivery_day" -msgstr "" - msgid "First_delivery_day_info_(one_product)." msgstr "" @@ -1277,9 +1340,6 @@ msgstr "" msgid "Price_incl." msgstr "" -msgid "Total_sum" -msgstr "" - msgid "Price_net" msgstr "" @@ -1880,9 +1940,6 @@ msgstr "" msgid "Please_enter_a_correct_number." msgstr "" -msgid "{0,plural,=1{1_product} other{#_products}}" -msgstr "" - msgid "The_amount_(money)_needs_to_be_greater_than_0." msgstr "" @@ -2006,63 +2063,6 @@ msgstr "" msgid "Order_lists_for_the_day" msgstr "" -msgid "Runtime" -msgstr "" - -msgid "Database_backup_successful" -msgstr "" - -msgid "Please_add_credit" -msgstr "" - -msgid "Sum" -msgstr "" - -msgid "Sent_emails" -msgstr "" - -msgid "Order_reminder" -msgstr "" - -msgid "today" -msgstr "" - -msgid "tomorrow" -msgstr "" - -msgid "Pickup_reminder_for" -msgstr "" - -msgid "{0,plural,=1{1_delivery_note_was} other{#_delivery_notes_were}}_generated_successfully." -msgstr "" - -msgid "Delivery_note_for_{0}" -msgstr "" - -msgid "{0,plural,=1{1_invoice_was} other{#_invoices_were}}_generated_successfully." -msgstr "" - -msgid "to_(time_context)" -msgstr "" - -msgid "Generated_invoices" -msgstr "" - -msgid "Invoices_for_{0}_have_been_sent" -msgstr "" - -msgid "Invoice_number_abbreviation" -msgstr "" - -msgid "Sent" -msgstr "" - -msgid "Products" -msgstr "" - -msgid "Sent_order_lists" -msgstr "" - msgid "Customer_adds_payment_manually" msgstr "" diff --git a/resources/locales/en_US/default.po b/resources/locales/en_US/default.po index 2539874ab3..d06565e8aa 100644 --- a/resources/locales/en_US/default.po +++ b/resources/locales/en_US/default.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-10-29 09:12+0200\n" +"POT-Creation-Date: 2022-11-16 17:08+0100\n" "PO-Revision-Date: 2022-10-29 09:12+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -111,6 +111,75 @@ msgstr "finished" msgid "route_self_service" msgstr "self-service" +msgid "Runtime" +msgstr "Runtime" + +msgid "Database_backup_successful" +msgstr "Database backup successful" + +msgid "Please_add_credit" +msgstr "Please add credit" + +msgid "Sum" +msgstr "Sum" + +msgid "Sent_emails" +msgstr "Sent emails" + +msgid "Order_reminder" +msgstr "Order reminder" + +msgid "today" +msgstr "today" + +msgid "tomorrow" +msgstr "tomorrow" + +msgid "Pickup_reminder_for" +msgstr "Pickup reminder for" + +msgid "{0,plural,=1{1_delivery_note_was} other{#_delivery_notes_were}}_generated_successfully." +msgstr "{0,plural,=1{1 delivery note was} other{# delivery notes were}} generated successfully." + +msgid "Delivery_note_for_{0}" +msgstr "Delivery note for {0}" + +msgid "{0,plural,=1{1_invoice_was} other{#_invoices_were}}_generated_successfully." +msgstr "{0,plural,=1{1 invoice was} other{# invoices were}} generated successfully." + +msgid "to_(time_context)" +msgstr "to" + +msgid "Generated_invoices" +msgstr "Generated invoices" + +msgid "Invoices_for_{0}_have_been_sent" +msgstr "Invoices for {0} have been sent" + +msgid "{0,plural,=1{1_product} other{#_products}}" +msgstr "{0,plural,=1{1 product} other{# products}}" + +msgid "Manufacturer" +msgstr "Manufacturer" + +msgid "Invoice_number_abbreviation" +msgstr "Invoice nº" + +msgid "Sent" +msgstr "Sent" + +msgid "Products" +msgstr "Products" + +msgid "Total_sum" +msgstr "Total sum" + +msgid "Sent_order_lists" +msgstr "Sent order lists" + +msgid "Delivery_day" +msgstr "Delivery day" + msgid "You_have_been_signed_out." msgstr "You have been signed out." @@ -1056,9 +1125,6 @@ msgstr "Order possible until amount of" msgid "zero_or_smaller_zero" msgstr "0 or smaller than 0" -msgid "Manufacturer" -msgstr "Manufacturer" - msgid "For_manufacturers_and_contact_persons._Can_be_changed_in_manufacturer_settings." msgstr "For manufacturers and contact persons. Can be changed in the manufacturer settings." @@ -1080,9 +1146,6 @@ msgstr "Change delivery rhythm" msgid "First_delivery_day" msgstr "First delivery day" -msgid "Delivery_day" -msgstr "Delivery day" - msgid "First_delivery_day_info_(one_product)." msgstr "The product can be ordered from now on." @@ -1278,9 +1341,6 @@ msgstr "Price excl." msgid "Price_incl." msgstr "Price incl." -msgid "Total_sum" -msgstr "Total sum" - msgid "Price_net" msgstr "Price net" @@ -1881,9 +1941,6 @@ msgstr "Please enter your feedback." msgid "Please_enter_a_correct_number." msgstr "Please enter a correct number." -msgid "{0,plural,=1{1_product} other{#_products}}" -msgstr "{0,plural,=1{1 product} other{# products}}" - msgid "The_amount_(money)_needs_to_be_greater_than_0." msgstr "The amount needs to be greater than 0." @@ -2007,63 +2064,6 @@ msgstr "Member" msgid "Order_lists_for_the_day" msgstr "Order lists for" -msgid "Runtime" -msgstr "Runtime" - -msgid "Database_backup_successful" -msgstr "Database backup successful" - -msgid "Please_add_credit" -msgstr "Please add credit" - -msgid "Sum" -msgstr "Sum" - -msgid "Sent_emails" -msgstr "Sent emails" - -msgid "Order_reminder" -msgstr "Order reminder" - -msgid "today" -msgstr "today" - -msgid "tomorrow" -msgstr "tomorrow" - -msgid "Pickup_reminder_for" -msgstr "Pickup reminder for" - -msgid "{0,plural,=1{1_delivery_note_was} other{#_delivery_notes_were}}_generated_successfully." -msgstr "{0,plural,=1{1 delivery note was} other{# delivery notes were}} generated successfully." - -msgid "Delivery_note_for_{0}" -msgstr "Delivery note for {0}" - -msgid "{0,plural,=1{1_invoice_was} other{#_invoices_were}}_generated_successfully." -msgstr "{0,plural,=1{1 invoice was} other{# invoices were}} generated successfully." - -msgid "to_(time_context)" -msgstr "to" - -msgid "Generated_invoices" -msgstr "Generated invoices" - -msgid "Invoices_for_{0}_have_been_sent" -msgstr "Invoices for {0} have been sent" - -msgid "Invoice_number_abbreviation" -msgstr "Invoice nº" - -msgid "Sent" -msgstr "Sent" - -msgid "Products" -msgstr "Products" - -msgid "Sent_order_lists" -msgstr "Sent order lists" - msgid "Customer_adds_payment_manually" msgstr "Members add their payments manually" diff --git a/src/Model/Table/OrderDetailsTable.php b/src/Model/Table/OrderDetailsTable.php index 22fa7b0e64..409e9779fd 100644 --- a/src/Model/Table/OrderDetailsTable.php +++ b/src/Model/Table/OrderDetailsTable.php @@ -143,6 +143,28 @@ public function getLastOrderYear(): int|false return $this->getLastOrFirstOrderYear('DESC'); } + public function addLastMonthsCondition($query, $firstDayOfLastOrderMonth, $lastMonths) + { + $lastMonths--; + $query->where(function (QueryExpression $exp) use ($firstDayOfLastOrderMonth, $lastMonths) { + return $exp->add('OrderDetails.pickup_day >= DATE_SUB("' . $firstDayOfLastOrderMonth . '", INTERVAL ' . $lastMonths . ' MONTH)'); + }); + return $query; + } + + public function getFirstDayOfLastOrderMonth(): string|false + { + $orderDetail = $this->find('all', [ + 'order' => [ + 'OrderDetails.pickup_day' => 'DESC' + ] + ])->first(); + if (empty($orderDetail)) { + return false; + } + return $orderDetail->pickup_day->i18nFormat('Y-MM') . '-01'; + } + public function getFirstOrderYear(): int|false { return $this->getLastOrFirstOrderYear('ASC'); From 16e957fe0701f9d6018172567ccfdad16a1ebd0c Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 16 Nov 2022 17:19:03 +0100 Subject: [PATCH 309/646] remove --- src/View/Helper/MyTimeHelper.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index 0a9c48ad51..1b28d65af7 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -230,11 +230,6 @@ public function formatAsWeekday($day) return date('N', $day); } - public function formatAsYear($date) - { - return date('N', $date); - } - public function getCurrentDay() { return time(); From 9f72cbba014d627c050d5aae0bcfa90b5f2580ad Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 16 Nov 2022 17:22:03 +0100 Subject: [PATCH 310/646] 908 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 665bc33dfa..d878a193fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe - Die Überschriften aller Tabellen im Admin-Bereich bleiben jetzt beim Scrollen sichtbar (nicht in iOS). [PR#888](https://github.com/foodcoopshop/foodcoopshop/pull/888) - Im Produkt-Admin kann jetzt der Status (aktiviert, deaktiviert) von mehreren markierten Produkten auf einmal geändert werden. [I#895](https://github.com/foodcoopshop/foodcoopshop/issues/895) / [PR#897](https://github.com/foodcoopshop/foodcoopshop/pull/897) - Hersteller können ihre Bestellungen über [eine neue API](https://foodcoopshop.github.io/de/netzwerk-modul.html#6-api-zum-abrufen-von-bestellungen) abrufen und sie so im eigenen System weiterverarbeiten. [I#894](https://github.com/foodcoopshop/foodcoopshop/issues/894) / [PR#899](https://github.com/foodcoopshop/foodcoopshop/pull/899) +- Bei der Umsatzstatistik kann jetzt auch nach "letzte 12 bzw. 24 Monate" gefiltert werden. [I#904](https://github.com/foodcoopshop/foodcoopshop/issues/904) / [PR#908](https://github.com/foodcoopshop/foodcoopshop/pull/908) ### For developers - New 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) and [Gitpod-Integration](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop). [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) / [PR#879](https://github.com/foodcoopshop/foodcoopshop/pull/879) / [PR#881](https://github.com/foodcoopshop/foodcoopshop/pull/881) From ed678000d3c1b11fe1415f01a38dac1bccf977e4 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 16 Nov 2022 17:27:08 +0100 Subject: [PATCH 311/646] total stays default --- plugins/Admin/src/Controller/StatisticsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Admin/src/Controller/StatisticsController.php b/plugins/Admin/src/Controller/StatisticsController.php index ab6bbf5004..0f13177a79 100644 --- a/plugins/Admin/src/Controller/StatisticsController.php +++ b/plugins/Admin/src/Controller/StatisticsController.php @@ -67,7 +67,7 @@ public function index() { $manufacturerId = $this->getManufacturerId(); - $range = 'last-months-12'; + $range = ''; if (in_array('range', array_keys($this->getRequest()->getQueryParams()))) { $range = h($this->getRequest()->getQuery('range')); } @@ -123,9 +123,9 @@ public function index() $lastOrderYear = $this->OrderDetail->getLastOrderYear(); $rangesForDropdown = [ + '' => __d('admin', 'Total'), 'last-months-12' => __d('admin', 'Last_{0}_months', [12]), 'last-months-24' => __d('admin', 'Last_{0}_months', [24]), - '' => __d('admin', 'Total'), ]; if ($lastOrderYear !== false && $firstOrderYear !== false) { $allYears = Configure::read('app.timeHelper')->getAllYearsUntilThisYear($lastOrderYear, $firstOrderYear); From f50cf046e4f06ee0bdaaf1eda10bbc16201bff70 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 16 Nov 2022 17:46:07 +0100 Subject: [PATCH 312/646] last and first year is manufacturer aware --- .../src/Controller/StatisticsController.php | 6 ++-- src/Model/Table/OrderDetailsTable.php | 33 +++++++++++++++---- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/plugins/Admin/src/Controller/StatisticsController.php b/plugins/Admin/src/Controller/StatisticsController.php index 0f13177a79..54ab31e580 100644 --- a/plugins/Admin/src/Controller/StatisticsController.php +++ b/plugins/Admin/src/Controller/StatisticsController.php @@ -119,8 +119,8 @@ public function index() $this->set('title_for_layout', $titleForLayout); $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); - $firstOrderYear = $this->OrderDetail->getFirstOrderYear(); - $lastOrderYear = $this->OrderDetail->getLastOrderYear(); + $firstOrderYear = $this->OrderDetail->getFirstOrderYear($manufacturerId); + $lastOrderYear = $this->OrderDetail->getLastOrderYear($manufacturerId); $rangesForDropdown = [ '' => __d('admin', 'Total'), @@ -144,7 +144,7 @@ public function index() if ($lastMonths !== null) { $monthlySumProducts = $this->OrderDetail->getMonthlySumProductByManufacturer($manufacturerId, ''); - $firstDayOfLastOrderMonth = $this->OrderDetail->getFirstDayOfLastOrderMonth(); + $firstDayOfLastOrderMonth = $this->OrderDetail->getFirstDayOfLastOrderMonth($manufacturerId); $monthlySumProducts = $this->OrderDetail->addLastMonthsCondition($monthlySumProducts, $firstDayOfLastOrderMonth, $lastMonths); } else { $monthlySumProducts = $this->OrderDetail->getMonthlySumProductByManufacturer($manufacturerId, $year); diff --git a/src/Model/Table/OrderDetailsTable.php b/src/Model/Table/OrderDetailsTable.php index 409e9779fd..37f8e5e4b7 100644 --- a/src/Model/Table/OrderDetailsTable.php +++ b/src/Model/Table/OrderDetailsTable.php @@ -125,12 +125,21 @@ public function getLastOrderDate($customerId) return $query; } - private function getLastOrFirstOrderYear(string $sort): int|false + private function getLastOrFirstOrderYear(string $manufacturerId, string $sort): int|false { + $conditions = []; + if ($manufacturerId != 'all') { + $conditions['Products.id_manufacturer'] = $manufacturerId; + } + $orderDetail = $this->find('all', [ + 'conditions' => $conditions, 'order' => [ 'OrderDetails.pickup_day' => $sort, - ] + ], + 'contain' => [ + 'Products', + ], ])->first(); if (empty($orderDetail)) { return false; @@ -138,9 +147,9 @@ private function getLastOrFirstOrderYear(string $sort): int|false return (int) $orderDetail->pickup_day->i18nFormat(Configure::read('app.timeHelper')->getI18Format('Year')); } - public function getLastOrderYear(): int|false + public function getLastOrderYear(string $manufacturerId = 'all'): int|false { - return $this->getLastOrFirstOrderYear('DESC'); + return $this->getLastOrFirstOrderYear($manufacturerId, 'DESC'); } public function addLastMonthsCondition($query, $firstDayOfLastOrderMonth, $lastMonths) @@ -152,9 +161,19 @@ public function addLastMonthsCondition($query, $firstDayOfLastOrderMonth, $lastM return $query; } - public function getFirstDayOfLastOrderMonth(): string|false + public function getFirstDayOfLastOrderMonth(string $manufacturerId = 'all'): string|false { + + $conditions = []; + if ($manufacturerId != 'all') { + $conditions['Products.id_manufacturer'] = $manufacturerId; + } + $orderDetail = $this->find('all', [ + 'conditions' => $conditions, + 'contain' => [ + 'Products', + ], 'order' => [ 'OrderDetails.pickup_day' => 'DESC' ] @@ -165,9 +184,9 @@ public function getFirstDayOfLastOrderMonth(): string|false return $orderDetail->pickup_day->i18nFormat('Y-MM') . '-01'; } - public function getFirstOrderYear(): int|false + public function getFirstOrderYear(string $manufacturerId = 'all'): int|false { - return $this->getLastOrFirstOrderYear('ASC'); + return $this->getLastOrFirstOrderYear($manufacturerId, 'ASC'); } public function getOrderDetailsForOrderListPreview($pickupDay) From b6f5fdf43d9f2490fda44d7cce5983631fa246f3 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 17 Nov 2022 08:47:31 +0100 Subject: [PATCH 313/646] code cleaning --- .../src/Controller/StatisticsController.php | 2 +- src/Model/Table/OrderDetailsTable.php | 48 ++++++++----------- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/plugins/Admin/src/Controller/StatisticsController.php b/plugins/Admin/src/Controller/StatisticsController.php index 54ab31e580..197a27015b 100644 --- a/plugins/Admin/src/Controller/StatisticsController.php +++ b/plugins/Admin/src/Controller/StatisticsController.php @@ -65,7 +65,7 @@ public function myIndex() public function index() { - $manufacturerId = $this->getManufacturerId(); + $manufacturerId = (string) $this->getManufacturerId(); $range = ''; if (in_array('range', array_keys($this->getRequest()->getQueryParams()))) { diff --git a/src/Model/Table/OrderDetailsTable.php b/src/Model/Table/OrderDetailsTable.php index 37f8e5e4b7..28ed306513 100644 --- a/src/Model/Table/OrderDetailsTable.php +++ b/src/Model/Table/OrderDetailsTable.php @@ -125,13 +125,12 @@ public function getLastOrderDate($customerId) return $query; } - private function getLastOrFirstOrderYear(string $manufacturerId, string $sort): int|false + private function getLastOrFirstOrderYear(string $manufacturerId, string $sort) { $conditions = []; if ($manufacturerId != 'all') { $conditions['Products.id_manufacturer'] = $manufacturerId; } - $orderDetail = $this->find('all', [ 'conditions' => $conditions, 'order' => [ @@ -141,6 +140,12 @@ private function getLastOrFirstOrderYear(string $manufacturerId, string $sort): 'Products', ], ])->first(); + return $orderDetail; + } + + public function getFirstOrderYear(string $manufacturerId = 'all'): int|false + { + $orderDetail = $this->getLastOrFirstOrderYear($manufacturerId, 'ASC'); if (empty($orderDetail)) { return false; } @@ -149,44 +154,29 @@ private function getLastOrFirstOrderYear(string $manufacturerId, string $sort): public function getLastOrderYear(string $manufacturerId = 'all'): int|false { - return $this->getLastOrFirstOrderYear($manufacturerId, 'DESC'); - } - - public function addLastMonthsCondition($query, $firstDayOfLastOrderMonth, $lastMonths) - { - $lastMonths--; - $query->where(function (QueryExpression $exp) use ($firstDayOfLastOrderMonth, $lastMonths) { - return $exp->add('OrderDetails.pickup_day >= DATE_SUB("' . $firstDayOfLastOrderMonth . '", INTERVAL ' . $lastMonths . ' MONTH)'); - }); - return $query; + $orderDetail = $this->getLastOrFirstOrderYear($manufacturerId, 'DESC'); + if (empty($orderDetail)) { + return false; + } + return (int) $orderDetail->pickup_day->i18nFormat(Configure::read('app.timeHelper')->getI18Format('Year')); } public function getFirstDayOfLastOrderMonth(string $manufacturerId = 'all'): string|false { - - $conditions = []; - if ($manufacturerId != 'all') { - $conditions['Products.id_manufacturer'] = $manufacturerId; - } - - $orderDetail = $this->find('all', [ - 'conditions' => $conditions, - 'contain' => [ - 'Products', - ], - 'order' => [ - 'OrderDetails.pickup_day' => 'DESC' - ] - ])->first(); + $orderDetail = $this->getLastOrFirstOrderYear($manufacturerId, 'DESC'); if (empty($orderDetail)) { return false; } return $orderDetail->pickup_day->i18nFormat('Y-MM') . '-01'; } - public function getFirstOrderYear(string $manufacturerId = 'all'): int|false + public function addLastMonthsCondition($query, $firstDayOfLastOrderMonth, $lastMonths) { - return $this->getLastOrFirstOrderYear($manufacturerId, 'ASC'); + $lastMonths--; + $query->where(function (QueryExpression $exp) use ($firstDayOfLastOrderMonth, $lastMonths) { + return $exp->add('OrderDetails.pickup_day >= DATE_SUB("' . $firstDayOfLastOrderMonth . '", INTERVAL ' . $lastMonths . ' MONTH)'); + }); + return $query; } public function getOrderDetailsForOrderListPreview($pickupDay) From 201884ac0409e6e28cd9c3fcd10228e1749ae611 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 17 Nov 2022 09:50:35 +0100 Subject: [PATCH 314/646] light button --- templates/Customers/new_password_request.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Customers/new_password_request.php b/templates/Customers/new_password_request.php index 310d20c024..43ca4f0a2b 100644 --- a/templates/Customers/new_password_request.php +++ b/templates/Customers/new_password_request.php @@ -36,6 +36,6 @@

Form->control('Customers.email', ['label' => __('Email')]); ?> - + Form->end(); ?> From 0280cb5af5b43d04d545847309fb4f619b2f76de Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 20 Nov 2022 22:25:51 +0100 Subject: [PATCH 315/646] add doctype comment --- tests/bootstrap.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 30fce1420e..a542726c49 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -2,10 +2,17 @@ declare(strict_types=1); /** - * Test runner bootstrap. + * FoodCoopShop - The open source software for your foodcoop * - * Add additional configuration/setup your application needs when running - * unit tests in this file. + * Licensed under the GNU Affero General Public License version 3 + * For full copyright and license information, please see LICENSE + * Redistributions of files must retain the above copyright notice. + * + * @since FoodCoopShop 1.0.0 + * @license https://opensource.org/licenses/AGPL-3.0 + * @author Mario Rothauer + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com */ use Cake\Core\Configure; use Cake\Utility\Security; From 4332c140d27328a093b522cc763d29aef254e14f Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 20 Nov 2022 22:29:04 +0100 Subject: [PATCH 316/646] vendor updates --- composer.lock | 72 +++++++++++++++++++-------------------- webroot/package-lock.json | 14 ++++---- webroot/package.json | 2 +- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/composer.lock b/composer.lock index 78fa14c496..b3a58bcbf5 100644 --- a/composer.lock +++ b/composer.lock @@ -3813,16 +3813,16 @@ }, { "name": "cakephp/debug_kit", - "version": "4.9.0", + "version": "4.9.1", "source": { "type": "git", "url": "https://github.com/cakephp/debug_kit.git", - "reference": "cd05c7b0d5600308683dc9911c3ff3e4fbe9d590" + "reference": "ebbbf09762132b4bcce93f3b80cffcf6c9538125" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/cd05c7b0d5600308683dc9911c3ff3e4fbe9d590", - "reference": "cd05c7b0d5600308683dc9911c3ff3e4fbe9d590", + "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/ebbbf09762132b4bcce93f3b80cffcf6c9538125", + "reference": "ebbbf09762132b4bcce93f3b80cffcf6c9538125", "shasum": "" }, "require": { @@ -3875,7 +3875,7 @@ "issues": "https://github.com/cakephp/debug_kit/issues", "source": "https://github.com/cakephp/debug_kit" }, - "time": "2022-07-17T11:47:08+00:00" + "time": "2022-11-13T03:21:51+00:00" }, { "name": "cakephp/twig-view", @@ -4196,16 +4196,16 @@ }, { "name": "composer/pcre", - "version": "3.0.2", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4482b6409ca6bfc2af043a5711cd21ac3e7a8dfb" + "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4482b6409ca6bfc2af043a5711cd21ac3e7a8dfb", - "reference": "4482b6409ca6bfc2af043a5711cd21ac3e7a8dfb", + "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", "shasum": "" }, "require": { @@ -4247,7 +4247,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.0.2" + "source": "https://github.com/composer/pcre/tree/3.1.0" }, "funding": [ { @@ -4263,7 +4263,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T20:24:16+00:00" + "time": "2022-11-17T09:50:14+00:00" }, { "name": "composer/semver", @@ -4964,16 +4964,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.1", + "version": "v4.15.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900" + "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", - "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", + "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", "shasum": "" }, "require": { @@ -5014,9 +5014,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2" }, - "time": "2022-09-04T07:30:47+00:00" + "time": "2022-11-12T15:38:23+00:00" }, { "name": "phar-io/manifest", @@ -5131,16 +5131,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.13.0", + "version": "1.13.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "33aefcdab42900e36366d0feab6206e2dd68f947" + "reference": "aac44118344d197e6d5f7c6cee91885f0a89acdd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/33aefcdab42900e36366d0feab6206e2dd68f947", - "reference": "33aefcdab42900e36366d0feab6206e2dd68f947", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/aac44118344d197e6d5f7c6cee91885f0a89acdd", + "reference": "aac44118344d197e6d5f7c6cee91885f0a89acdd", "shasum": "" }, "require": { @@ -5170,9 +5170,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.13.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.13.1" }, - "time": "2022-10-21T09:57:39+00:00" + "time": "2022-11-20T08:52:26+00:00" }, { "name": "phpstan/phpstan", @@ -5235,16 +5235,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.18", + "version": "9.2.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a" + "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a", - "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559", + "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559", "shasum": "" }, "require": { @@ -5300,7 +5300,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19" }, "funding": [ { @@ -5308,7 +5308,7 @@ "type": "github" } ], - "time": "2022-10-27T13:35:33+00:00" + "time": "2022-11-18T07:47:47+00:00" }, { "name": "phpunit/php-file-iterator", @@ -6944,16 +6944,16 @@ }, { "name": "slevomat/coding-standard", - "version": "8.6.3", + "version": "8.6.4", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "94fd4f9263e65a5006444890b1615c025ff58f1a" + "reference": "8a02c83e59c3230a2a4367b29956a2f2b56e3a24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/94fd4f9263e65a5006444890b1615c025ff58f1a", - "reference": "94fd4f9263e65a5006444890b1615c025ff58f1a", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/8a02c83e59c3230a2a4367b29956a2f2b56e3a24", + "reference": "8a02c83e59c3230a2a4367b29956a2f2b56e3a24", "shasum": "" }, "require": { @@ -6965,7 +6965,7 @@ "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.10|1.9.0", + "phpstan/phpstan": "1.4.10|1.9.2", "phpstan/phpstan-deprecation-rules": "1.0.0", "phpstan/phpstan-phpunit": "1.0.0|1.2.2", "phpstan/phpstan-strict-rules": "1.4.4", @@ -6993,7 +6993,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.6.3" + "source": "https://github.com/slevomat/coding-standard/tree/8.6.4" }, "funding": [ { @@ -7005,7 +7005,7 @@ "type": "tidelift" } ], - "time": "2022-11-10T15:24:40+00:00" + "time": "2022-11-14T09:26:24+00:00" }, { "name": "squizlabs/php_codesniffer", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index f55d234199..3d231e5ebb 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.4", "@ericblade/quagga2": "^1.7.7", - "@fortawesome/fontawesome-free": "^6.2.0", + "@fortawesome/fontawesome-free": "^6.2.1", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.2", "bootstrap-select": "^1.14.0-beta3", @@ -73,9 +73,9 @@ } }, "node_modules/@fortawesome/fontawesome-free": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz", - "integrity": "sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz", + "integrity": "sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A==", "hasInstallScript": true, "engines": { "node": ">=6" @@ -1163,9 +1163,9 @@ } }, "@fortawesome/fontawesome-free": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz", - "integrity": "sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ==" + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz", + "integrity": "sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A==" }, "@popperjs/core": { "version": "2.11.6", diff --git a/webroot/package.json b/webroot/package.json index 4c829847ba..dcc2254d6d 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -16,7 +16,7 @@ "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.0.4", "@ericblade/quagga2": "^1.7.7", - "@fortawesome/fontawesome-free": "^6.2.0", + "@fortawesome/fontawesome-free": "^6.2.1", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.2", "bootstrap-select": "^1.14.0-beta3", From efbddd0bd4a3e61f71dd699c148d69755c78e317 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 21 Nov 2022 15:48:03 +0100 Subject: [PATCH 317/646] signal support group --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 00d02576f4..f1a0f340c9 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,19 @@ Users +

+ Signal Support Group + · + Docs + · + German Demo + · + English Demo + · + Users +

+ + ## 🤖 Self-hosting / developing * 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment) / [Installation guide](https://foodcoopshop.github.io/en/installation-guide) From 11d14706f7b2f7d987aff341f37339df8a0a0f00 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 21 Nov 2022 15:48:41 +0100 Subject: [PATCH 318/646] layout --- README.md | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/README.md b/README.md index f1a0f340c9..bbb4f85960 100644 --- a/README.md +++ b/README.md @@ -31,21 +31,10 @@ English Demo · Users - - -

- Signal Support Group · - Docs - · - German Demo - · - English Demo - · - Users + Signal Support Group

- ## 🤖 Self-hosting / developing * 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment) / [Installation guide](https://foodcoopshop.github.io/en/installation-guide) From fb9fdfd09d541d637f7f8021524785d1d0deeb32 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 22 Nov 2022 08:17:24 +0100 Subject: [PATCH 319/646] fixed type --- src/Model/Table/ProductsTable.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index 9fe2d95c20..0501618ef3 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -426,8 +426,8 @@ public function changePrice($products) $productId = key($product); $price = $product[$productId]['gross_price']; - if (!is_float($product[$productId]['gross_price'])) { - $price = Configure::read('app.numberHelper')->getStringAsFloat($product[$productId]['gross_price']); + if (!is_float($price)) { + $price = Configure::read('app.numberHelper')->getStringAsFloat($price); } $ids = $this->getProductIdAndAttributeId($productId); @@ -464,9 +464,18 @@ public function changePrice($products) } if (isset($product[$productId]['unit_product_price_per_unit_enabled']) && isset($product[$productId]['unit_product_price_incl_per_unit'])) { + $this->Unit = FactoryLocator::get('Table')->get('Units'); - $priceInclPerUnit = Configure::read('app.numberHelper')->getStringAsFloat($product[$productId]['unit_product_price_incl_per_unit']); - $quantityInUnits = Configure::read('app.numberHelper')->getStringAsFloat($product[$productId]['unit_product_quantity_in_units']); + + $priceInclPerUnit = $product[$productId]['unit_product_price_incl_per_unit']; + if (!is_float($priceInclPerUnit)) { + $priceInclPerUnit = Configure::read('app.numberHelper')->getStringAsFloat($priceInclPerUnit); + } + $quantityInUnits = $product[$productId]['unit_product_quantity_in_units']; + if (!is_float($quantityInUnits)) { + $quantityInUnits = Configure::read('app.numberHelper')->getStringAsFloat($quantityInUnits); + } + $this->Unit->saveUnits( $ids['productId'], $ids['attributeId'], From e4b8c3c8ce63b227b5a772f19413fd832b1c9424 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 24 Nov 2022 11:18:46 +0100 Subject: [PATCH 320/646] image could not be deleted --- plugins/Admin/src/Controller/CustomersController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Admin/src/Controller/CustomersController.php b/plugins/Admin/src/Controller/CustomersController.php index c20e59b965..57a8c92a1e 100644 --- a/plugins/Admin/src/Controller/CustomersController.php +++ b/plugins/Admin/src/Controller/CustomersController.php @@ -267,7 +267,7 @@ public function changePassword() } - public function delete($customerId) + public function delete(int $customerId) { $this->RequestHandler->renderAs($this, 'json'); From 6add91c608b619d55bf8d7255f32a00f99ef2a3b Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 24 Nov 2022 11:22:33 +0100 Subject: [PATCH 321/646] vendor updates --- composer.lock | 10 +++++----- webroot/package-lock.json | 28 ++++++++++++++-------------- webroot/package.json | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/composer.lock b/composer.lock index b3a58bcbf5..879d238c3b 100644 --- a/composer.lock +++ b/composer.lock @@ -925,16 +925,16 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.21.0", + "version": "2.22.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "e5b6419fea007b8b4a71034edc8ec96c88d4c57d" + "reference": "df8c7f9e11d854269f4aa7c06ffa38caa42e4405" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/e5b6419fea007b8b4a71034edc8ec96c88d4c57d", - "reference": "e5b6419fea007b8b4a71034edc8ec96c88d4c57d", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/df8c7f9e11d854269f4aa7c06ffa38caa42e4405", + "reference": "df8c7f9e11d854269f4aa7c06ffa38caa42e4405", "shasum": "" }, "require": { @@ -1018,7 +1018,7 @@ "type": "community_bridge" } ], - "time": "2022-11-11T09:01:24+00:00" + "time": "2022-11-22T05:54:54+00:00" }, { "name": "laminas/laminas-httphandlerrunner", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index 3d231e5ebb..fdf69a9c8b 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -12,7 +12,7 @@ "@ericblade/quagga2": "^1.7.7", "@fortawesome/fontawesome-free": "^6.2.1", "blueimp-file-upload": "^10.32.0", - "bootstrap": "^5.2.2", + "bootstrap": "^5.2.3", "bootstrap-select": "^1.14.0-beta3", "chart.js": "^3.9.1", "chartjs-plugin-datalabels": "^2.1.0", @@ -30,7 +30,7 @@ "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", "svelte": "^3.53.1", - "swiper": "8.4.4", + "swiper": "8.4.5", "tooltipster": "^4.2.8", "uglify-js": "^3.17.4", "webrtc-adapter": "^8.2.0" @@ -197,9 +197,9 @@ } }, "node_modules/bootstrap": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.2.tgz", - "integrity": "sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ==", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", + "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", "funding": [ { "type": "github", @@ -998,9 +998,9 @@ } }, "node_modules/swiper": { - "version": "8.4.4", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.4.tgz", - "integrity": "sha512-jA/8BfOZwT8PqPSnMX0TENZYitXEhNa7ZSNj1Diqh5LZyUJoBQaZcqAiPQ/PIg1+IPaRn/V8ZYVb0nxHMh51yw==", + "version": "8.4.5", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.5.tgz", + "integrity": "sha512-zveyEFBBv4q1sVkbJHnuH4xCtarKieavJ4SxP0QEHvdpPLJRuD7j/Xg38IVVLbp7Db6qrPsLUePvxohYx39Agw==", "funding": [ { "type": "patreon", @@ -1257,9 +1257,9 @@ "optional": true }, "bootstrap": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.2.tgz", - "integrity": "sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ==", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", + "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", "requires": {} }, "bootstrap-select": { @@ -1874,9 +1874,9 @@ "integrity": "sha512-Q4/hHkktZogGhN5iqxqSi9sjEVoe/NbIxX4hXEHoasTxj+TxEQVAq66LnDMdAZxjmsodkoI5F3slqsS68U7FNw==" }, "swiper": { - "version": "8.4.4", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.4.tgz", - "integrity": "sha512-jA/8BfOZwT8PqPSnMX0TENZYitXEhNa7ZSNj1Diqh5LZyUJoBQaZcqAiPQ/PIg1+IPaRn/V8ZYVb0nxHMh51yw==", + "version": "8.4.5", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.5.tgz", + "integrity": "sha512-zveyEFBBv4q1sVkbJHnuH4xCtarKieavJ4SxP0QEHvdpPLJRuD7j/Xg38IVVLbp7Db6qrPsLUePvxohYx39Agw==", "requires": { "dom7": "^4.0.4", "ssr-window": "^4.0.2" diff --git a/webroot/package.json b/webroot/package.json index dcc2254d6d..4530daf3d1 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -18,7 +18,7 @@ "@ericblade/quagga2": "^1.7.7", "@fortawesome/fontawesome-free": "^6.2.1", "blueimp-file-upload": "^10.32.0", - "bootstrap": "^5.2.2", + "bootstrap": "^5.2.3", "bootstrap-select": "^1.14.0-beta3", "chart.js": "^3.9.1", "chartjs-plugin-datalabels": "^2.1.0", @@ -36,7 +36,7 @@ "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", "svelte": "^3.53.1", - "swiper": "8.4.4", + "swiper": "8.4.5", "tooltipster": "^4.2.8", "uglify-js": "^3.17.4", "webrtc-adapter": "^8.2.0" From 5aebcf0f397fed2c23463ab02ba7555670b42ecc Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 25 Nov 2022 18:22:12 +0100 Subject: [PATCH 322/646] consider int and float --- src/Model/Table/ProductsTable.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index 0501618ef3..cbb2061801 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -413,7 +413,7 @@ public function changePrice($products) foreach ($products as $product) { $productId = key($product); $price = $product[$productId]['gross_price']; - if (!is_float($product[$productId]['gross_price'])) { + if (is_string($product[$productId]['gross_price'])) { $price = Configure::read('app.numberHelper')->getStringAsFloat($product[$productId]['gross_price']); } if ($price < 0) { @@ -426,7 +426,7 @@ public function changePrice($products) $productId = key($product); $price = $product[$productId]['gross_price']; - if (!is_float($price)) { + if (is_string($price)) { $price = Configure::read('app.numberHelper')->getStringAsFloat($price); } From 53cf3bb661fa9e4a88d2b977f6e698f3edcd5d8a Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 25 Nov 2022 18:43:02 +0100 Subject: [PATCH 323/646] consider int and float --- src/Model/Table/ProductsTable.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index cbb2061801..c73e37fe6a 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -468,11 +468,11 @@ public function changePrice($products) $this->Unit = FactoryLocator::get('Table')->get('Units'); $priceInclPerUnit = $product[$productId]['unit_product_price_incl_per_unit']; - if (!is_float($priceInclPerUnit)) { + if (is_string($priceInclPerUnit)) { $priceInclPerUnit = Configure::read('app.numberHelper')->getStringAsFloat($priceInclPerUnit); } $quantityInUnits = $product[$productId]['unit_product_quantity_in_units']; - if (!is_float($quantityInUnits)) { + if (is_string($quantityInUnits)) { $quantityInUnits = Configure::read('app.numberHelper')->getStringAsFloat($quantityInUnits); } From 4e5d8dc9a29a54adc78bd83c31658dffa2a74836 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 26 Nov 2022 10:35:08 +0100 Subject: [PATCH 324/646] type check fix for depost --- src/Model/Table/ProductsTable.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index c73e37fe6a..13c637e7c3 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -330,7 +330,10 @@ public function changeDeposit($products) foreach ($products as $product) { $productId = key($product); - $deposit = Configure::read('app.numberHelper')->getStringAsFloat($product[$productId]); + $deposit = $product[$productId]; + if (is_string($deposit)) { + $deposit = Configure::read('app.numberHelper')->getStringAsFloat($product[$productId]); + } if ($deposit < 0) { throw new InvalidParameterException('input format not correct: '.$product[$productId]); } @@ -338,8 +341,13 @@ public function changeDeposit($products) $success = false; foreach ($products as $product) { + $productId = key($product); - $deposit = Configure::read('app.numberHelper')->getStringAsFloat($product[$productId]); + + $deposit = $product[$productId]; + if (is_string($deposit)) { + $deposit = Configure::read('app.numberHelper')->getStringAsFloat($product[$productId]); + } $ids = $this->getProductIdAndAttributeId($productId); @@ -413,7 +421,7 @@ public function changePrice($products) foreach ($products as $product) { $productId = key($product); $price = $product[$productId]['gross_price']; - if (is_string($product[$productId]['gross_price'])) { + if (is_string($price)) { $price = Configure::read('app.numberHelper')->getStringAsFloat($product[$productId]['gross_price']); } if ($price < 0) { From 3d9ad2abe1b11e84d5a9e8e46f631139327ec11f Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 27 Nov 2022 21:00:28 +0100 Subject: [PATCH 325/646] smaller customer name --- plugins/Admin/templates/pdf/order_details.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Admin/templates/pdf/order_details.php b/plugins/Admin/templates/pdf/order_details.php index 4a6679c586..e9e4367c74 100644 --- a/plugins/Admin/templates/pdf/order_details.php +++ b/plugins/Admin/templates/pdf/order_details.php @@ -25,7 +25,7 @@ foreach ($orderDetails as $od) { $pdf->Ln(5); - $customerHtml = '

' . $od[0]->customer->name . '

'; + $customerHtml = '

' . $od[0]->customer->name . '

'; $pdf->writeHTML($customerHtml, true, false, true, false, ''); $pdf->writeHTML('

' .__d('admin', 'Pickup_day') . ': ' . $od[0]->pickup_day->i18nFormat(Configure::read('app.timeHelper')->getI18Format('DateLong2')) . ' / ID: ' . $od[0]->customer->id_customer . '

', true, false, true, false, ''); From 5bef1a6bb5502d713f7493e80fcc2e310f5377e0 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 27 Nov 2022 21:50:52 +0100 Subject: [PATCH 326/646] switch vs match --- .../Admin/src/Controller/PaymentsController.php | 12 ++++-------- plugins/Admin/templates/Payments/product.php | 15 +++++---------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/plugins/Admin/src/Controller/PaymentsController.php b/plugins/Admin/src/Controller/PaymentsController.php index f6cf76d791..578d61430b 100644 --- a/plugins/Admin/src/Controller/PaymentsController.php +++ b/plugins/Admin/src/Controller/PaymentsController.php @@ -389,14 +389,10 @@ public function add() if (in_array($actionLogType, ['deposit_customer', 'deposit_manufacturer'])) { $message .= '. '; - switch ($actionLogType) { - case 'deposit_customer': - $message .= __d('admin', 'The_amount_was_added_to_the_credit_system_of_{0}_and_can_be_deleted_there.', [''.$customer->name.'']); - break; - case 'deposit_manufacturer': - $message .= __d('admin', 'The_amount_was_added_to_the_deposit_account_of_{0}_and_can_be_deleted_there.', [''.$manufacturer->name.'']); - break; - } + $message .= match($actionLogType) { + 'deposit_customer' => __d('admin', 'The_amount_was_added_to_the_credit_system_of_{0}_and_can_be_deleted_there.', [''.$customer->name.'']), + 'deposit_manufacturer' => __d('admin', 'The_amount_was_added_to_the_deposit_account_of_{0}_and_can_be_deleted_there.', [''.$manufacturer->name.'']), + }; } $this->Flash->success($message); diff --git a/plugins/Admin/templates/Payments/product.php b/plugins/Admin/templates/Payments/product.php index b753806dca..5a799fcf65 100644 --- a/plugins/Admin/templates/Payments/product.php +++ b/plugins/Admin/templates/Payments/product.php @@ -72,16 +72,11 @@ echo ''; if ($payment['type'] == 'product') { - switch ($payment['approval']) { - case APP_DEL: - echo ''; - break; - case APP_OFF: - break; - case APP_ON: - echo ''; - break; - } + echo match($payment['approval']) { + APP_DEL => '', + APP_OFF => '', + APP_ON => '', + }; if ($payment['approval_comment'] != '') { echo $this->Html->link( '', From 539d74c87c3b1ed9e14cd56f80ae7003e38e5960 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 28 Nov 2022 08:25:32 +0100 Subject: [PATCH 327/646] switch vs match --- .../src/Controller/CustomersController.php | 33 ++++------------ .../src/Controller/FeedbacksController.php | 12 ++---- .../Admin/src/Controller/ListsController.php | 14 +++---- .../Admin/src/Controller/PagesController.php | 13 ++----- .../src/Controller/PaymentsController.php | 16 +++----- .../src/Controller/ReportsController.php | 6 +-- .../Admin/templates/Configurations/index.php | 23 +++-------- plugins/Admin/templates/Reports/payments.php | 16 +++----- .../src/Controller/SyncsControllerTest.php | 4 +- src/Model/Entity/Cronjob.php | 38 ++++++------------- src/Model/Table/ManufacturersTable.php | 23 +++++------ src/Model/Table/ProductsTable.php | 6 +-- src/View/Helper/MyHtmlHelper.php | 16 +++----- src/View/Helper/MyTimeHelper.php | 16 +++----- .../CustomersFrontendControllerTest.php | 2 +- 15 files changed, 76 insertions(+), 162 deletions(-) diff --git a/plugins/Admin/src/Controller/CustomersController.php b/plugins/Admin/src/Controller/CustomersController.php index 57a8c92a1e..c7ffed0050 100644 --- a/plugins/Admin/src/Controller/CustomersController.php +++ b/plugins/Admin/src/Controller/CustomersController.php @@ -34,31 +34,14 @@ class CustomersController extends AdminAppController public function isAuthorized($user) { - switch ($this->getRequest()->getParam('action')) { - case 'generateMemberCards': - return Configure::read('appDb.FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED') && ($this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin()); - break; - case 'generateMyMemberCard': - return Configure::read('appDb.FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED') && ($this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin() || $this->AppAuth->isCustomer()); - break; - case 'edit': - case 'creditBalanceSum': - return $this->AppAuth->isSuperadmin(); - break; - case 'profile': - return $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin() || $this->AppAuth->isCustomer(); - break; - case 'delete': - return $this->AppAuth->isSuperadmin(); - break; - case 'changePassword': - case 'ajaxGetCustomersForDropdown': - return $this->AppAuth->user(); - break; - default: - return $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin(); - break; - } + return match($this->getRequest()->getParam('action')) { + 'generateMemberCards' => Configure::read('appDb.FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED') && ($this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin()), + 'generateMyMemberCard' => Configure::read('appDb.FCS_SELF_SERVICE_MODE_FOR_STOCK_PRODUCTS_ENABLED') && ($this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin() || $this->AppAuth->isCustomer()), + 'creditBalanceSum', 'delete' => $this->AppAuth->isSuperadmin(), + 'profile' => $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin() || $this->AppAuth->isCustomer(), + 'changePassword', 'ajaxGetCustomersForDropdown' => $this->AppAuth->user(), + default => $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin(), + }; } public function ajaxGetCustomersForDropdown($includeManufacturers, $includeOfflineCustomers = true) diff --git a/plugins/Admin/src/Controller/FeedbacksController.php b/plugins/Admin/src/Controller/FeedbacksController.php index df6c266df0..b806e6b2da 100644 --- a/plugins/Admin/src/Controller/FeedbacksController.php +++ b/plugins/Admin/src/Controller/FeedbacksController.php @@ -28,14 +28,10 @@ class FeedbacksController extends AdminAppController public function isAuthorized($user) { - switch ($this->getRequest()->getParam('action')) { - case 'myFeedback': - return Configure::read('appDb.FCS_USER_FEEDBACK_ENABLED') && $this->AppAuth->user(); - break; - default: - return Configure::read('appDb.FCS_USER_FEEDBACK_ENABLED') && $this->AppAuth->isSuperadmin(); - break; - } + return match($this->getRequest()->getParam('action')) { + 'myFeedback' => Configure::read('appDb.FCS_USER_FEEDBACK_ENABLED') && $this->AppAuth->user(), + default => Configure::read('appDb.FCS_USER_FEEDBACK_ENABLED') && $this->AppAuth->isSuperadmin(), + }; } private function getCustomerId() diff --git a/plugins/Admin/src/Controller/ListsController.php b/plugins/Admin/src/Controller/ListsController.php index 1f598e0f54..a224a1bd86 100644 --- a/plugins/Admin/src/Controller/ListsController.php +++ b/plugins/Admin/src/Controller/ListsController.php @@ -26,15 +26,11 @@ class ListsController extends AdminAppController public function isAuthorized($user) { - switch ($this->getRequest()->getParam('action')) { - case 'getInvoice': - return (Configure::read('appDb.FCS_SEND_INVOICES_TO_CUSTOMERS') && $this->AppAuth->user()) || - ($this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin() || $this->AppAuth->isManufacturer()); - break; - default: - return $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin() || $this->AppAuth->isManufacturer(); - break; - } + return match($this->getRequest()->getParam('action')) { + 'getInvoice' => (Configure::read('appDb.FCS_SEND_INVOICES_TO_CUSTOMERS') && $this->AppAuth->user()) || + ($this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin() || $this->AppAuth->isManufacturer()), + default => $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin() || $this->AppAuth->isManufacturer(), + }; } public function orderLists() diff --git a/plugins/Admin/src/Controller/PagesController.php b/plugins/Admin/src/Controller/PagesController.php index 975f202ed2..ddb53ee2ae 100644 --- a/plugins/Admin/src/Controller/PagesController.php +++ b/plugins/Admin/src/Controller/PagesController.php @@ -25,15 +25,10 @@ class PagesController extends AdminAppController public function isAuthorized($user) { - switch ($this->getRequest()->getParam('action')) { - case 'home': - if ($this->AppAuth->user()) { - return true; - } - break; - default: - return $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin(); - } + return match($this->getRequest()->getParam('action')) { + 'home' => $this->AppAuth->user(), + default => $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin(), + }; } public function home() diff --git a/plugins/Admin/src/Controller/PaymentsController.php b/plugins/Admin/src/Controller/PaymentsController.php index 578d61430b..380a566b55 100644 --- a/plugins/Admin/src/Controller/PaymentsController.php +++ b/plugins/Admin/src/Controller/PaymentsController.php @@ -145,17 +145,11 @@ public function edit($paymentId) $payment = $this->Payment->save($payment); $this->ActionLog = $this->getTableLocator()->get('ActionLogs'); - switch ($payment->approval) { - case -1: - $actionLogType = 'payment_product_approval_not_ok'; - break; - case 0: - $actionLogType = 'payment_product_approval_open'; - break; - case 1: - $actionLogType = 'payment_product_approval_ok'; - break; - } + $actionLogType = match($payment->approval) { + -1 => 'payment_product_approval_not_ok', + 0 => 'payment_product_approval_open', + 1 => 'payment_product_approval_ok', + }; $newStatusAsString = Configure::read('app.htmlHelper')->getApprovalStates()[$payment->approval]; diff --git a/plugins/Admin/src/Controller/ReportsController.php b/plugins/Admin/src/Controller/ReportsController.php index ac10b46d84..5fe1978033 100644 --- a/plugins/Admin/src/Controller/ReportsController.php +++ b/plugins/Admin/src/Controller/ReportsController.php @@ -30,11 +30,9 @@ class ReportsController extends AdminAppController public function isAuthorized($user) { if (isset($this->getRequest()->getParam('pass')[0])) { - switch ($this->getRequest()->getParam('pass')[0]) { + if($this->getRequest()->getParam('pass')[0] == 'deposit') { // allow deposit for cash configuration - case 'deposit': - return $this->AppAuth->isSuperadmin(); - break; + return $this->AppAuth->isSuperadmin(); } } return $this->AppAuth->isSuperadmin() && Configure::read('app.htmlHelper')->paymentIsCashless(); diff --git a/plugins/Admin/templates/Configurations/index.php b/plugins/Admin/templates/Configurations/index.php index 07ea056e70..d0dcf4ab39 100644 --- a/plugins/Admin/templates/Configurations/index.php +++ b/plugins/Admin/templates/Configurations/index.php @@ -98,23 +98,12 @@ echo ''; - switch ($configuration->type) { - case 'number': - case 'text': - case 'textarea': - case 'textarea_big': - echo $configuration->value; - break; - case 'dropdown': - echo $this->Configuration->getConfigurationDropdownOption($configuration->name, $configuration->value, $appAuth); - break; - case 'multiple_dropdown': - echo $this->Configuration->getConfigurationMultipleDropdownOptions($configuration->name, $configuration->value); - break; - case 'boolean': - echo (boolean) $configuration->value ? __d('admin', 'yes') : __d('admin', 'no'); - break; - } + echo match($configuration->type) { + 'number', 'text', 'textarea', 'textarea_big' => $configuration->value, + 'dropdown' => $this->Configuration->getConfigurationDropdownOption($configuration->name, $configuration->value, $appAuth), + 'multiple_dropdown' => $this->Configuration->getConfigurationMultipleDropdownOptions($configuration->name, $configuration->value), + 'boolean' => (bool) $configuration->value ? __d('admin', 'yes') : __d('admin', 'no'), + }; echo ''; diff --git a/plugins/Admin/templates/Reports/payments.php b/plugins/Admin/templates/Reports/payments.php index 63ce8c18ea..955355bd33 100644 --- a/plugins/Admin/templates/Reports/payments.php +++ b/plugins/Admin/templates/Reports/payments.php @@ -110,16 +110,12 @@ } echo ''; echo ''; - switch ($payment->approval) { - case -1: - echo ''; - break; - case 0: - break; - case 1: - echo ''; - break; - } + echo match($payment->approval) { + -1 => '', + 0 => '', + 1 => '', + }; + if ($payment->approval_comment != '') { echo $this->Html->link( '', diff --git a/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php b/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php index d36a9ed19f..eeceaecdbd 100644 --- a/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php +++ b/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php @@ -82,7 +82,7 @@ public function testSaveProductAssociationWithWrongDomain() $domain = 'http://www.not-available-domain.at'; $response = $this->saveProductRelation(152, 152, '', $domain); - $this->assertFalse((boolean) $response->status); + $this->assertFalse((bool) $response->status); $this->assertRegExpWithUnquotedString($domain, $response->msg); $this->assertResponseCode(500); } @@ -97,7 +97,7 @@ public function testSaveProductAssociationForProductThatIsNotOwnedByLoggedInManu $productName = 'Joghurt'; $response = $this->saveProductRelation($productId, $productId, $productName, Configure::read('App.fullBaseUrl')); - $this->assertFalse((boolean) $response->status); + $this->assertFalse((bool) $response->status); $this->assertRegExpWithUnquotedString('product ' . $productId . ' is not associated with manufacturer ' . $manufacturerId, $response->msg); $this->assertResponseCode(500); } diff --git a/src/Model/Entity/Cronjob.php b/src/Model/Entity/Cronjob.php index 672a20d889..0b70ef6683 100644 --- a/src/Model/Entity/Cronjob.php +++ b/src/Model/Entity/Cronjob.php @@ -23,33 +23,17 @@ class Cronjob extends Entity protected function _getName($name) { - switch ($name) { - case 'BackupDatabase': - return __('BackupDatabaseCronjob'); - break; - case 'CheckCreditBalance': - return __('CheckCreditBalanceCronjob'); - break; - case 'EmailOrderReminder': - return __('EmailOrderReminderCronjob'); - break; - case 'PickupReminder': - return __('PickupReminderCronjob'); - break; - case 'SendOrderLists': - return __('SendOrderListsCronjob'); - break; - case 'SendInvoicesToCustomers': - return __('SendInvoicesToCustomersCronjob'); - break; - case 'SendInvoicesToManufacturers': - return __('SendInvoicesToManufacturersCronjob'); - break; - case 'SendDeliveryNotes': - return __('SendDeliveryNotesCronjob'); - break; - } - return $name; + return match($name) { + 'BackupDatabase' => __('BackupDatabaseCronjob'), + 'CheckCreditBalance' => __('CheckCreditBalanceCronjob'), + 'EmailOrderReminder' => __('EmailOrderReminderCronjob'), + 'PickupReminder' => __('PickupReminderCronjob'), + 'SendOrderLists' => __('SendOrderListsCronjob'), + 'SendInvoicesToCustomers' => __('SendInvoicesToCustomersCronjob'), + 'SendInvoicesToManufacturers' => __('SendInvoicesToManufacturersCronjob'), + 'SendDeliveryNotes' => __('SendDeliveryNotesCronjob'), + default => $name, + }; } } diff --git a/src/Model/Table/ManufacturersTable.php b/src/Model/Table/ManufacturersTable.php index 053d683d0b..6b87543e63 100644 --- a/src/Model/Table/ManufacturersTable.php +++ b/src/Model/Table/ManufacturersTable.php @@ -113,7 +113,7 @@ public function getOptionSendOrderedProductDeletedNotification($sendOrderedProdu if (is_null($sendOrderedProductDeletedNotification)) { $result = Configure::read('app.defaultSendOrderedProductDeletedNotification'); } - return (boolean) $result; + return (bool) $result; } /** @@ -126,7 +126,7 @@ public function getOptionSendOrderedProductPriceChangedNotification($sendOrdered if (is_null($sendOrderedProductPriceChangedNotification)) { $result = Configure::read('app.defaultSendOrderedProductPriceChangedNotification'); } - return (boolean) $result; + return (bool) $result; } /** @@ -139,7 +139,7 @@ public function getOptionSendOrderedProductAmountChangedNotification($sendOrdere if (is_null($sendOrderedProductAmountChangedNotification)) { $result = Configure::read('app.defaultSendOrderedProductAmountChangedNotification'); } - return (boolean) $result; + return (bool) $result; } /** @@ -152,7 +152,7 @@ public function getOptionSendInstantOrderNotification($sendInstantOrderNotificat if (is_null($sendInstantOrderNotification)) { $result = Configure::read('app.defaultSendInstantOrderNotification'); } - return (boolean) $result; + return (bool) $result; } /** @@ -165,7 +165,7 @@ public function getOptionSendInvoice($sendInvoice) if (is_null($sendInvoice)) { $result = Configure::read('app.defaultSendInvoice'); } - return (boolean) $result; + return (bool) $result; } /** @@ -372,15 +372,10 @@ public function getForDropdown() public function getDataForInvoiceOrOrderList($manufacturerId, $order, $dateFrom, $dateTo, $orderState, $includeStockProducts, $orderDetailIds = []) { - switch ($order) { - case 'product': - $orderClause = 'od.product_name ASC, od.tax_rate ASC, ' . $this->Customers->getCustomerName('c') . ' ASC'; - break; - case 'customer': - $orderClause = $this->Customers->getCustomerName('c') . ' ASC, od.product_name ASC'; - break; - } - + $orderClause = match($order) { + 'product' => 'od.product_name ASC, od.tax_rate ASC, ' . $this->Customers->getCustomerName('c') . ' ASC', + 'customer' => $this->Customers->getCustomerName('c') . ' ASC, od.product_name ASC', + }; $params = [ 'manufacturerId' => $manufacturerId ]; diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index 13c637e7c3..174257d54f 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -224,7 +224,7 @@ public function isOwner($productId, $manufacturerId) 'Products.id_manufacturer' => $manufacturerId ] ])->count(); - return (boolean) $found; + return (bool) $found; } /** @@ -496,8 +496,8 @@ public function changePrice($products) } } - $success = (boolean) $success; - return $success; + return (bool) $success; + } /** diff --git a/src/View/Helper/MyHtmlHelper.php b/src/View/Helper/MyHtmlHelper.php index 1ec8b2699e..0c63266633 100644 --- a/src/View/Helper/MyHtmlHelper.php +++ b/src/View/Helper/MyHtmlHelper.php @@ -223,17 +223,11 @@ public function getCurrencyName($currencySymbol) public function getCurrencyIsoCode($currencySymbol) { - switch($currencySymbol) { - case '€': - return 'EUR'; - break; - case '$': - return 'USD'; - break; - default: - return ''; - break; - } + return match($currencySymbol) { + '€' => 'EUR', + '$' => 'USD', + default => '', + }; } public function getFontAwesomeIconForCurrencyName($currencySymbol) diff --git a/src/View/Helper/MyTimeHelper.php b/src/View/Helper/MyTimeHelper.php index 1b28d65af7..538ee51876 100644 --- a/src/View/Helper/MyTimeHelper.php +++ b/src/View/Helper/MyTimeHelper.php @@ -187,17 +187,11 @@ public function getAllCalendarWeeksUntilNow($timestampStart) $result = []; foreach($allYears as $year) { - switch($year) { - case $startYear: - $result = array_merge($result, $this->getCalendarWeeks($startCalendarWeek, $this->getLastCalendarWeekOfYear($startYear), $year)); - break; - case $currentYear: - $result = array_merge($result, $this->getCalendarWeeks(1, $currentCalendarWeek, $year)); - break; - default: - $result = array_merge($result, $this->getCalendarWeeks(1, $this->getLastCalendarWeekOfYear($year), $year)); - break; - } + $result = match($year) { + $startYear => array_merge($result, $this->getCalendarWeeks($startCalendarWeek, $this->getLastCalendarWeekOfYear($startYear), $year)), + $currentYear => array_merge($result, $this->getCalendarWeeks(1, $currentCalendarWeek, $year)), + default => array_merge($result, $this->getCalendarWeeks(1, $this->getLastCalendarWeekOfYear($year), $year)), + }; } return $result; diff --git a/tests/TestCase/src/Controller/CustomersFrontendControllerTest.php b/tests/TestCase/src/Controller/CustomersFrontendControllerTest.php index fe73fbc7ac..5dd02a5bdc 100644 --- a/tests/TestCase/src/Controller/CustomersFrontendControllerTest.php +++ b/tests/TestCase/src/Controller/CustomersFrontendControllerTest.php @@ -229,7 +229,7 @@ public function testRegistrationWithCompanyUserActive() 'Customers.email' => $email, ], ])->first(); - $this->assertTrue((boolean) $customer->is_company); + $this->assertTrue((bool) $customer->is_company); } public function testRegistrationUserNotActive() From 7c7af01aa7789d7c50a5a3f9624396fa4c45a83e Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 28 Nov 2022 09:43:19 +0100 Subject: [PATCH 328/646] fixed typo --- src/Controller/LocalizedController.php | 2 +- webroot/js/helper.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Controller/LocalizedController.php b/src/Controller/LocalizedController.php index 50ce9667f9..2ac9bfac04 100644 --- a/src/Controller/LocalizedController.php +++ b/src/Controller/LocalizedController.php @@ -96,7 +96,7 @@ private function getStrings() 'ThisPageUsesCookies' => __('This_page_uses_cookies'), 'CookiesExplainationText' => __('Cookies_explaination_text'), 'AcceptCookies' => __('Accept_cookies'), - 'YouHaveAlredyOrdered01TimesFor2' => __('You_have_already_ordered_{0}_{1}_times_for_{2}.'), + 'YouHaveAlreadyOrdered01TimesFor2' => __('You_have_already_ordered_{0}_{1}_times_for_{2}.'), 'Firstname' => __('Firstname'), 'Lastname' => __('Lastname'), 'ContactPerson' => __('Contact_person'), diff --git a/webroot/js/helper.js b/webroot/js/helper.js index 60d6f44fcc..a538c31a71 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -109,7 +109,7 @@ foodcoopshop.Helper = { lines = []; linesHtml = ''; for(i in groupedOrderDetails[productId]) { - linesHtml = foodcoopshop.LocalizedJs.helper.YouHaveAlredyOrdered01TimesFor2.replaceI18n(0, '"' + groupedOrderDetails[productId][i].product_name + '"'); + linesHtml = foodcoopshop.LocalizedJs.helper.YouHaveAlreadyOrdered01TimesFor2.replaceI18n(0, '"' + groupedOrderDetails[productId][i].product_name + '"'); linesHtml = linesHtml.replaceI18n(1, groupedOrderDetails[productId][i].product_amount); var formattedPickupDay = new Date(groupedOrderDetails[productId][i].pickup_day).toLocaleDateString(foodcoopshop.LocalizedJs.helper.defaultLocaleInBCP47, { year:"numeric", month:"2-digit", day:"2-digit"}); linesHtml = linesHtml.replaceI18n(2, formattedPickupDay); From a79765fb6a20979aa36429c06f852226f8789437 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 28 Nov 2022 11:08:30 +0100 Subject: [PATCH 329/646] add showOrderedProductsTotalAmountInCatalog --- config/app_config.php | 1 + .../Admin/resources/locales/de_DE/admin.po | 8 ++-- plugins/Admin/resources/locales/default.pot | 6 +-- .../Admin/resources/locales/en_US/admin.po | 8 ++-- resources/locales/de_DE/default.mo | Bin 75934 -> 76099 bytes resources/locales/de_DE/default.po | 7 +++- resources/locales/default.pot | 5 ++- resources/locales/en_US/default.mo | Bin 71489 -> 71644 bytes resources/locales/en_US/default.po | 7 +++- src/Lib/Catalog/Catalog.php | 35 ++++++++++++++++++ src/Model/Table/OrderDetailsTable.php | 24 ++++++++++++ templates/Categories/detail.php | 7 ++++ templates/Manufacturers/detail.php | 7 ++++ templates/Products/detail.php | 7 ++++ templates/element/catalog/amountWrapper.php | 17 ++++++++- .../element/catalog/productWithAttributes.php | 3 +- .../catalog/productWithoutAttributes.php | 1 + webroot/css/frontend.css | 11 +++++- webroot/css/mobile-frontend.css | 4 +- 19 files changed, 137 insertions(+), 21 deletions(-) diff --git a/config/app_config.php b/config/app_config.php index 1e3ec30518..3a1b3c3877 100644 --- a/config/app_config.php +++ b/config/app_config.php @@ -107,6 +107,7 @@ 'selfServiceModeAutoLogoutDesktopEnabled' => true, 'selfServiceModeShowOnlyStockProducts' => true, 'selfServiceModeAutoGenerateInvoice' => true, + 'showOrderedProductsTotalAmountInCatalog' => false, /** * id of the category "all products" diff --git a/plugins/Admin/resources/locales/de_DE/admin.po b/plugins/Admin/resources/locales/de_DE/admin.po index 78a5415fab..1456f67bc5 100644 --- a/plugins/Admin/resources/locales/de_DE/admin.po +++ b/plugins/Admin/resources/locales/de_DE/admin.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-11-16 17:08+0100\n" +"POT-Creation-Date: 2022-11-28 09:35+0100\n" "PO-Revision-Date: 2022-11-16 17:09+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -696,12 +696,12 @@ msgstr "Umsatz- und Gewinnstatistik" msgid "Turnover_statistics" msgstr "Umsatzstatistik" -msgid "Last_{0}_months" -msgstr "Letzte {0} Monate" - msgid "Total" msgstr "Gesamt" +msgid "Last_{0}_months" +msgstr "Letzte {0} Monate" + msgid "December" msgstr "Dezember" diff --git a/plugins/Admin/resources/locales/default.pot b/plugins/Admin/resources/locales/default.pot index fa76a2616e..9d28e4e938 100644 --- a/plugins/Admin/resources/locales/default.pot +++ b/plugins/Admin/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-11-16 17:08+0100\n" +"POT-Creation-Date: 2022-11-28 09:35+0100\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -695,10 +695,10 @@ msgstr "" msgid "Turnover_statistics" msgstr "" -msgid "Last_{0}_months" +msgid "Total" msgstr "" -msgid "Total" +msgid "Last_{0}_months" msgstr "" msgid "December" diff --git a/plugins/Admin/resources/locales/en_US/admin.po b/plugins/Admin/resources/locales/en_US/admin.po index 9999e2349c..8e54a65b06 100644 --- a/plugins/Admin/resources/locales/en_US/admin.po +++ b/plugins/Admin/resources/locales/en_US/admin.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-11-16 17:08+0100\n" +"POT-Creation-Date: 2022-11-28 09:35+0100\n" "PO-Revision-Date: 2022-11-16 17:09+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -696,12 +696,12 @@ msgstr "Turnover and profit statistics" msgid "Turnover_statistics" msgstr "Turnover statistics" -msgid "Last_{0}_months" -msgstr "Last {0} months" - msgid "Total" msgstr "Total" +msgid "Last_{0}_months" +msgstr "Last {0} months" + msgid "December" msgstr "December" diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index 33889b8d6103846ee86a5bd99f0f24053c3394fd..f44e55309051fe316134a1de0ce9d3f0b2070b8b 100644 GIT binary patch delta 15067 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 delta 14930 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�ORmUtcfF0D_(}WrmIo?*Si!H@n`nIE?eJi z>tCY+{1$cEPoV<2V%vX5P52+ak7du8`YueOeg<_b{zYw7;7|6pp)%oCqM$vmgR$5a z>tjA@&z7J9T!xB#rFAVTkd3GbcAy6Q8a3W2RAARpV{H2rR6uWIEnI{NScD4jD(d~4s6D@r%3R5FCX?k+?KLn&_rEm- z4cG-6VlHOkT+|+Zie{}BIs@xanK_CI=rn4t&)NEA)NQ(o zzQ6xRoi}?^7PXQZs1&wCrM5SAz~^xpeum0SuU|~YMxs7kub~2b8@1wfs6GE2m64;U z)SpFtQLm!!-~YmYH52BbwxA>Gv_6CCH~_Vx5!e~W+4e)I34TNca2++l1JsH`E|@<_ zMWOnqp$>BvY5~nJkbgy-N5gO&j!O9@?23=9T`!uy(=EfYv>(O-ypHp+*Cq3B$oH@t z^)Z+E!v+>%6|8&3WUx2ZqrL{Kmj9wy-)jK^P5?>$6~Zk!b zqRz-b)BsaZ0jxwX?nU*xh>bDmy2)5;EJwXBCgQ8M?tVZ)5r2W|_%rHs`rRZh!fI)Zx!|@vW{`~)seGqxuOb~-* zc%dSuVGe4b0r(t#h&8bI9h0&8m`=SH2IF+p?U{#~=v`Z1iM6P2zzn>IIWC1Vf0zNg zpgueku{LhSOuUZO(EF$P(6mPdHVUiYhp6Y@qB3|7t7DnFX1tbIhx%A-j2kfp@1U#0 zmvGOdx*N`>VfoZRW>emqU9chco z$P3nq=%qdn8{rn@1Lit+Ddx&cHC#Z^Hsi!dLhWb<&U}Kzz_3=3N#i-&Q-yV;~Ce-Jnw&Ij+ufV^% zCQ@&X%0QnmkNN-qEutZwhMlMspG2kbA!?$GaI?Y!OrgFU+u~uYiSZHUy>{4{`ZUbO zpD-26M0$K@r3orCy-@9wB3+N~RIj1IkA}}sd$a>vV8;?3rwbNh8@zJ<#Z8Q2Wx zqxSwZ>RTTg?eYD8J+n~(ylq{A3gi>(DpWvgQ31PKY+*MldX{aPiW4ow%- z?HG?$aTO|n6R4C1mNvJb8fr@#qt41O)RxUf1+ohx@k`_^xXuv@I_26YyOpni0=Vk{oE{)YPWddhlyAFN31NxdoN;S$vM z!{=vJR*Ta#0gMgF0M;P(L;! zP??#G8hg*(; z7Lbklo^(cKVvucr8FhW%LM?oO*EK6$OoJwP9~H<7RA3uW9X6vP-iiHiKkB{o@}^%F zD&R(_0NbJh>}Kmvq9*K%>Nn6@;8M^8W9$pBpdz1wzP-ds)K{TC7)MYUxr90ccWgbX zg2(q)szlTTwNVRdfZB?dn1s2gEg5a=?koyQ-8$5%J%C!lNz_EY*!G*K0Uy}s0TsrAFlnueLE$Uj02v>J6!x1%CHflBEu)Cc4) zDxiQ$#t4k29)lXEnl;n5*SB`Usyxrfc-{Y*6tZbpf$DexwfEQ1Hz8_^?xHgC0ChV; zDw_bqP+OCN-LWC+M`#|V;APZ=k;%p!Os3usyL6y1ok9~lhe~Bq6_4-V_gkO_nvUss z7VBW~6m!a(p(e;fW$M+G!soM>d!}!S%30*`yt!#j{gZy4nVY6G^7nXV6~5VcmS^gw zxF$P1p4pp@H@)KV%-FQ6xxb%hPT}sB`JQQom0Q(iS(|#b>g5;k1_^j;)9yBp`+MdV wmTsTqDcqFRJ~e;SJL@|8h1X24mF=yWos&_kTFqLU?rkU-xpjB4=T*P|1N4B(sQ>@~ diff --git a/resources/locales/de_DE/default.po b/resources/locales/de_DE/default.po index ec044fff0f..2949e9858b 100644 --- a/resources/locales/de_DE/default.po +++ b/resources/locales/de_DE/default.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-11-16 17:08+0100\n" -"PO-Revision-Date: 2022-10-29 09:12+0200\n" +"POT-Creation-Date: 2022-11-28 10:54+0100\n" +"PO-Revision-Date: 2022-11-28 10:56+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -2487,6 +2487,9 @@ msgstr "Ich verspreche die Produkte am gebuchten Abholtag abzuholen und zahle de msgid "No_order_possible" msgstr "Keine Bestellung möglich" +msgid "{0,plural,=1{1_order} other{#_orders}}_for_pickup_day_{1}." +msgstr "{0,plural,=1{1 Bestellung} other{# Bestellungen}} für Abholtag {1}." + msgid "available" msgstr "verfügbar" diff --git a/resources/locales/default.pot b/resources/locales/default.pot index 9a6a1aae2d..f9b6b7a24c 100644 --- a/resources/locales/default.pot +++ b/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-11-16 17:08+0100\n" +"POT-Creation-Date: 2022-11-28 10:54+0100\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -2486,6 +2486,9 @@ msgstr "" msgid "No_order_possible" msgstr "" +msgid "{0,plural,=1{1_order} other{#_orders}}_for_pickup_day_{1}." +msgstr "" + msgid "available" msgstr "" diff --git a/resources/locales/en_US/default.mo b/resources/locales/en_US/default.mo index 6189920965ad57e5a398be73af8a4a57a2cb8a00..244675d7bf94c7f172b9ea7a69e310fe9e8182e1 100644 GIT binary patch delta 15056 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\n" "Language: en_US\n" @@ -2487,6 +2487,9 @@ msgstr "I promise to pick up the products on the selected pickup day and I will msgid "No_order_possible" msgstr "No order possible" +msgid "{0,plural,=1{1_order} other{#_orders}}_for_pickup_day_{1}." +msgstr "{0,plural,=1{1 order} other{# orders}} for pickup day {1}." + msgid "available" msgstr "available" diff --git a/src/Lib/Catalog/Catalog.php b/src/Lib/Catalog/Catalog.php index 75a211c4ab..85867b5d00 100644 --- a/src/Lib/Catalog/Catalog.php +++ b/src/Lib/Catalog/Catalog.php @@ -31,6 +31,7 @@ class Catalog { protected $Manufacturer; protected $Product; protected $ProductAttribute; + protected $OrderDetail; public function getProducts($appAuth, $categoryId, $filterByNewProducts = false, $keyword = '', $productId = 0, $countMode = false, $getOnlyStockProducts = false, $manufacturerId = 0) { @@ -54,6 +55,7 @@ public function getProducts($appAuth, $categoryId, $filterByNewProducts = false, $products = $query->toArray(); $products = $this->hideProductsWithActivatedDeliveryRhythmOrDeliveryBreak($appAuth, $products); $products = $this->removeProductIfAllAttributesRemovedDueToNoPurchasePrice($products); + $products = $this->addOrderedProductsTotalAmount($products, $appAuth); Cache::write($cacheKey, $products); } @@ -354,6 +356,39 @@ protected function addKeywordFilter($query, $keyword) } + protected function addOrderedProductsTotalAmount($products, $appAuth) + { + + if (!Configure::read('app.showOrderedProductsTotalAmountInCatalog')) { + return $products; + } + + if ($appAuth->isOrderForDifferentCustomerMode() || $appAuth->isSelfServiceModeByUrl()) { + return $products; + } + + $this->OrderDetail = FactoryLocator::get('Table')->get('OrderDetails'); + + $i = -1; + foreach($products as $product) { + $i++; + $pickupDay = DeliveryRhythm::getNextDeliveryDayForProduct($product, $appAuth); + if (empty($product->product_attributes)) { + $totalOrderDetails = $this->OrderDetail->getTotalOrderDetails($pickupDay, $product->id_product, 0); + $product->ordered_total_amount = $totalOrderDetails; + } else { + foreach($product->product_attributes as &$attribute) { + $totalOrderDetails = $this->OrderDetail->getTotalOrderDetails($pickupDay, $product->id_product, $attribute->id_product_attribute); + $attribute->ordered_total_amount = $totalOrderDetails; + } + } + } + + return $products; + + } + + protected function removeProductIfAllAttributesRemovedDueToNoPurchasePrice($products) { if (!Configure::read('appDb.FCS_PURCHASE_PRICE_ENABLED')) { diff --git a/src/Model/Table/OrderDetailsTable.php b/src/Model/Table/OrderDetailsTable.php index 28ed306513..242676953a 100644 --- a/src/Model/Table/OrderDetailsTable.php +++ b/src/Model/Table/OrderDetailsTable.php @@ -179,6 +179,30 @@ public function addLastMonthsCondition($query, $firstDayOfLastOrderMonth, $lastM return $query; } + public function getTotalOrderDetails(string $pickupDay, int $productId, int $attributeId) + { + $query = $this->find('all', [ + 'conditions' => [ + 'OrderDetails.pickup_day' => $pickupDay, + 'OrderDetails.product_id' => $productId, + 'OrderDetails.product_attribute_id' => $attributeId, + ], + ]); + $query->select([ + 'SumAmount' => $query->func()->sum('OrderDetails.product_amount'), + ]); + $query->group([ + 'OrderDetails.pickup_day', + 'OrderDetails.product_id', + 'OrderDetails.product_attribute_id', + ]); + $query = $query->toArray(); + if (count($query) > 0) { + return $query[0]->SumAmount; + } + return null; + } + public function getOrderDetailsForOrderListPreview($pickupDay) { $query = $this->find('all', [ diff --git a/templates/Categories/detail.php b/templates/Categories/detail.php index 612af816a8..214a07f72c 100644 --- a/templates/Categories/detail.php +++ b/templates/Categories/detail.php @@ -30,6 +30,13 @@ Configure::read('app.jsNamespace').".Cart.initRemoveFromCartLinks();". Configure::read('app.jsNamespace').".Helper.setFutureOrderDetails('".addslashes(json_encode($appAuth->getFutureOrderDetails()))."');" ]); + +if (Configure::read('app.showOrderedProductsTotalAmountInCatalog')) { + $this->element('addScript', ['script' => + Configure::read('app.jsNamespace') . ".Helper.initTooltip('.ordered-products-total-amount');" + ]); +} + ?> getFutureOrderDetails()))."');" ]); + +if (Configure::read('app.showOrderedProductsTotalAmountInCatalog')) { + $this->element('addScript', ['script' => + Configure::read('app.jsNamespace') . ".Helper.initTooltip('.ordered-products-total-amount');" + ]); +} + ?>

name; ?> diff --git a/templates/Products/detail.php b/templates/Products/detail.php index c357e5e8f7..9e8bd35383 100644 --- a/templates/Products/detail.php +++ b/templates/Products/detail.php @@ -29,6 +29,13 @@ Configure::read('app.jsNamespace').".Cart.initRemoveFromCartLinks();". Configure::read('app.jsNamespace').".Helper.setFutureOrderDetails('".addslashes(json_encode($appAuth->getFutureOrderDetails()))."');" ]); + +if (Configure::read('app.showOrderedProductsTotalAmountInCatalog')) { + $this->element('addScript', ['script' => + Configure::read('app.jsNamespace') . ".Helper.initTooltip('.ordered-products-total-amount');" + ]); +} + ?>

diff --git a/templates/element/catalog/amountWrapper.php b/templates/element/catalog/amountWrapper.php index 449f0b1611..997b16f3a2 100644 --- a/templates/element/catalog/amountWrapper.php +++ b/templates/element/catalog/amountWrapper.php @@ -30,10 +30,25 @@ + + next_delivery_day != 'delivery-rhythm-triggered-delivery-break') { + $pickupDayString = $this->Time->getDateFormattedWithWeekday(strtotime($product->next_delivery_day)); + $tooltip = __('{0,plural,=1{1_order} other{#_orders}}_for_pickup_day_{1}.', [ + $orderedTotalAmount, + $pickupDayString, + ]); + echo '
' . $orderedTotalAmount . '
'; + } + } + ?> + quantity - $stockAvailable->quantity_limit; if ((($product->is_stock_product && $product->manufacturer->stock_management_enabled) || !$stockAvailable->always_available) && $availableQuantity <= Configure::read('appDb.FCS_PRODUCT_AVAILABILITY_LOW')) { ?> - >() + >() +
\ No newline at end of file diff --git a/templates/element/catalog/productWithAttributes.php b/templates/element/catalog/productWithAttributes.php index cdf7626b95..ec3b82f59f 100644 --- a/templates/element/catalog/productWithAttributes.php +++ b/templates/element/catalog/productWithAttributes.php @@ -85,7 +85,8 @@ echo $this->element('catalog/amountWrapper', [ 'product' => $product, 'stockAvailable' => $attribute->stock_available, - 'hideAmountSelector' => $isStockProductOrderPossible + 'orderedTotalAmount' => $attribute->ordered_total_amount ?? null, + 'hideAmountSelector' => $isStockProductOrderPossible, ]); echo $this->element('catalog/cartButton', [ 'deliveryBreakEnabled' => $product->delivery_break_enabled ?? false, diff --git a/templates/element/catalog/productWithoutAttributes.php b/templates/element/catalog/productWithoutAttributes.php index 19e863bd11..616d274f49 100644 --- a/templates/element/catalog/productWithoutAttributes.php +++ b/templates/element/catalog/productWithoutAttributes.php @@ -44,6 +44,7 @@ echo $this->element('catalog/hiddenProductIdField', ['productId' => $product->id_product]); echo $this->element('catalog/amountWrapper', [ 'product' => $product, + 'orderedTotalAmount' => $product->ordered_total_amount ?? null, 'stockAvailable' => $product->stock_available, 'hideAmountSelector' => $isStockProductOrderPossible, ]); diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index 558d0e5d2a..c90d741453 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -549,6 +549,7 @@ body.products.detail .pw.delivery-break-enabled .descriptions { margin-top: 5px; margin-bottom: 10px; float: left; + width: 100%; } .pw .amount-wrapper .loi { float: left; @@ -577,10 +578,18 @@ body.products.detail .pw.delivery-break-enabled .descriptions { border: 1px solid #d6d4d4; width: 28px; } -.pw .amount-wrapper .right-of-input { +.pw .amount-wrapper .below-input { float: left; clear: both; } +.pw .amount-wrapper .ordered-products-total-amount { + float: right; + border-radius: 50%; + border: 1px solid #d6d4d4; + text-align: center; + width: 30px; + height: 30px; +} .pw span.not-available-info { display: block; margin-top: 10px; diff --git a/webroot/css/mobile-frontend.css b/webroot/css/mobile-frontend.css index 5976137db5..9fb945a94c 100644 --- a/webroot/css/mobile-frontend.css +++ b/webroot/css/mobile-frontend.css @@ -182,8 +182,8 @@ width: 100%; } .pw .amount-wrapper .fas { - font-size: 26px; - margin-top: 0px; + font-size: 21px; + margin-top: 4px; } .manufacturer-wrapper div.c3 a.btn { margin-top: 35px ! important; From 3e03c335d20c47006fe2dc6af2d02296e94a0865 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 28 Nov 2022 11:12:57 +0100 Subject: [PATCH 330/646] clear product cache on order detail update/delete --- src/Model/Table/OrderDetailsTable.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Model/Table/OrderDetailsTable.php b/src/Model/Table/OrderDetailsTable.php index 242676953a..13b8dbcbf5 100644 --- a/src/Model/Table/OrderDetailsTable.php +++ b/src/Model/Table/OrderDetailsTable.php @@ -4,10 +4,12 @@ namespace App\Model\Table; use App\Lib\DeliveryRhythm\DeliveryRhythm; +use App\Model\Traits\ProductCacheClearAfterDeleteTrait; +use App\Model\Traits\ProductCacheClearAfterSaveTrait; use Cake\Core\Configure; -use Cake\Database\Expression\QueryExpression; -use Cake\Datasource\FactoryLocator; use Cake\Validation\Validator; +use Cake\Datasource\FactoryLocator; +use Cake\Database\Expression\QueryExpression; /** * FoodCoopShop - The open source software for your foodcoop @@ -25,6 +27,9 @@ class OrderDetailsTable extends AppTable { + use ProductCacheClearAfterDeleteTrait; + use ProductCacheClearAfterSaveTrait; + public function initialize(array $config): void { $this->setTable('order_detail'); From a3feba2a4d4c13ca93876edb3426ac4645ad0568 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 29 Nov 2022 19:53:18 +0100 Subject: [PATCH 331/646] not always delete product cache when order details are changed --- config/bootstrap.php | 4 ++-- .../ProductCacheClearAfterDeleteTrait.php | 20 ++++++++++++++++--- .../ProductCacheClearAfterSaveTrait.php | 20 ++++++++++++++++--- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/config/bootstrap.php b/config/bootstrap.php index c0702305f1..04cb203f9b 100644 --- a/config/bootstrap.php +++ b/config/bootstrap.php @@ -94,9 +94,9 @@ * for a short time. */ if (Configure::read('debug')) { - Cache::disable(); + //Cache::disable(); // disable router cache during development - Configure::write('Cache._cake_routes_.duration', '+2 seconds'); + //Configure::write('Cache._cake_routes_.duration', '+2 seconds'); } /* diff --git a/src/Model/Traits/ProductCacheClearAfterDeleteTrait.php b/src/Model/Traits/ProductCacheClearAfterDeleteTrait.php index 8afefd7c8a..9de14fde9e 100644 --- a/src/Model/Traits/ProductCacheClearAfterDeleteTrait.php +++ b/src/Model/Traits/ProductCacheClearAfterDeleteTrait.php @@ -3,10 +3,11 @@ namespace App\Model\Traits; +use ArrayObject; use Cake\Cache\Cache; -use Cake\Datasource\EntityInterface; +use Cake\Core\Configure; use Cake\Event\EventInterface; -use ArrayObject; +use Cake\Datasource\EntityInterface; /** * FoodCoopShop - The open source software for your foodcoop @@ -27,7 +28,20 @@ trait ProductCacheClearAfterDeleteTrait public function afterDelete(EventInterface $event, EntityInterface $entity, ArrayObject $options) { - Cache::clearAll(); + + $clearCache = true; + + if ($this->getRegistryAlias() == 'OrderDetails') { + $clearCache = false; + if (Configure::read('app.showOrderedProductsTotalAmountInCatalog')) { + $clearCache = true; + } + } + + if ($clearCache) { + Cache::clearAll(); + } + } } \ No newline at end of file diff --git a/src/Model/Traits/ProductCacheClearAfterSaveTrait.php b/src/Model/Traits/ProductCacheClearAfterSaveTrait.php index effc2ed130..cbb638e39a 100644 --- a/src/Model/Traits/ProductCacheClearAfterSaveTrait.php +++ b/src/Model/Traits/ProductCacheClearAfterSaveTrait.php @@ -3,10 +3,11 @@ namespace App\Model\Traits; +use ArrayObject; use Cake\Cache\Cache; -use Cake\Datasource\EntityInterface; +use Cake\Core\Configure; use Cake\Event\EventInterface; -use ArrayObject; +use Cake\Datasource\EntityInterface; /** * FoodCoopShop - The open source software for your foodcoop @@ -27,7 +28,20 @@ trait ProductCacheClearAfterSaveTrait public function afterSave(EventInterface $event, EntityInterface $entity, ArrayObject $options) { - Cache::clearAll(); + + $clearCache = true; + + if ($this->getRegistryAlias() == 'OrderDetails') { + $clearCache = false; + if (Configure::read('app.showOrderedProductsTotalAmountInCatalog')) { + $clearCache = true; + } + } + + if ($clearCache) { + Cache::clearAll(); + } + } } \ No newline at end of file From b3749d5f348e8a4960e5ebc4539e0659e9a3099d Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 29 Nov 2022 20:13:33 +0100 Subject: [PATCH 332/646] add testProductDetailHtmlProductCatalogShowOrderedProductsTotalAmountInCatalog --- config/bootstrap.php | 4 +- src/Model/Table/AttributesTable.php | 6 +-- .../Table/BarcodeProductAttributesTable.php | 4 +- src/Model/Table/BarcodeProductsTable.php | 4 +- src/Model/Table/CategoriesTable.php | 6 +-- src/Model/Table/CategoryProductsTable.php | 4 +- src/Model/Table/ConfigurationsTable.php | 4 +- .../Table/DepositProductAttributesTable.php | 4 +- src/Model/Table/DepositProductsTable.php | 4 +- src/Model/Table/ImagesTable.php | 6 +-- src/Model/Table/ManufacturersTable.php | 4 +- src/Model/Table/OrderDetailsTable.php | 6 +-- src/Model/Table/ProductAttributesTable.php | 6 +-- src/Model/Table/ProductsTable.php | 4 +- .../PurchasePriceProductAttributesTable.php | 4 +- .../Table/PurchasePriceProductsTable.php | 4 +- src/Model/Table/StockAvailablesTable.php | 4 +- .../Table/UnitProductAttributesTable.php | 4 +- src/Model/Table/UnitProductsTable.php | 4 +- src/Model/Table/UnitsTable.php | 4 +- ...ductCacheClearAfterSaveAndDeleteTrait.php} | 15 ++++-- .../ProductCacheClearAfterSaveTrait.php | 47 ------------------- .../ProductsFrontendControllerTest.php | 26 ++++++++++ 23 files changed, 78 insertions(+), 100 deletions(-) rename src/Model/Traits/{ProductCacheClearAfterDeleteTrait.php => ProductCacheClearAfterSaveAndDeleteTrait.php} (80%) delete mode 100644 src/Model/Traits/ProductCacheClearAfterSaveTrait.php diff --git a/config/bootstrap.php b/config/bootstrap.php index 04cb203f9b..c0702305f1 100644 --- a/config/bootstrap.php +++ b/config/bootstrap.php @@ -94,9 +94,9 @@ * for a short time. */ if (Configure::read('debug')) { - //Cache::disable(); + Cache::disable(); // disable router cache during development - //Configure::write('Cache._cake_routes_.duration', '+2 seconds'); + Configure::write('Cache._cake_routes_.duration', '+2 seconds'); } /* diff --git a/src/Model/Table/AttributesTable.php b/src/Model/Table/AttributesTable.php index 70aad3d305..763186f443 100644 --- a/src/Model/Table/AttributesTable.php +++ b/src/Model/Table/AttributesTable.php @@ -3,8 +3,7 @@ namespace App\Model\Table; -use App\Model\Traits\ProductCacheClearAfterDeleteTrait; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; use Cake\Validation\Validator; /** @@ -23,8 +22,7 @@ class AttributesTable extends AppTable { - use ProductCacheClearAfterDeleteTrait; - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/BarcodeProductAttributesTable.php b/src/Model/Table/BarcodeProductAttributesTable.php index 47270e6bb5..d2d14d3f10 100644 --- a/src/Model/Table/BarcodeProductAttributesTable.php +++ b/src/Model/Table/BarcodeProductAttributesTable.php @@ -4,7 +4,7 @@ namespace App\Model\Table; use App\Model\Traits\ProductAndAttributeEntityTrait; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; /** * FoodCoopShop - The open source software for your foodcoop @@ -23,7 +23,7 @@ class BarcodeProductAttributesTable extends AppTable { use ProductAndAttributeEntityTrait; - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/BarcodeProductsTable.php b/src/Model/Table/BarcodeProductsTable.php index f9782b4534..2b19c9f213 100644 --- a/src/Model/Table/BarcodeProductsTable.php +++ b/src/Model/Table/BarcodeProductsTable.php @@ -4,7 +4,7 @@ namespace App\Model\Table; use App\Model\Traits\ProductAndAttributeEntityTrait; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; use Cake\Validation\Validator; /** @@ -24,7 +24,7 @@ class BarcodeProductsTable extends AppTable { use ProductAndAttributeEntityTrait; - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/CategoriesTable.php b/src/Model/Table/CategoriesTable.php index 2ca518b66c..76511b8622 100644 --- a/src/Model/Table/CategoriesTable.php +++ b/src/Model/Table/CategoriesTable.php @@ -4,8 +4,7 @@ namespace App\Model\Table; use App\Lib\Catalog\Catalog; -use App\Model\Traits\ProductCacheClearAfterDeleteTrait; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; use Cake\Core\Configure; use Cake\Validation\Validator; @@ -25,8 +24,7 @@ class CategoriesTable extends AppTable { - use ProductCacheClearAfterDeleteTrait; - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/CategoryProductsTable.php b/src/Model/Table/CategoryProductsTable.php index 473e990577..73a7bf08b3 100644 --- a/src/Model/Table/CategoryProductsTable.php +++ b/src/Model/Table/CategoryProductsTable.php @@ -3,7 +3,7 @@ namespace App\Model\Table; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; /** * FoodCoopShop - The open source software for your foodcoop @@ -21,7 +21,7 @@ class CategoryProductsTable extends AppTable { - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/ConfigurationsTable.php b/src/Model/Table/ConfigurationsTable.php index 0695d99483..3a502eadd4 100644 --- a/src/Model/Table/ConfigurationsTable.php +++ b/src/Model/Table/ConfigurationsTable.php @@ -5,7 +5,7 @@ use Cake\Core\Configure; use App\Lib\Error\Exception\ConfigFileMissingException; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; use Cake\Validation\Validator; /** @@ -24,7 +24,7 @@ class ConfigurationsTable extends AppTable { - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public const CASHLESS_PAYMENT_ADD_TYPE_MANUAL = 'manual'; public const CASHLESS_PAYMENT_ADD_TYPE_LIST_UPLOAD = 'list-upload'; diff --git a/src/Model/Table/DepositProductAttributesTable.php b/src/Model/Table/DepositProductAttributesTable.php index 0089209b50..1391454a48 100644 --- a/src/Model/Table/DepositProductAttributesTable.php +++ b/src/Model/Table/DepositProductAttributesTable.php @@ -3,7 +3,7 @@ namespace App\Model\Table; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; /** * FoodCoopShop - The open source software for your foodcoop @@ -21,7 +21,7 @@ class DepositProductAttributesTable extends AppTable { - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/DepositProductsTable.php b/src/Model/Table/DepositProductsTable.php index aa686b5d32..b6a3de79b1 100644 --- a/src/Model/Table/DepositProductsTable.php +++ b/src/Model/Table/DepositProductsTable.php @@ -3,7 +3,7 @@ namespace App\Model\Table; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; /** * FoodCoopShop - The open source software for your foodcoop @@ -21,7 +21,7 @@ class DepositProductsTable extends AppTable { - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/ImagesTable.php b/src/Model/Table/ImagesTable.php index aa06b652de..3e817350cb 100644 --- a/src/Model/Table/ImagesTable.php +++ b/src/Model/Table/ImagesTable.php @@ -3,8 +3,7 @@ namespace App\Model\Table; -use App\Model\Traits\ProductCacheClearAfterDeleteTrait; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; /** * FoodCoopShop - The open source software for your foodcoop @@ -22,8 +21,7 @@ class ImagesTable extends AppTable { - use ProductCacheClearAfterDeleteTrait; - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/ManufacturersTable.php b/src/Model/Table/ManufacturersTable.php index 6b87543e63..74fa5ca591 100644 --- a/src/Model/Table/ManufacturersTable.php +++ b/src/Model/Table/ManufacturersTable.php @@ -4,7 +4,7 @@ namespace App\Model\Table; use App\Lib\Catalog\Catalog; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; use Cake\Core\Configure; use Cake\Datasource\FactoryLocator; use Cake\Validation\Validator; @@ -26,7 +26,7 @@ class ManufacturersTable extends AppTable { - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/OrderDetailsTable.php b/src/Model/Table/OrderDetailsTable.php index 13b8dbcbf5..3f50d4e437 100644 --- a/src/Model/Table/OrderDetailsTable.php +++ b/src/Model/Table/OrderDetailsTable.php @@ -4,8 +4,7 @@ namespace App\Model\Table; use App\Lib\DeliveryRhythm\DeliveryRhythm; -use App\Model\Traits\ProductCacheClearAfterDeleteTrait; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; use Cake\Core\Configure; use Cake\Validation\Validator; use Cake\Datasource\FactoryLocator; @@ -27,8 +26,7 @@ class OrderDetailsTable extends AppTable { - use ProductCacheClearAfterDeleteTrait; - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/ProductAttributesTable.php b/src/Model/Table/ProductAttributesTable.php index 4877ac8809..375ac06b87 100644 --- a/src/Model/Table/ProductAttributesTable.php +++ b/src/Model/Table/ProductAttributesTable.php @@ -3,8 +3,7 @@ namespace App\Model\Table; -use App\Model\Traits\ProductCacheClearAfterDeleteTrait; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; use Cake\Datasource\FactoryLocator; /** @@ -23,8 +22,7 @@ class ProductAttributesTable extends AppTable { - use ProductCacheClearAfterDeleteTrait; - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index 174257d54f..3be99cfe00 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -9,7 +9,7 @@ use App\Lib\DeliveryRhythm\DeliveryRhythm; use App\Lib\Error\Exception\InvalidParameterException; use App\Lib\RemoteFile\RemoteFile; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; use Cake\Core\Configure; use Cake\Datasource\FactoryLocator; use Cake\Utility\Hash; @@ -31,7 +31,7 @@ class ProductsTable extends AppTable { - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public const ALLOWED_TAGS_DESCRIPTION_SHORT = '


'; public const ALLOWED_TAGS_DESCRIPTION = '


'; diff --git a/src/Model/Table/PurchasePriceProductAttributesTable.php b/src/Model/Table/PurchasePriceProductAttributesTable.php index 156935a249..7439d87860 100644 --- a/src/Model/Table/PurchasePriceProductAttributesTable.php +++ b/src/Model/Table/PurchasePriceProductAttributesTable.php @@ -3,7 +3,7 @@ namespace App\Model\Table; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; use Cake\Validation\Validator; /** @@ -22,7 +22,7 @@ class PurchasePriceProductAttributesTable extends AppTable { - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/PurchasePriceProductsTable.php b/src/Model/Table/PurchasePriceProductsTable.php index be2329b201..93e6816a39 100644 --- a/src/Model/Table/PurchasePriceProductsTable.php +++ b/src/Model/Table/PurchasePriceProductsTable.php @@ -4,7 +4,7 @@ namespace App\Model\Table; use App\Model\Traits\ProductAndAttributeEntityTrait; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; use Cake\Core\Configure; use Cake\Validation\Validator; use Cake\Datasource\FactoryLocator; @@ -26,7 +26,7 @@ class PurchasePriceProductsTable extends AppTable { use ProductAndAttributeEntityTrait; - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/StockAvailablesTable.php b/src/Model/Table/StockAvailablesTable.php index 170eb9e333..ad89aaf646 100644 --- a/src/Model/Table/StockAvailablesTable.php +++ b/src/Model/Table/StockAvailablesTable.php @@ -3,7 +3,7 @@ namespace App\Model\Table; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; use Cake\Validation\Validator; /** @@ -22,7 +22,7 @@ class StockAvailablesTable extends AppTable { - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/UnitProductAttributesTable.php b/src/Model/Table/UnitProductAttributesTable.php index 13ce8c6e2b..704c959d00 100644 --- a/src/Model/Table/UnitProductAttributesTable.php +++ b/src/Model/Table/UnitProductAttributesTable.php @@ -3,7 +3,7 @@ namespace App\Model\Table; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; /** * fake model for using associations with foreign keys that are not the id of the model @@ -23,7 +23,7 @@ class UnitProductAttributesTable extends AppTable { - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/UnitProductsTable.php b/src/Model/Table/UnitProductsTable.php index 6f8d8f262c..2402d5e0fb 100644 --- a/src/Model/Table/UnitProductsTable.php +++ b/src/Model/Table/UnitProductsTable.php @@ -3,7 +3,7 @@ namespace App\Model\Table; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; use Cake\Validation\Validator; /** @@ -24,7 +24,7 @@ class UnitProductsTable extends AppTable { - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function initialize(array $config): void { diff --git a/src/Model/Table/UnitsTable.php b/src/Model/Table/UnitsTable.php index 59dd5590d9..9191d5b74b 100644 --- a/src/Model/Table/UnitsTable.php +++ b/src/Model/Table/UnitsTable.php @@ -4,7 +4,7 @@ use Cake\Validation\Validator; use App\Lib\Error\Exception\InvalidParameterException; -use App\Model\Traits\ProductCacheClearAfterSaveTrait; +use App\Model\Traits\ProductCacheClearAfterSaveAndDeleteTrait; /** * FoodCoopShop - The open source software for your foodcoop @@ -22,7 +22,7 @@ class UnitsTable extends AppTable { - use ProductCacheClearAfterSaveTrait; + use ProductCacheClearAfterSaveAndDeleteTrait; public function validationDefault(Validator $validator): Validator { diff --git a/src/Model/Traits/ProductCacheClearAfterDeleteTrait.php b/src/Model/Traits/ProductCacheClearAfterSaveAndDeleteTrait.php similarity index 80% rename from src/Model/Traits/ProductCacheClearAfterDeleteTrait.php rename to src/Model/Traits/ProductCacheClearAfterSaveAndDeleteTrait.php index 9de14fde9e..a2c029d253 100644 --- a/src/Model/Traits/ProductCacheClearAfterDeleteTrait.php +++ b/src/Model/Traits/ProductCacheClearAfterSaveAndDeleteTrait.php @@ -23,12 +23,21 @@ * @link https://www.foodcoopshop.com */ -trait ProductCacheClearAfterDeleteTrait +trait ProductCacheClearAfterSaveAndDeleteTrait { + public function afterSave(EventInterface $event, EntityInterface $entity, ArrayObject $options) + { + $this->clearProductCache(); + } + public function afterDelete(EventInterface $event, EntityInterface $entity, ArrayObject $options) { - + $this->clearProductCache(); + } + + private function clearProductCache() + { $clearCache = true; if ($this->getRegistryAlias() == 'OrderDetails') { @@ -41,7 +50,7 @@ public function afterDelete(EventInterface $event, EntityInterface $entity, Arra if ($clearCache) { Cache::clearAll(); } - + } } \ No newline at end of file diff --git a/src/Model/Traits/ProductCacheClearAfterSaveTrait.php b/src/Model/Traits/ProductCacheClearAfterSaveTrait.php deleted file mode 100644 index cbb638e39a..0000000000 --- a/src/Model/Traits/ProductCacheClearAfterSaveTrait.php +++ /dev/null @@ -1,47 +0,0 @@ - - * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com - * @link https://www.foodcoopshop.com - */ - -trait ProductCacheClearAfterSaveTrait -{ - - public function afterSave(EventInterface $event, EntityInterface $entity, ArrayObject $options) - { - - $clearCache = true; - - if ($this->getRegistryAlias() == 'OrderDetails') { - $clearCache = false; - if (Configure::read('app.showOrderedProductsTotalAmountInCatalog')) { - $clearCache = true; - } - } - - if ($clearCache) { - Cache::clearAll(); - } - - } - -} \ No newline at end of file diff --git a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php index e41970cc1f..dccb9f5bc4 100644 --- a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php +++ b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php @@ -186,6 +186,32 @@ public function testProductDetailHtmlProductCatalogWeekly() $this->assertResponseContains(''.$pickupDay.''); } + public function testProductDetailHtmlProductCatalogShowOrderedProductsTotalAmountInCatalog() + { + Configure::write('app.showOrderedProductsTotalAmountInCatalog', true); + $this->Product = $this->getTableLocator()->get('Products'); + $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); + + $productId = 60; + $product = $this->Product->find('all', [ + 'conditions' => [ + 'id_product' => $productId, + ], + ])->first(); + $nextDeliveryDay = DeliveryRhythm::getNextDeliveryDayForProduct($product, $this); + + $query = 'UPDATE ' . $this->OrderDetail->getTable().' SET pickup_day = :pickupDay WHERE id_order_detail IN (3);'; + $params = [ + 'pickupDay' => $nextDeliveryDay, + ]; + $statement = $this->dbConnection->prepare($query); + $statement->execute($params); + + $this->get($this->Slug->getProductDetail($productId, 'Milch')); + $formattedPickupDay = Configure::read('app.timeHelper')->getDateFormattedWithWeekday(strtotime($nextDeliveryDay)); + $this->assertResponseContains('

1
'); + } + public function testProductDetailHtmlProductCatalogInstantOrder() { $this->loginAsSuperadmin(); From efce08acdfdb26222a93fe06ed948ffee27a2ff8 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 29 Nov 2022 20:18:26 +0100 Subject: [PATCH 333/646] add testProductDetailHtmlProductCatalogShowOrderedProductsTotalAmountInCatalog --- resources/locales/de_DE/default.mo | Bin 76099 -> 76021 bytes resources/locales/de_DE/default.po | 8 ++++---- resources/locales/default.pot | 4 ++-- resources/locales/en_US/default.mo | Bin 71644 -> 71581 bytes resources/locales/en_US/default.po | 8 ++++---- templates/element/catalog/amountWrapper.php | 2 +- .../ProductsFrontendControllerTest.php | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/locales/de_DE/default.mo b/resources/locales/de_DE/default.mo index f44e55309051fe316134a1de0ce9d3f0b2070b8b..a3de27cd0628b4debd1ed000044bfea4108e3d39 100644 GIT binary patch delta 7712 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 DP_*vD delta 7766 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 Bestellung} other{# Bestellungen}} für Abholtag {1}." +msgid "{0}_times_ordered_for_pickup_day_{1}." +msgstr "{0}x für Abholtag {1} bestellt." msgid "available" msgstr "verfügbar" diff --git a/resources/locales/default.pot b/resources/locales/default.pot index f9b6b7a24c..43568b6b88 100644 --- a/resources/locales/default.pot +++ b/resources/locales/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2022-11-28 10:54+0100\n" +"POT-Creation-Date: 2022-11-29 20:16+0100\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -2486,7 +2486,7 @@ msgstr "" msgid "No_order_possible" msgstr "" -msgid "{0,plural,=1{1_order} other{#_orders}}_for_pickup_day_{1}." +msgid "{0}_times_ordered_for_pickup_day_{1}." msgstr "" msgid "available" diff --git a/resources/locales/en_US/default.mo b/resources/locales/en_US/default.mo index 244675d7bf94c7f172b9ea7a69e310fe9e8182e1..68577625b7cd5ee7254b1429e5591da8880eac12 100644 GIT binary patch delta 7716 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 diff --git a/resources/locales/en_US/default.po b/resources/locales/en_US/default.po index c849c32120..a2de110131 100644 --- a/resources/locales/en_US/default.po +++ b/resources/locales/en_US/default.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2022-11-28 10:54+0100\n" -"PO-Revision-Date: 2022-11-28 10:56+0100\n" +"POT-Creation-Date: 2022-11-29 20:16+0100\n" +"PO-Revision-Date: 2022-11-29 20:17+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: en_US\n" @@ -2487,8 +2487,8 @@ msgstr "I promise to pick up the products on the selected pickup day and I will msgid "No_order_possible" msgstr "No order possible" -msgid "{0,plural,=1{1_order} other{#_orders}}_for_pickup_day_{1}." -msgstr "{0,plural,=1{1 order} other{# orders}} for pickup day {1}." +msgid "{0}_times_ordered_for_pickup_day_{1}." +msgstr "{0} times ordered for pickup day {1}." msgid "available" msgstr "available" diff --git a/templates/element/catalog/amountWrapper.php b/templates/element/catalog/amountWrapper.php index 997b16f3a2..2f11cc1311 100644 --- a/templates/element/catalog/amountWrapper.php +++ b/templates/element/catalog/amountWrapper.php @@ -35,7 +35,7 @@ if (Configure::read('app.showOrderedProductsTotalAmountInCatalog') && !is_null($orderedTotalAmount)) { if ($product->next_delivery_day != 'delivery-rhythm-triggered-delivery-break') { $pickupDayString = $this->Time->getDateFormattedWithWeekday(strtotime($product->next_delivery_day)); - $tooltip = __('{0,plural,=1{1_order} other{#_orders}}_for_pickup_day_{1}.', [ + $tooltip = __('{0}_times_ordered_for_pickup_day_{1}.', [ $orderedTotalAmount, $pickupDayString, ]); diff --git a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php index dccb9f5bc4..fb14dfb858 100644 --- a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php +++ b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php @@ -209,7 +209,7 @@ public function testProductDetailHtmlProductCatalogShowOrderedProductsTotalAmoun $this->get($this->Slug->getProductDetail($productId, 'Milch')); $formattedPickupDay = Configure::read('app.timeHelper')->getDateFormattedWithWeekday(strtotime($nextDeliveryDay)); - $this->assertResponseContains('
1
'); + $this->assertResponseContains('
1
'); } public function testProductDetailHtmlProductCatalogInstantOrder() From 4946cfa560441df75f4eebcf8683462edbac09b0 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 29 Nov 2022 20:19:26 +0100 Subject: [PATCH 334/646] fix --- templates/element/catalog/amountWrapper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/element/catalog/amountWrapper.php b/templates/element/catalog/amountWrapper.php index 2f11cc1311..e6534e69e4 100644 --- a/templates/element/catalog/amountWrapper.php +++ b/templates/element/catalog/amountWrapper.php @@ -36,8 +36,8 @@ if ($product->next_delivery_day != 'delivery-rhythm-triggered-delivery-break') { $pickupDayString = $this->Time->getDateFormattedWithWeekday(strtotime($product->next_delivery_day)); $tooltip = __('{0}_times_ordered_for_pickup_day_{1}.', [ - $orderedTotalAmount, - $pickupDayString, + '' . $orderedTotalAmount . '', + '' . $pickupDayString . '', ]); echo '
' . $orderedTotalAmount . '
'; } From ded98629dcf4d753582235ef85ddb3514ad8516b Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 29 Nov 2022 20:24:19 +0100 Subject: [PATCH 335/646] fix --- CHANGELOG.md | 1 + tests/TestCase/src/Controller/ProductsFrontendControllerTest.php | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d878a193fa..fd9b163f61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe - Im Produkt-Admin kann jetzt der Status (aktiviert, deaktiviert) von mehreren markierten Produkten auf einmal geändert werden. [I#895](https://github.com/foodcoopshop/foodcoopshop/issues/895) / [PR#897](https://github.com/foodcoopshop/foodcoopshop/pull/897) - Hersteller können ihre Bestellungen über [eine neue API](https://foodcoopshop.github.io/de/netzwerk-modul.html#6-api-zum-abrufen-von-bestellungen) abrufen und sie so im eigenen System weiterverarbeiten. [I#894](https://github.com/foodcoopshop/foodcoopshop/issues/894) / [PR#899](https://github.com/foodcoopshop/foodcoopshop/pull/899) - Bei der Umsatzstatistik kann jetzt auch nach "letzte 12 bzw. 24 Monate" gefiltert werden. [I#904](https://github.com/foodcoopshop/foodcoopshop/issues/904) / [PR#908](https://github.com/foodcoopshop/foodcoopshop/pull/908) +- Bei allen Produkten kann jetzt die Anzahl der bestellten Einheiten für den nächsten Abholtag angezeigt werden. Das soll helfen, wenn bestimmte Gebindegrößen erreicht werden sollen. [I#904](https://github.com/foodcoopshop/foodcoopshop/issues/904) / [PR#908](https://github.com/foodcoopshop/foodcoopshop/pull/908) ### For developers - New 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) and [Gitpod-Integration](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop). [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) / [PR#879](https://github.com/foodcoopshop/foodcoopshop/pull/879) / [PR#881](https://github.com/foodcoopshop/foodcoopshop/pull/881) diff --git a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php index fb14dfb858..01dff041c9 100644 --- a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php +++ b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php @@ -23,6 +23,7 @@ class ProductsFrontendControllerTest extends AppCakeTestCase { + protected $OrderDetail; protected $Product; protected $Unit; From 91e45c423a82ffc139489437c2018784c7966ab1 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 29 Nov 2022 20:25:42 +0100 Subject: [PATCH 336/646] 910 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd9b163f61..0eefae4e76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe - Im Produkt-Admin kann jetzt der Status (aktiviert, deaktiviert) von mehreren markierten Produkten auf einmal geändert werden. [I#895](https://github.com/foodcoopshop/foodcoopshop/issues/895) / [PR#897](https://github.com/foodcoopshop/foodcoopshop/pull/897) - Hersteller können ihre Bestellungen über [eine neue API](https://foodcoopshop.github.io/de/netzwerk-modul.html#6-api-zum-abrufen-von-bestellungen) abrufen und sie so im eigenen System weiterverarbeiten. [I#894](https://github.com/foodcoopshop/foodcoopshop/issues/894) / [PR#899](https://github.com/foodcoopshop/foodcoopshop/pull/899) - Bei der Umsatzstatistik kann jetzt auch nach "letzte 12 bzw. 24 Monate" gefiltert werden. [I#904](https://github.com/foodcoopshop/foodcoopshop/issues/904) / [PR#908](https://github.com/foodcoopshop/foodcoopshop/pull/908) -- Bei allen Produkten kann jetzt die Anzahl der bestellten Einheiten für den nächsten Abholtag angezeigt werden. Das soll helfen, wenn bestimmte Gebindegrößen erreicht werden sollen. [I#904](https://github.com/foodcoopshop/foodcoopshop/issues/904) / [PR#908](https://github.com/foodcoopshop/foodcoopshop/pull/908) +- Bei allen Produkten kann jetzt die Anzahl der bestellten Einheiten für den nächsten Abholtag angezeigt werden. Das hilft, wenn bestimmte Gebindegrößen erreicht werden sollen. [I#909](https://github.com/foodcoopshop/foodcoopshop/issues/909) / [PR#910](https://github.com/foodcoopshop/foodcoopshop/pull/910) ### For developers - New 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) and [Gitpod-Integration](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop). [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) / [PR#879](https://github.com/foodcoopshop/foodcoopshop/pull/879) / [PR#881](https://github.com/foodcoopshop/foodcoopshop/pull/881) From 014a778af4207684d06e0a50db2c9bff01eb6276 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 30 Nov 2022 18:20:28 +0100 Subject: [PATCH 337/646] only show total orders when logged in --- src/Lib/Catalog/Catalog.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Lib/Catalog/Catalog.php b/src/Lib/Catalog/Catalog.php index 85867b5d00..bfcf0275fc 100644 --- a/src/Lib/Catalog/Catalog.php +++ b/src/Lib/Catalog/Catalog.php @@ -363,6 +363,10 @@ protected function addOrderedProductsTotalAmount($products, $appAuth) return $products; } + if (!$appAuth->user()) { + return $products; + } + if ($appAuth->isOrderForDifferentCustomerMode() || $appAuth->isSelfServiceModeByUrl()) { return $products; } @@ -374,12 +378,10 @@ protected function addOrderedProductsTotalAmount($products, $appAuth) $i++; $pickupDay = DeliveryRhythm::getNextDeliveryDayForProduct($product, $appAuth); if (empty($product->product_attributes)) { - $totalOrderDetails = $this->OrderDetail->getTotalOrderDetails($pickupDay, $product->id_product, 0); - $product->ordered_total_amount = $totalOrderDetails; + $product->ordered_total_amount = $this->OrderDetail->getTotalOrderDetails($pickupDay, $product->id_product, 0); } else { foreach($product->product_attributes as &$attribute) { - $totalOrderDetails = $this->OrderDetail->getTotalOrderDetails($pickupDay, $product->id_product, $attribute->id_product_attribute); - $attribute->ordered_total_amount = $totalOrderDetails; + $attribute->ordered_total_amount = $this->OrderDetail->getTotalOrderDetails($pickupDay, $product->id_product, $attribute->id_product_attribute); } } } From 0aa5d744046599b83939d0e899dab21ba3ab28fa Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 30 Nov 2022 18:36:03 +0100 Subject: [PATCH 338/646] adapt test --- tests/TestCase/src/Controller/ProductsFrontendControllerTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php index 01dff041c9..28fd936503 100644 --- a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php +++ b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php @@ -208,6 +208,7 @@ public function testProductDetailHtmlProductCatalogShowOrderedProductsTotalAmoun $statement = $this->dbConnection->prepare($query); $statement->execute($params); + $this->loginAsCustomer(); $this->get($this->Slug->getProductDetail($productId, 'Milch')); $formattedPickupDay = Configure::read('app.timeHelper')->getDateFormattedWithWeekday(strtotime($nextDeliveryDay)); $this->assertResponseContains('
1
'); From 5634f080ea84bf7d573202fb6c3937c5f2a069a1 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 30 Nov 2022 19:47:32 +0100 Subject: [PATCH 339/646] refactor custom sql queries --- .../ManufacturersControllerTest.php | 33 ++++++++----------- .../src/Controller/SyncsControllerTest.php | 2 +- tests/TestCase/AppCakeTestCase.php | 31 ++++------------- .../Traits/DeliveryRhythmConfigsTrait.php | 23 +++++++------ .../Traits/PrepareAndTestInvoiceDataTrait.php | 13 ++++---- .../Command/EmailOrderReminderCommandTest.php | 3 +- .../SendInvoicesToCustomersCommandTest.php | 9 ++--- .../src/Controller/CartsControllerTest.php | 13 +++++--- .../src/Controller/PagesControllerTest.php | 12 +++---- .../ProductsFrontendControllerTest.php | 10 ++---- .../Lib/DeliveryRhythm/DeliveryRhythmTest.php | 4 +-- 11 files changed, 61 insertions(+), 92 deletions(-) diff --git a/plugins/Admin/tests/TestCase/src/Controller/ManufacturersControllerTest.php b/plugins/Admin/tests/TestCase/src/Controller/ManufacturersControllerTest.php index 6bc9781082..1f2b1e4740 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/ManufacturersControllerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/ManufacturersControllerTest.php @@ -220,26 +220,19 @@ public function testEditOptionsNoDeliveryDays() $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); $this->Product = $this->getTableLocator()->get('Products'); - $query = 'UPDATE ' . $this->OrderDetail->getTable().' SET pickup_day = :pickupDay WHERE id_order_detail IN(1);'; - $params = [ - 'pickupDay' => $noDeliveryDayA, - ]; - $statement = $this->dbConnection->prepare($query); - $statement->execute($params); - - $query = 'UPDATE ' . $this->OrderDetail->getTable().' SET pickup_day = :pickupDay WHERE id_order_detail IN (2,3);'; - $params = [ - 'pickupDay' => $noDeliveryDayB, - ]; - $statement = $this->dbConnection->prepare($query); - $statement->execute($params); - - $query = 'UPDATE ' . $this->Product->getTable().' SET id_manufacturer = :manufacturerId;'; - $params = [ - 'manufacturerId' => $manufacturerId, - ]; - $statement = $this->dbConnection->prepare($query); - $statement->execute($params); + $orderDetailEntityA = $this->OrderDetail->get(1); + $orderDetailEntityA->pickup_day = $noDeliveryDayA; + $this->OrderDetail->save($orderDetailEntityA); + + $orderDetailEntityB = $this->OrderDetail->get(2); + $orderDetailEntityB->pickup_day = $noDeliveryDayB; + $this->OrderDetail->save($orderDetailEntityB); + + $orderDetailEntityC = $this->OrderDetail->get(3); + $orderDetailEntityC->pickup_day = $noDeliveryDayB; + $this->OrderDetail->save($orderDetailEntityC); + + $this->Product->updateAll(['id_manufacturer' => $manufacturerId], []); $this->post( $this->Slug->getManufacturerEditOptions($manufacturerId), diff --git a/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php b/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php index eeceaecdbd..2327f4439c 100644 --- a/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php +++ b/plugins/Network/tests/TestCase/src/Controller/SyncsControllerTest.php @@ -176,7 +176,7 @@ private function saveProductRelation($localProductId, $remoteProductId, $product private function disableVariableMemberFee() { - $this->changeReadOnlyConfiguration('FCS_USE_VARIABLE_MEMBER_FEE', 0); + $this->changeConfiguration('FCS_USE_VARIABLE_MEMBER_FEE', 0); $manufacturerId = $this->Customer->getManufacturerIdByCustomerId(Configure::read('test.vegetableManufacturerId')); $this->changeManufacturer($manufacturerId, 'variable_member_fee', 0); } diff --git a/tests/TestCase/AppCakeTestCase.php b/tests/TestCase/AppCakeTestCase.php index 074fd5c515..87247e134e 100644 --- a/tests/TestCase/AppCakeTestCase.php +++ b/tests/TestCase/AppCakeTestCase.php @@ -187,33 +187,16 @@ protected function assertUrl($url, $expectedUrl, $msg = '') $this->assertEquals($url, $expectedUrl, $msg); } - protected function changeReadOnlyConfiguration($configKey, $value) - { - $query = 'UPDATE ' . $this->Configuration->getTable() . ' SET value = :value WHERE name = :configKey'; - $params = [ - 'value' => $value, - 'configKey' => $configKey - ]; - $statement = $this->dbConnection->prepare($query); - $statement->execute($params); - $this->Configuration->loadConfigurations(); - } - /** - * needs to login as superadmin and logs user out automatically - * - * @param string $configKey - * @param string $newValue + * automatically logout of user */ - protected function changeConfiguration($configKey, $newValue) + protected function changeConfiguration(string $configKey, $value) { - $query = 'UPDATE fcs_configuration SET value = :newValue WHERE name = :configKey;'; - $params = [ - 'newValue' => $newValue, - 'configKey' => $configKey - ]; - $statement = $this->dbConnection->prepare($query); - $statement->execute($params); + $this->Configuration->setPrimaryKey('name'); + $configurationEntity = $this->Configuration->get($configKey); + $configurationEntity->value = $value; + $this->Configuration->save($configurationEntity); + $this->Configuration->setPrimaryKey('id_configuration'); $this->Configuration->loadConfigurations(); $this->logout(); } diff --git a/tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php b/tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php index 1ab67a897b..6c3bccb71d 100644 --- a/tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php +++ b/tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php @@ -25,35 +25,34 @@ trait DeliveryRhythmConfigsTrait protected function prepareThursdayFridayConfig() { - $this->changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 5); - $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 1); + $this->changeConfiguration('FCS_WEEKLY_PICKUP_DAY', 5); + $this->changeConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 1); } protected function prepareWednesdayFridayConfig() { - $this->changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 5); - $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 2); + $this->changeConfiguration('FCS_WEEKLY_PICKUP_DAY', 5); + $this->changeConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 2); } protected function prepareTuesdayFridayConfig() { - $this->changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 5); - $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 3); + $this->changeConfiguration('FCS_WEEKLY_PICKUP_DAY', 5); + $this->changeConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 3); } protected function prepareMondayTuesdayConfig() { - $this->changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 2); - $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 1); + $this->changeConfiguration('FCS_WEEKLY_PICKUP_DAY', 2); + $this->changeConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 1); } protected function prepareSaturdayThursdayConfig() { - $this->changeReadOnlyConfiguration('FCS_WEEKLY_PICKUP_DAY', 4); - $this->changeReadOnlyConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 5); + $this->changeConfiguration('FCS_WEEKLY_PICKUP_DAY', 4); + $this->changeConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 5); $this->Products = FactoryLocator::get('Table')->get('Products'); - $query = 'UPDATE ' . $this->Products->getTable().' SET delivery_rhythm_send_order_list_weekday = 6'; - $this->dbConnection->execute($query); + $this->Product->updateAll(['delivery_rhythm_send_order_list_weekday' => 6], []); } } diff --git a/tests/TestCase/Traits/PrepareAndTestInvoiceDataTrait.php b/tests/TestCase/Traits/PrepareAndTestInvoiceDataTrait.php index 8fb977f74b..6ac30c058e 100644 --- a/tests/TestCase/Traits/PrepareAndTestInvoiceDataTrait.php +++ b/tests/TestCase/Traits/PrepareAndTestInvoiceDataTrait.php @@ -39,12 +39,13 @@ public function prepareOrdersAndPaymentsForInvoice($customerId) $this->finishCart(1, 1, '', null, $pickupDay); $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); - $query = 'UPDATE ' . $this->OrderDetail->getTable().' SET pickup_day = :pickupDay WHERE id_order_detail IN(4,5);'; - $params = [ - 'pickupDay' => $pickupDay, - ]; - $statement = $this->dbConnection->prepare($query); - $statement->execute($params); + $orderDetailEntityA = $this->OrderDetail->get(4); + $orderDetailEntityA->pickup_day = $pickupDay; + $this->OrderDetail->save($orderDetailEntityA); + + $orderDetailEntityB = $this->OrderDetail->get(5); + $orderDetailEntityB->pickup_day = $pickupDay; + $this->OrderDetail->save($orderDetailEntityB); $this->addPayment($customerId, 2.0, 'deposit', 0, '', $pickupDay); $this->addPayment($customerId, 3.2, 'deposit', 0, '', $pickupDay); diff --git a/tests/TestCase/src/Command/EmailOrderReminderCommandTest.php b/tests/TestCase/src/Command/EmailOrderReminderCommandTest.php index 9a49f20eb1..33628ea173 100644 --- a/tests/TestCase/src/Command/EmailOrderReminderCommandTest.php +++ b/tests/TestCase/src/Command/EmailOrderReminderCommandTest.php @@ -92,8 +92,7 @@ public function testActiveOrder() public function testIfServiceNotSubscribed() { - $query = 'UPDATE '.$this->Customer->getTable().' SET email_order_reminder_enabled = 0;'; - $this->dbConnection->query($query); + $this->Customer->updateAll(['email_order_reminder_enabled' => 0], []); $this->exec('email_order_reminder'); $this->runAndAssertQueue(); $this->assertMailCount(0); diff --git a/tests/TestCase/src/Command/SendInvoicesToCustomersCommandTest.php b/tests/TestCase/src/Command/SendInvoicesToCustomersCommandTest.php index 79a83fc5c4..38b17571ea 100644 --- a/tests/TestCase/src/Command/SendInvoicesToCustomersCommandTest.php +++ b/tests/TestCase/src/Command/SendInvoicesToCustomersCommandTest.php @@ -113,12 +113,9 @@ public function testSendInvoicesWithExcludedFutureOrder() // move one order detail in future - must be excluded from invoice $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); - $query = 'UPDATE ' . $this->OrderDetail->getTable().' SET pickup_day = :pickupDay WHERE id_order_detail IN(1);'; - $params = [ - 'pickupDay' => '2018-02-09', - ]; - $statement = $this->dbConnection->prepare($query); - $statement->execute($params); + $orderDetailEntity = $this->OrderDetail->get(1); + $orderDetailEntity->pickup_day = '2018-02-09'; + $this->OrderDetail->save($orderDetailEntity); $this->Invoice = $this->getTableLocator()->get('Invoices'); diff --git a/tests/TestCase/src/Controller/CartsControllerTest.php b/tests/TestCase/src/Controller/CartsControllerTest.php index 7a4dd1cc34..3b9934e63a 100644 --- a/tests/TestCase/src/Controller/CartsControllerTest.php +++ b/tests/TestCase/src/Controller/CartsControllerTest.php @@ -318,10 +318,15 @@ public function testRemoveProductIfProductAttributeWasDeletedAndOtherProductAttr { $this->loginAsCustomer(); $this->addProductToCart($this->productId2, 1); - $query = 'UPDATE ' . $this->Product->getTable().' SET active = 0 WHERE id_product = 60'; - $this->dbConnection->execute($query); - $query = 'UPDATE ' . $this->Cart->CartProducts->getTable().' SET id_product_attribute = 5000 WHERE id_cart_product = 3'; - $this->dbConnection->execute($query); + + $productEntity = $this->Product->get(60); + $productEntity->active = APP_OFF; + $this->Product->save($productEntity); + + $cpEntity = $this->Cart->CartProducts->get(3); + $cpEntity->id_product_attribute = 5000; + $this->Cart->CartProducts->save($cpEntity); + $this->removeProduct($this->productId2); $cart = $this->Cart->getCart($this, $this->Cart::CART_TYPE_WEEKLY_RHYTHM); $this->assertEquals([], $cart['CartProducts'], 'cart must be empty'); diff --git a/tests/TestCase/src/Controller/PagesControllerTest.php b/tests/TestCase/src/Controller/PagesControllerTest.php index 0a48a80bea..9d9cb293f5 100644 --- a/tests/TestCase/src/Controller/PagesControllerTest.php +++ b/tests/TestCase/src/Controller/PagesControllerTest.php @@ -218,13 +218,9 @@ protected function assertPagesFor404($testPages) protected function changePage($pageId, $isPrivate = 0, $active = 1) { - $query = 'UPDATE ' . $this->Page->getTable().' SET is_private = :isPrivate, active = :active WHERE id_page = :pageId;'; - $params = [ - 'pageId' => $pageId, - 'isPrivate' => $isPrivate, - 'active' => $active - ]; - $statement = $this->dbConnection->prepare($query); - $statement->execute($params); + $pageEntity = $this->Page->get($pageId); + $pageEntity->active = $active; + $pageEntity->is_private = $isPrivate; + $this->Page->save($pageEntity); } } diff --git a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php index e41970cc1f..17779717d2 100644 --- a/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php +++ b/tests/TestCase/src/Controller/ProductsFrontendControllerTest.php @@ -200,13 +200,9 @@ public function testProductDetailHtmlProductCatalogInstantOrder() protected function changeProductStatus($productId, $active) { - $query = 'UPDATE ' . $this->Product->getTable().' SET active = :active WHERE id_product = :productId;'; - $params = [ - 'productId' => $productId, - 'active' => $active - ]; - $statement = $this->dbConnection->prepare($query); - $statement->execute($params); + $productEntity = $this->Product->get($productId); + $productEntity->active = $active; + $this->Product->save($productEntity); } } diff --git a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php index 851f6db845..8a1d5c1383 100644 --- a/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php +++ b/tests/TestCase/src/Lib/DeliveryRhythm/DeliveryRhythmTest.php @@ -443,7 +443,7 @@ public function test1WeekWithSendOrderListDayTwoDaysBeforeDefault() public function test2WeekWithSendOrderListDayTwoDaysBeforeDefaultAndChangedSendOrderListsDayDeltaAllowOrdersConfigOff() { - $this->changeConfiguration('FCS_SEND_FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 3); + $this->changeConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 3); $data = [ 'product' => $this->Product->newEntity( [ @@ -462,7 +462,7 @@ public function test2WeekWithSendOrderListDayTwoDaysBeforeDefaultAndChangedSendO public function test2WeekWithSendOrderListDayTwoDaysBeforeDefaultAndChangedSendOrderListsDayDeltaAllowOrdersConfigOn() { - $this->changeConfiguration('FCS_SEND_FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 3); + $this->changeConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 3); $this->changeConfiguration('FCS_ALLOW_ORDERS_FOR_DELIVERY_RHYTHM_ONE_OR_TWO_WEEKS_ONLY_IN_WEEK_BEFORE_DELIVERY', 1); $data = [ 'product' => $this->Product->newEntity( From 8702e8b5d3c6e84a1614cef199cb17a404e51403 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 30 Nov 2022 20:08:21 +0100 Subject: [PATCH 340/646] use correct entity --- tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php b/tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php index 6c3bccb71d..72746fafaa 100644 --- a/tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php +++ b/tests/TestCase/Traits/DeliveryRhythmConfigsTrait.php @@ -21,8 +21,6 @@ trait DeliveryRhythmConfigsTrait { - protected $Products; - protected function prepareThursdayFridayConfig() { $this->changeConfiguration('FCS_WEEKLY_PICKUP_DAY', 5); @@ -51,7 +49,6 @@ protected function prepareSaturdayThursdayConfig() { $this->changeConfiguration('FCS_WEEKLY_PICKUP_DAY', 4); $this->changeConfiguration('FCS_DEFAULT_SEND_ORDER_LISTS_DAY_DELTA', 5); - $this->Products = FactoryLocator::get('Table')->get('Products'); $this->Product->updateAll(['delivery_rhythm_send_order_list_weekday' => 6], []); } From a84ffb6a0fadb5da03cb0446889d2d8699d244eb Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 30 Nov 2022 20:13:02 +0100 Subject: [PATCH 341/646] add property --- tests/TestCase/src/View/Helper/MyTimeHelperTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php index a55a42cc37..85dfa2cb1b 100644 --- a/tests/TestCase/src/View/Helper/MyTimeHelperTest.php +++ b/tests/TestCase/src/View/Helper/MyTimeHelperTest.php @@ -23,6 +23,7 @@ class MyTimeHelperTest extends AppCakeTestCase { protected $MyTimeHelper; + protected $Product; use DeliveryRhythmConfigsTrait; From 1a3bec17017f0013d44b042b80bc7d43b24c40a4 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 30 Nov 2022 20:19:33 +0100 Subject: [PATCH 342/646] switch vs match --- .../src/Controller/DepositsController.php | 22 ++++-------- .../Controller/ManufacturersController.php | 35 +++++-------------- .../src/Controller/PaymentsController.php | 26 ++++---------- .../src/Controller/StatisticsController.php | 16 +++------ plugins/Admin/templates/Reports/payments.php | 10 +++--- 5 files changed, 31 insertions(+), 78 deletions(-) diff --git a/plugins/Admin/src/Controller/DepositsController.php b/plugins/Admin/src/Controller/DepositsController.php index e5991ec3d7..862c7e9833 100644 --- a/plugins/Admin/src/Controller/DepositsController.php +++ b/plugins/Admin/src/Controller/DepositsController.php @@ -26,22 +26,12 @@ class DepositsController extends AdminAppController public function isAuthorized($user) { - switch ($this->getRequest()->getParam('action')) { - case 'overviewDiagram': - return Configure::read('app.isDepositEnabled') && $this->AppAuth->isSuperadmin(); - break; - case 'index': - case 'detail': - return Configure::read('app.isDepositEnabled') && $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin(); - break; - case 'myIndex': - case 'myDetail': - return Configure::read('app.isDepositEnabled') && $this->AppAuth->isManufacturer(); - break; - default: - return Configure::read('app.isDepositEnabled') && $this->AppAuth->isManufacturer(); - break; - } + return match($this->getRequest()->getParam('action')) { + 'overviewDiagram' => Configure::read('app.isDepositEnabled') && $this->AppAuth->isSuperadmin(), + 'index', 'detail' => Configure::read('app.isDepositEnabled') && $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin(), + 'myIndex', 'myDetail' => Configure::read('app.isDepositEnabled') && $this->AppAuth->isManufacturer(), + default => Configure::read('app.isDepositEnabled') && $this->AppAuth->isManufacturer(), + }; } /** diff --git a/plugins/Admin/src/Controller/ManufacturersController.php b/plugins/Admin/src/Controller/ManufacturersController.php index cd634e436c..a91600bd31 100644 --- a/plugins/Admin/src/Controller/ManufacturersController.php +++ b/plugins/Admin/src/Controller/ManufacturersController.php @@ -33,32 +33,15 @@ class ManufacturersController extends AdminAppController public function isAuthorized($user) { - switch ($this->getRequest()->getParam('action')) { - case 'profile': - case 'myOptions': - return $this->AppAuth->isManufacturer(); - break; - case 'index': - case 'add': - return $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin(); - break; - case 'edit': - case 'editOptions': - case 'getOrderListByProduct': - case 'getOrderListByCustomer': - case 'getInvoice': - return $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin(); - break; - case 'getDeliveryNote': - return Configure::read('appDb.FCS_PURCHASE_PRICE_ENABLED') && $this->AppAuth->isSuperadmin(); - break; - case 'getInvoice': - return !Configure::read('appDb.FCS_PURCHASE_PRICE_ENABLED') && !Configure::read('appDb.FCS_SEND_INVOICES_TO_CUSTOMERS') && ($this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin()); - break; - default: - return $this->AppAuth->user(); - break; - } + return match($this->getRequest()->getParam('action')) { + 'profile', 'myOptions' => $this->AppAuth->isManufacturer(), + 'index', 'add' => $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin(), + 'edit', 'editOptions', 'getOrderListByProduct', 'getOrderListByCustomer', 'getInvoice' => + $this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin(), + 'getDeliveryNote' => Configure::read('appDb.FCS_PURCHASE_PRICE_ENABLED') && $this->AppAuth->isSuperadmin(), + 'getInvoice' => !Configure::read('appDb.FCS_PURCHASE_PRICE_ENABLED') && !Configure::read('appDb.FCS_SEND_INVOICES_TO_CUSTOMERS') && ($this->AppAuth->isSuperadmin() || $this->AppAuth->isAdmin()), + default => $this->AppAuth->user(), + }; } public function beforeFilter(EventInterface $event) diff --git a/plugins/Admin/src/Controller/PaymentsController.php b/plugins/Admin/src/Controller/PaymentsController.php index 380a566b55..489be665b7 100644 --- a/plugins/Admin/src/Controller/PaymentsController.php +++ b/plugins/Admin/src/Controller/PaymentsController.php @@ -32,25 +32,13 @@ class PaymentsController extends AdminAppController public function isAuthorized($user) { - switch ($this->getRequest()->getParam('action')) { - case 'overview': - return Configure::read('app.htmlHelper')->paymentIsCashless() && $this->AppAuth->user() && ! $this->AppAuth->isManufacturer(); - break; - case 'product': - return $this->AppAuth->isSuperadmin(); - break; - case 'edit': - case 'previewEmail': - return $this->AppAuth->isSuperadmin(); - break; - case 'add': - case 'changeState': - return $this->AppAuth->user(); - break; - default: - return $this->AppAuth->user() && ! $this->AppAuth->isManufacturer(); - break; - } + return match($this->getRequest()->getParam('action')) { + 'overview' => Configure::read('app.htmlHelper')->paymentIsCashless() && $this->AppAuth->user() && ! $this->AppAuth->isManufacturer(), + 'product' => $this->AppAuth->isSuperadmin(), + 'edit', 'previewEmail' => $this->AppAuth->isSuperadmin(), + 'add', 'changeState' => $this->AppAuth->user(), + default => $this->AppAuth->user() && ! $this->AppAuth->isManufacturer(), + }; } public function beforeFilter(EventInterface $event) diff --git a/plugins/Admin/src/Controller/StatisticsController.php b/plugins/Admin/src/Controller/StatisticsController.php index 197a27015b..a722ed65a3 100644 --- a/plugins/Admin/src/Controller/StatisticsController.php +++ b/plugins/Admin/src/Controller/StatisticsController.php @@ -27,17 +27,11 @@ class StatisticsController extends AdminAppController public function isAuthorized($user) { - switch ($this->getRequest()->getParam('action')) { - case 'index': - return $this->AppAuth->isSuperadmin() || ($this->AppAuth->isAdmin() && Configure::read('app.showStatisticsForAdmins')); - break; - case 'myIndex': - return !Configure::read('appDb.FCS_SEND_INVOICES_TO_CUSTOMERS') && $this->AppAuth->isManufacturer(); - break; - default: - return $this->AppAuth->isManufacturer(); - break; - } + return match($this->getRequest()->getParam('action')) { + 'index' => $this->AppAuth->isSuperadmin() || ($this->AppAuth->isAdmin() && Configure::read('app.showStatisticsForAdmins')), + 'myIndex' => !Configure::read('appDb.FCS_SEND_INVOICES_TO_CUSTOMERS') && $this->AppAuth->isManufacturer(), + default => $this->AppAuth->isManufacturer(), + }; } /** diff --git a/plugins/Admin/templates/Reports/payments.php b/plugins/Admin/templates/Reports/payments.php index 955355bd33..970022e0d4 100644 --- a/plugins/Admin/templates/Reports/payments.php +++ b/plugins/Admin/templates/Reports/payments.php @@ -166,12 +166,10 @@ if ($showTextColumn) { echo ''; - switch ($paymentType) { - case 'deposit': - echo $this->Html->getManufacturerDepositPaymentText($payment->text); - break; - default: - echo $payment->text; + if ($paymentType == 'deposit') { + echo $this->Html->getManufacturerDepositPaymentText($payment->text); + } else { + echo $payment->text; } echo ''; } From 2e2488d193ee2b04005af9f86cbd8e12c0b79664 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 1 Dec 2022 08:43:13 +0100 Subject: [PATCH 343/646] tooltip on home for new products --- templates/Pages/home.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/templates/Pages/home.php b/templates/Pages/home.php index 7d68ee02bc..925108ae8c 100644 --- a/templates/Pages/home.php +++ b/templates/Pages/home.php @@ -44,7 +44,13 @@ Configure::read('app.jsNamespace').".Cart.initRemoveFromCartLinks();". Configure::read('app.jsNamespace').".Helper.setFutureOrderDetails('".addslashes(json_encode($appAuth->getFutureOrderDetails()))."');" ]); - + + if (Configure::read('app.showOrderedProductsTotalAmountInCatalog')) { + $this->element('addScript', ['script' => + Configure::read('app.jsNamespace') . ".Helper.initTooltip('.ordered-products-total-amount');" + ]); + } + $isFirstElement = empty($blogPosts) || $blogPosts->count() == 0; echo '

'; echo __('New_products'); From f542ddf235d75ba05749c13ab555b0150ffd750b Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 1 Dec 2022 10:35:20 +0100 Subject: [PATCH 344/646] vendor updates --- composer.lock | 114 +++++++++--------- plugins/Admin/templates/layout/default.php | 4 +- webroot/js/ckeditor/config-big.js | 2 +- .../js/ckeditor/config-small-with-upload.js | 2 +- webroot/js/ckeditor/config.js | 2 +- webroot/js/helper.js | 6 +- webroot/package-lock.json | 28 ++--- webroot/package.json | 4 +- 8 files changed, 84 insertions(+), 78 deletions(-) diff --git a/composer.lock b/composer.lock index 879d238c3b..7878b0458b 100644 --- a/composer.lock +++ b/composer.lock @@ -1377,26 +1377,27 @@ }, { "name": "maennchen/zipstream-php", - "version": "2.2.1", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/maennchen/ZipStream-PHP.git", - "reference": "211e9ba1530ea5260b45d90c9ea252f56ec52729" + "reference": "8df0a40fff7b5cbf86cf9a6d7d8d15b9bc03bc98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/211e9ba1530ea5260b45d90c9ea252f56ec52729", - "reference": "211e9ba1530ea5260b45d90c9ea252f56ec52729", + "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/8df0a40fff7b5cbf86cf9a6d7d8d15b9bc03bc98", + "reference": "8df0a40fff7b5cbf86cf9a6d7d8d15b9bc03bc98", "shasum": "" }, "require": { "myclabs/php-enum": "^1.5", - "php": "^7.4 || ^8.0", + "php": "^8.0", "psr/http-message": "^1.0", "symfony/polyfill-mbstring": "^1.0" }, "require-dev": { "ext-zip": "*", + "friendsofphp/php-cs-fixer": "^3.9", "guzzlehttp/guzzle": "^6.5.3 || ^7.2.0", "mikey179/vfsstream": "^1.6", "php-coveralls/php-coveralls": "^2.4", @@ -1438,15 +1439,19 @@ ], "support": { "issues": "https://github.com/maennchen/ZipStream-PHP/issues", - "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.2.1" + "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.3.0" }, "funding": [ + { + "url": "https://github.com/maennchen", + "type": "github" + }, { "url": "https://opencollective.com/zipstream", "type": "open_collective" } ], - "time": "2022-05-18T15:52:06+00:00" + "time": "2022-11-28T12:13:34+00:00" }, { "name": "markbaker/complex", @@ -2715,16 +2720,16 @@ }, { "name": "symfony/config", - "version": "v6.1.3", + "version": "v6.2.0", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "a0645dc585d378b73c01115dd7ab9348f7d40c85" + "reference": "ebf27792246165a2a0b6b69ec9c620cac8c5a2f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/a0645dc585d378b73c01115dd7ab9348f7d40c85", - "reference": "a0645dc585d378b73c01115dd7ab9348f7d40c85", + "url": "https://api.github.com/repos/symfony/config/zipball/ebf27792246165a2a0b6b69ec9c620cac8c5a2f0", + "reference": "ebf27792246165a2a0b6b69ec9c620cac8c5a2f0", "shasum": "" }, "require": { @@ -2772,7 +2777,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v6.1.3" + "source": "https://github.com/symfony/config/tree/v6.2.0" }, "funding": [ { @@ -2788,20 +2793,20 @@ "type": "tidelift" } ], - "time": "2022-07-20T15:00:40+00:00" + "time": "2022-11-02T09:08:04+00:00" }, { "name": "symfony/console", - "version": "v6.1.7", + "version": "v6.2.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a1282bd0c096e0bdb8800b104177e2ce404d8815" + "reference": "75d4749d9620a8fa21a2d2847800a84b5c4e7682" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a1282bd0c096e0bdb8800b104177e2ce404d8815", - "reference": "a1282bd0c096e0bdb8800b104177e2ce404d8815", + "url": "https://api.github.com/repos/symfony/console/zipball/75d4749d9620a8fa21a2d2847800a84b5c4e7682", + "reference": "75d4749d9620a8fa21a2d2847800a84b5c4e7682", "shasum": "" }, "require": { @@ -2868,7 +2873,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.1.7" + "source": "https://github.com/symfony/console/tree/v6.2.0" }, "funding": [ { @@ -2884,7 +2889,7 @@ "type": "tidelift" } ], - "time": "2022-10-26T21:42:49+00:00" + "time": "2022-11-29T16:44:51+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2955,16 +2960,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.1.5", + "version": "v6.2.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "4d216a2beef096edf040a070117c39ca2abce307" + "reference": "50b2523c874605cf3d4acf7a9e2b30b6a440a016" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/4d216a2beef096edf040a070117c39ca2abce307", - "reference": "4d216a2beef096edf040a070117c39ca2abce307", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/50b2523c874605cf3d4acf7a9e2b30b6a440a016", + "reference": "50b2523c874605cf3d4acf7a9e2b30b6a440a016", "shasum": "" }, "require": { @@ -2998,7 +3003,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.1.5" + "source": "https://github.com/symfony/filesystem/tree/v6.2.0" }, "funding": [ { @@ -3014,7 +3019,7 @@ "type": "tidelift" } ], - "time": "2022-09-21T20:29:40+00:00" + "time": "2022-11-20T13:01:27+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3433,16 +3438,16 @@ }, { "name": "symfony/string", - "version": "v6.1.7", + "version": "v6.2.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "823f143370880efcbdfa2dbca946b3358c4707e5" + "reference": "145702685e0d12f81d755c71127bfff7582fdd36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/823f143370880efcbdfa2dbca946b3358c4707e5", - "reference": "823f143370880efcbdfa2dbca946b3358c4707e5", + "url": "https://api.github.com/repos/symfony/string/zipball/145702685e0d12f81d755c71127bfff7582fdd36", + "reference": "145702685e0d12f81d755c71127bfff7582fdd36", "shasum": "" }, "require": { @@ -3458,6 +3463,7 @@ "require-dev": { "symfony/error-handler": "^5.4|^6.0", "symfony/http-client": "^5.4|^6.0", + "symfony/intl": "^6.2", "symfony/translation-contracts": "^2.0|^3.0", "symfony/var-exporter": "^5.4|^6.0" }, @@ -3498,7 +3504,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.1.7" + "source": "https://github.com/symfony/string/tree/v6.2.0" }, "funding": [ { @@ -3514,7 +3520,7 @@ "type": "tidelift" } ], - "time": "2022-10-10T09:34:31+00:00" + "time": "2022-11-30T17:13:47+00:00" }, { "name": "tecnickcom/tcpdf", @@ -3813,16 +3819,16 @@ }, { "name": "cakephp/debug_kit", - "version": "4.9.1", + "version": "4.9.2", "source": { "type": "git", "url": "https://github.com/cakephp/debug_kit.git", - "reference": "ebbbf09762132b4bcce93f3b80cffcf6c9538125" + "reference": "c6590fca606783bce5b0564a2997cd76042cf652" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/ebbbf09762132b4bcce93f3b80cffcf6c9538125", - "reference": "ebbbf09762132b4bcce93f3b80cffcf6c9538125", + "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/c6590fca606783bce5b0564a2997cd76042cf652", + "reference": "c6590fca606783bce5b0564a2997cd76042cf652", "shasum": "" }, "require": { @@ -3875,7 +3881,7 @@ "issues": "https://github.com/cakephp/debug_kit/issues", "source": "https://github.com/cakephp/debug_kit" }, - "time": "2022-11-13T03:21:51+00:00" + "time": "2022-11-26T08:47:15+00:00" }, { "name": "cakephp/twig-view", @@ -7065,16 +7071,16 @@ }, { "name": "symfony/finder", - "version": "v6.1.3", + "version": "v6.2.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709" + "reference": "eb2355f69519e4ef33f1835bca4c935f5d42e570" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/39696bff2c2970b3779a5cac7bf9f0b88fc2b709", - "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709", + "url": "https://api.github.com/repos/symfony/finder/zipball/eb2355f69519e4ef33f1835bca4c935f5d42e570", + "reference": "eb2355f69519e4ef33f1835bca4c935f5d42e570", "shasum": "" }, "require": { @@ -7109,7 +7115,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.1.3" + "source": "https://github.com/symfony/finder/tree/v6.2.0" }, "funding": [ { @@ -7125,7 +7131,7 @@ "type": "tidelift" } ], - "time": "2022-07-29T07:42:06+00:00" + "time": "2022-10-09T08:55:40+00:00" }, { "name": "symfony/polyfill-php73", @@ -7291,16 +7297,16 @@ }, { "name": "symfony/process", - "version": "v6.1.3", + "version": "v6.2.0", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "a6506e99cfad7059b1ab5cab395854a0a0c21292" + "reference": "ba6e55359f8f755fe996c58a81e00eaa67a35877" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/a6506e99cfad7059b1ab5cab395854a0a0c21292", - "reference": "a6506e99cfad7059b1ab5cab395854a0a0c21292", + "url": "https://api.github.com/repos/symfony/process/zipball/ba6e55359f8f755fe996c58a81e00eaa67a35877", + "reference": "ba6e55359f8f755fe996c58a81e00eaa67a35877", "shasum": "" }, "require": { @@ -7332,7 +7338,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.1.3" + "source": "https://github.com/symfony/process/tree/v6.2.0" }, "funding": [ { @@ -7348,20 +7354,20 @@ "type": "tidelift" } ], - "time": "2022-06-27T17:24:16+00:00" + "time": "2022-11-02T09:08:04+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.1.6", + "version": "v6.2.0", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "0f0adde127f24548e23cbde83bcaeadc491c551f" + "reference": "6228b11059d7b279be699682f164a107ba9a268d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0f0adde127f24548e23cbde83bcaeadc491c551f", - "reference": "0f0adde127f24548e23cbde83bcaeadc491c551f", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6228b11059d7b279be699682f164a107ba9a268d", + "reference": "6228b11059d7b279be699682f164a107ba9a268d", "shasum": "" }, "require": { @@ -7420,7 +7426,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.1.6" + "source": "https://github.com/symfony/var-dumper/tree/v6.2.0" }, "funding": [ { @@ -7436,7 +7442,7 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:04:03+00:00" + "time": "2022-11-28T13:41:56+00:00" }, { "name": "theseer/tokenizer", diff --git a/plugins/Admin/templates/layout/default.php b/plugins/Admin/templates/layout/default.php index 7caa32737f..beba6ee050 100644 --- a/plugins/Admin/templates/layout/default.php +++ b/plugins/Admin/templates/layout/default.php @@ -91,8 +91,8 @@ ); } -echo $this->Html->script('/node_modules/ckeditor4/ckeditor.js?v4.20.0'); -echo $this->Html->script('/node_modules/ckeditor4/adapters/jquery.js?v4.20.0'); +echo $this->Html->script('/node_modules/ckeditor4/ckeditor.js?v4.20.1'); +echo $this->Html->script('/node_modules/ckeditor4/adapters/jquery.js?v4.20.1'); $scripts = $this->fetch('script'); if ($scripts != '') { diff --git a/webroot/js/ckeditor/config-big.js b/webroot/js/ckeditor/config-big.js index 285d8d8eab..4ecde62783 100644 --- a/webroot/js/ckeditor/config-big.js +++ b/webroot/js/ckeditor/config-big.js @@ -42,5 +42,5 @@ CKEDITOR.editorConfig = function ( config ) { }; -CKEDITOR.timestamp = 'v4.20.0'; // change this string if version is updated in package.json +CKEDITOR.timestamp = 'v4.20.1'; // change this string if version is updated in package.json diff --git a/webroot/js/ckeditor/config-small-with-upload.js b/webroot/js/ckeditor/config-small-with-upload.js index 3b08ecf53c..17d75b5d3f 100644 --- a/webroot/js/ckeditor/config-small-with-upload.js +++ b/webroot/js/ckeditor/config-small-with-upload.js @@ -37,4 +37,4 @@ CKEDITOR.editorConfig = function ( config ) { }; -CKEDITOR.timestamp = 'v4.20.0'; // change this string if version is updated in package.json +CKEDITOR.timestamp = 'v4.20.1'; // change this string if version is updated in package.json diff --git a/webroot/js/ckeditor/config.js b/webroot/js/ckeditor/config.js index c0c1a233c2..a49de8b413 100644 --- a/webroot/js/ckeditor/config.js +++ b/webroot/js/ckeditor/config.js @@ -29,5 +29,5 @@ CKEDITOR.editorConfig = function ( config ) { }; -CKEDITOR.timestamp = 'v4.20.0'; // change this string if version is updated in package.json +CKEDITOR.timestamp = 'v4.20.1'; // change this string if version is updated in package.json diff --git a/webroot/js/helper.js b/webroot/js/helper.js index a538c31a71..1837bd81df 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -760,7 +760,7 @@ foodcoopshop.Helper = { this.destroyCkeditor(name); - CKEDITOR.timestamp = 'v4.20.0'; + CKEDITOR.timestamp = 'v4.20.1'; $('textarea#' + name + '.ckeditor').ckeditor({ customConfig: '/js/ckeditor/config.js', startupFocus : startupFocus @@ -789,7 +789,7 @@ foodcoopshop.Helper = { this.destroyCkeditor(name); - CKEDITOR.timestamp = 'v4.20.0'; + CKEDITOR.timestamp = 'v4.20.1'; $('textarea#' + name + '.ckeditor').ckeditor({ customConfig: '/js/ckeditor/config-big.js' }); @@ -804,7 +804,7 @@ foodcoopshop.Helper = { this.destroyCkeditor(name); - CKEDITOR.timestamp = 'v4.20.0'; + CKEDITOR.timestamp = 'v4.20.1'; $('textarea#' + name + '.ckeditor').ckeditor({ customConfig: '/js/ckeditor/config-small-with-upload.js' }); diff --git a/webroot/package-lock.json b/webroot/package-lock.json index fdf69a9c8b..e7c6729015 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -8,7 +8,7 @@ "hasInstallScript": true, "license": "AGPL-3.0", "dependencies": { - "@beyonk/gdpr-cookie-consent-banner": "^9.0.4", + "@beyonk/gdpr-cookie-consent-banner": "^9.1.0", "@ericblade/quagga2": "^1.7.7", "@fortawesome/fontawesome-free": "^6.2.1", "blueimp-file-upload": "^10.32.0", @@ -16,7 +16,7 @@ "bootstrap-select": "^1.14.0-beta3", "chart.js": "^3.9.1", "chartjs-plugin-datalabels": "^2.1.0", - "ckeditor4": "^4.20.0", + "ckeditor4": "^4.20.1", "clean-css-cli": "^5.6.1", "clipboard": "^2.0.11", "jquery": "^3.6.1", @@ -46,9 +46,9 @@ } }, "node_modules/@beyonk/gdpr-cookie-consent-banner": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/@beyonk/gdpr-cookie-consent-banner/-/gdpr-cookie-consent-banner-9.0.4.tgz", - "integrity": "sha512-8rs38BbzTIRNVz043EPstVqsxTVOfVczQMpHDeGlWF1BVKaqs1k4pufNDcw5FUKQxoOkdGF32EK+2UxNx15YBA==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/@beyonk/gdpr-cookie-consent-banner/-/gdpr-cookie-consent-banner-9.1.0.tgz", + "integrity": "sha512-Kz9OrBZBL+M1AaV1Xf60fkjhjqXLXzAzkpVZ4JzVeH1/dXsAybub1hocev7Niaqw+W9cDt0XYnRacLAaN1miKQ==", "dependencies": { "js-cookie": "^3.0.1" } @@ -287,9 +287,9 @@ } }, "node_modules/ckeditor4": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/ckeditor4/-/ckeditor4-4.20.0.tgz", - "integrity": "sha512-Wa7OzaRXN6qRQ0IxIcX4CjZ5qxNlNqIbdQnBf9sxVEx22kTTsAaE5ePT+TpME0rJhLdCwAIRnbjRCJoGcp05oA==" + "version": "4.20.1", + "resolved": "https://registry.npmjs.org/ckeditor4/-/ckeditor4-4.20.1.tgz", + "integrity": "sha512-OywaO5CC6n5NcY98Fi4Llc/h9rgmn8uHwEIfWxulVKpu0UCdL8x9p6xCfo/ZfgQN6FTS/eZcP7XzKMuokRN+mQ==" }, "node_modules/clean-css": { "version": "5.3.1", @@ -1141,9 +1141,9 @@ } }, "@beyonk/gdpr-cookie-consent-banner": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/@beyonk/gdpr-cookie-consent-banner/-/gdpr-cookie-consent-banner-9.0.4.tgz", - "integrity": "sha512-8rs38BbzTIRNVz043EPstVqsxTVOfVczQMpHDeGlWF1BVKaqs1k4pufNDcw5FUKQxoOkdGF32EK+2UxNx15YBA==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/@beyonk/gdpr-cookie-consent-banner/-/gdpr-cookie-consent-banner-9.1.0.tgz", + "integrity": "sha512-Kz9OrBZBL+M1AaV1Xf60fkjhjqXLXzAzkpVZ4JzVeH1/dXsAybub1hocev7Niaqw+W9cDt0XYnRacLAaN1miKQ==", "requires": { "js-cookie": "^3.0.1" } @@ -1316,9 +1316,9 @@ } }, "ckeditor4": { - "version": "4.20.0", - "resolved": "https://registry.npmjs.org/ckeditor4/-/ckeditor4-4.20.0.tgz", - "integrity": "sha512-Wa7OzaRXN6qRQ0IxIcX4CjZ5qxNlNqIbdQnBf9sxVEx22kTTsAaE5ePT+TpME0rJhLdCwAIRnbjRCJoGcp05oA==" + "version": "4.20.1", + "resolved": "https://registry.npmjs.org/ckeditor4/-/ckeditor4-4.20.1.tgz", + "integrity": "sha512-OywaO5CC6n5NcY98Fi4Llc/h9rgmn8uHwEIfWxulVKpu0UCdL8x9p6xCfo/ZfgQN6FTS/eZcP7XzKMuokRN+mQ==" }, "clean-css": { "version": "5.3.1", diff --git a/webroot/package.json b/webroot/package.json index 4530daf3d1..2fab22e6c1 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -14,7 +14,7 @@ "install": "bash ../devtools/npm-post-install.sh" }, "dependencies": { - "@beyonk/gdpr-cookie-consent-banner": "^9.0.4", + "@beyonk/gdpr-cookie-consent-banner": "^9.1.0", "@ericblade/quagga2": "^1.7.7", "@fortawesome/fontawesome-free": "^6.2.1", "blueimp-file-upload": "^10.32.0", @@ -22,7 +22,7 @@ "bootstrap-select": "^1.14.0-beta3", "chart.js": "^3.9.1", "chartjs-plugin-datalabels": "^2.1.0", - "ckeditor4": "^4.20.0", + "ckeditor4": "^4.20.1", "clean-css-cli": "^5.6.1", "clipboard": "^2.0.11", "jquery": "^3.6.1", From d91964c6438a37557546898592958072d6ed4606 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 3 Dec 2022 16:38:51 +0100 Subject: [PATCH 345/646] fix if delivery break enabled --- src/Model/Table/OrderDetailsTable.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Model/Table/OrderDetailsTable.php b/src/Model/Table/OrderDetailsTable.php index 3f50d4e437..0e78fe9c62 100644 --- a/src/Model/Table/OrderDetailsTable.php +++ b/src/Model/Table/OrderDetailsTable.php @@ -184,6 +184,11 @@ public function addLastMonthsCondition($query, $firstDayOfLastOrderMonth, $lastM public function getTotalOrderDetails(string $pickupDay, int $productId, int $attributeId) { + + if ($pickupDay == 'delivery-rhythm-triggered-delivery-break') { + return null; + } + $query = $this->find('all', [ 'conditions' => [ 'OrderDetails.pickup_day' => $pickupDay, From 0c798776349f6ff2c88213b9908b0f0e0a19d1b9 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 4 Dec 2022 20:09:48 +0100 Subject: [PATCH 346/646] add user property dark_mode_enabled --- config/Migrations/20221204185634_DarkMode.php | 26 ++++++++++++++++++ config/Migrations/schema-dump-default.lock | Bin 98105 -> 94912 bytes config/Seeds/tests/InitTestDataSeed.php | 14 +++++----- ...ducts-for-demo-vegetable-manufacturer.json | 1 + src/Controller/Component/AppAuthComponent.php | 5 ++++ 5 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 config/Migrations/20221204185634_DarkMode.php diff --git a/config/Migrations/20221204185634_DarkMode.php b/config/Migrations/20221204185634_DarkMode.php new file mode 100644 index 0000000000..459b4cb07e --- /dev/null +++ b/config/Migrations/20221204185634_DarkMode.php @@ -0,0 +1,26 @@ +table('fcs_customer'); + $table->addColumn('dark_mode_enabled', 'tinyinteger', [ + 'default' => '0', + 'limit' => null, + 'null' => true, + 'signed' => false, + ]); + $table->update(); + } +} diff --git a/config/Migrations/schema-dump-default.lock b/config/Migrations/schema-dump-default.lock index 16b495610732ff493e4407ccfbd76c96bf4234c5..393babc51fb316ca4e44c84b2c260b31d181d2df 100644 GIT binary patch delta 658 zcmY*XO=uHg5M^po%@5h8O}4eQLZc}PHD;5hKbwPph)J|fMX^YfbxF2KY@5X0tr}_@ zLBWfM$bcV$V2X-(P>g$6El6_ppyp&N>djsh)PpC5;AS-yZ{N(D_vX#a_q=Ybt{DwH z>mMx}d`|Na>*5m$QII4h=u|C)n}>r~&C|+Q-(*W8vf@o{tMYnVVS5J?U|n%u7Lr*p z&*gYg$jD^L4Ia$VCM<^BHbzs+%m`Dmm`K-~ z5ODn2DXcwh!{X+B+7z8S#fhF@cBP(Q+CWJxGt9dFm6tE|k_kJ|?S6J%!v?ka<|H{g zD~KGvSUBDOUuGtoOlSVsi!J&cBdjZ(;MVJNyd+(~^2%aSyC|WH(FYC&Q*~DC2#)r;e!va}#!vVbKl+KOTXf`cwZ(__ef=#G+tR=_pLOVBt5= C0P%(Z delta 1073 zcmZXSTWAw$6vsI>_ZFMjq_swEGDfAPHc2mDM(|oMO{G>5Uy6-m@})-8nQ<~ByOwH& zvXoWXm4kc=KD3Iv2)m+=Fj_&U58{hr^~FLF^g-Vg^hNZcIx|Tm=-YSh|MNSa{?>kP z&Tiw__Sh|3YXC=eui72>uM%(iwqb8`Eq3>ZXl^ZRSMP>D0u613CX7UC)OX8r5&Jrp z$)>S?XUf&VGJK9?WD0%YM?J9!E4psr)x;X=mB5W+!iTOzxN)Khj5l;z&VvgX%qQ70n-UAZJ=P_RI$KeZg7#nS;(>&DU&3~5LGscAp z`sQt>Bb{)f+Bm-HF?c5jjT$<&9_r{pFVtdefsM|EA%dG$)R?;IHo*WW>~AqO?V!&c zumr^y!Ge0zWnvJetRQ9O-|user('dark_mode_enabled'); + } + public function getGroupId() { return $this->user('id_default_group'); From 066eb3667402c0f20dcb1406a549edfa94be3676 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 4 Dec 2022 21:32:05 +0100 Subject: [PATCH 347/646] first rough dark mode design --- config/asset_compress.ini | 1 + src/Controller/Component/AppAuthComponent.php | 2 +- templates/element/userMenu.php | 18 +++++-- webroot/css/dark-mode.css | 48 +++++++++++++++++++ webroot/css/frontend.css | 6 ++- webroot/js/helper.js | 15 ++++++ 6 files changed, 83 insertions(+), 7 deletions(-) create mode 100644 webroot/css/dark-mode.css diff --git a/config/asset_compress.ini b/config/asset_compress.ini index c3aca27029..ddb4a750d4 100644 --- a/config/asset_compress.ini +++ b/config/asset_compress.ini @@ -34,6 +34,7 @@ files[] = self-service.css files[] = feedback.css files[] = frontend.css files[] = print.css +files[] = dark-mode.css [frontend.js] files[] = 'App\Assets\AssetsProvider::getJsFilesBase()' diff --git a/src/Controller/Component/AppAuthComponent.php b/src/Controller/Component/AppAuthComponent.php index 85ecfc6a59..805ee8cead 100644 --- a/src/Controller/Component/AppAuthComponent.php +++ b/src/Controller/Component/AppAuthComponent.php @@ -72,7 +72,7 @@ public function getAbbreviatedUserName() return $result; } - public function getDarkModeEnabled() + public function isDarkModeEnabled() { return $this->user('dark_mode_enabled'); } diff --git a/templates/element/userMenu.php b/templates/element/userMenu.php index 87c8ae41af..c17bd939ed 100644 --- a/templates/element/userMenu.php +++ b/templates/element/userMenu.php @@ -35,6 +35,14 @@ } if ($appAuth->user()) { + $this->element('addScript', [ + 'script' => Configure::read('app.jsNamespace') . ".Helper.initThemeSwitcher();" + ]); + if ($appAuth->isDarkModeEnabled()) { + $menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw fas fa-moon', 'class' => ['theme']]]; + } else { + $menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw fas fa-sun', 'class' => ['theme']]]; + } if (!$appAuth->isOrderForDifferentCustomerMode()) { $menu[] = ['slug' => $profileSlug, 'name' => $userName, 'options' => ['fa-icon' => 'ok fa-fw fa-user']]; } @@ -44,11 +52,11 @@ } if ($appAuth->user() && !$appAuth->isCustomer() && !$appAuth->isOrderForDifferentCustomerMode()) { - $menu[0]['children'][] = ['slug' => $this->Slug->getAdminHome(), 'name' => $adminName, 'options' => ['fa-icon' => 'ok fa-fw fa-gear']]; + $menu[1]['children'][] = ['slug' => $this->Slug->getAdminHome(), 'name' => $adminName, 'options' => ['fa-icon' => 'ok fa-fw fa-gear']]; } if ($appAuth->isCustomer()) { - $menu[0]['children'] = $this->Menu->getCustomerMenuElements($appAuth); + $menu[1]['children'] = $this->Menu->getCustomerMenuElements($appAuth); } if (!$appAuth->isOrderForDifferentCustomerMode()) { @@ -67,13 +75,13 @@ $authMenuElement = $this->Menu->getAuthMenuElement($appAuth); if ($appAuth->user()) { if (!is_null($selfServiceMenuElement)) { - $menu[0]['children'][] = $selfServiceMenuElement; + $menu[1]['children'][] = $selfServiceMenuElement; } - $menu[0]['children'][] = $authMenuElement; + $menu[1]['children'][] = $authMenuElement; } else { $menu[] = $authMenuElement; if (!is_null($selfServiceMenuElement)) { - $menu[0]['children'][] = $selfServiceMenuElement; + $menu[1]['children'][] = $selfServiceMenuElement; } } diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css new file mode 100644 index 0000000000..5720bba5d1 --- /dev/null +++ b/webroot/css/dark-mode.css @@ -0,0 +1,48 @@ +/** + * FoodCoopShop - The open source software for your foodcoop + * + * Licensed under the GNU Affero General Public License version 3 + * For full copyright and license information, please see LICENSE + * Redistributions of files must retain the above copyright notice. + * + * @since FoodCoopShop 3.6.0 + * @license https://opensource.org/licenses/AGPL-3.0 + * @author Mario Rothauer + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ + :root { + --main-bg-color: #1b1b1b; + --main-font-color: #CDCDCD; +} +body.dark { + background-image: none; + background-color: var(--main-bg-color); + color: var(--main-font-color); +} +body.dark #header, +body.dark #content, +body.dark .sidebar, +body.dark .box, +body.dark #main-menu li ul, +body.dark #user-menu li ul, +body.dark #inner-content { + background-color: var(--main-bg-color); +} +body.dark .vertical.menu a { + background-color: var(--main-bg-color) ! important; +} +body.dark .btn-outline-light, +body.dark select, +body.dark input { + background-color: var(--main-bg-color); + color: var(--main-font-color); +} +body.dark #main-menu li > a, +body.dark #user-menu li > a, +body.dark a.blog-post-wrapper span { + color: var(--main-font-color); +} +body.dark .vertical.menu a { + color: var(--main-font-color) ! important; +} diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index c90d741453..5706953129 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -218,9 +218,13 @@ body.categories.detail div.description-wrapper { #user-menu li > a { color: #333; } -#user-menu i.fa-user { +#user-menu i.fa-user, +#user-menu .theme i { padding-right: 5px; } +#user-menu .theme { + margin-right: 5px; +} #user-menu > li { padding-bottom: 5px; } diff --git a/webroot/js/helper.js b/webroot/js/helper.js index 1837bd81df..460782668e 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -33,6 +33,21 @@ foodcoopshop.Helper = { } }, + initThemeSwitcher: function() { + $('#user-menu .theme').on('click', function() { + var icon = $(this).find('i'); + if ($('body').hasClass('dark')) { + $('body').removeClass('dark'); + icon.removeClass('fa-moon'); + icon.addClass('fa-sun'); + } else { + $('body').addClass('dark'); + icon.removeClass('fa-sun'); + icon.addClass('fa-moon'); + } + }).trigger('click'); + }, + initRegistrationAsCompany: function() { var isCompanyCheckbox = $('#customers-is-company'); From 82f50ad5b847032ed4e1f586e19010e227399822 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 4 Dec 2022 21:56:12 +0100 Subject: [PATCH 348/646] 2nd bg color --- webroot/css/dark-mode.css | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 5720bba5d1..4546f4f475 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -13,6 +13,7 @@ */ :root { --main-bg-color: #1b1b1b; + --2nd-bg-color: #0d1117; --main-font-color: #CDCDCD; } body.dark { @@ -24,20 +25,28 @@ body.dark #header, body.dark #content, body.dark .sidebar, body.dark .box, -body.dark #main-menu li ul, -body.dark #user-menu li ul, body.dark #inner-content { background-color: var(--main-bg-color); } +body.dark #main-menu li ul, +body.dark #user-menu li ul { + background-color: var(--2nd-bg-color); +} body.dark .vertical.menu a { background-color: var(--main-bg-color) ! important; } body.dark .btn-outline-light, body.dark select, +body.dark #product-search input, body.dark input { - background-color: var(--main-bg-color); + background-color: var(--2nd-bg-color); color: var(--main-font-color); } +body.dark .btn-outline-light:hover, +body.dark .btn-outline-light:active:focus { + background-color: var(--2nd-bg-color) ! important; + opacity: .7; +} body.dark #main-menu li > a, body.dark #user-menu li > a, body.dark a.blog-post-wrapper span { @@ -46,3 +55,10 @@ body.dark a.blog-post-wrapper span { body.dark .vertical.menu a { color: var(--main-font-color) ! important; } +body.dark a.blog-post-wrapper { + background-color: var(--2nd-bg-color); +} +body.dark .swiper-button-prev:after, +body.dark .swiper-button-next:after { + color: var(--main-bg-color); +} \ No newline at end of file From 28dd82d1ebe4203b865e61fc196a5dc494a02992 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 11:26:41 +0100 Subject: [PATCH 349/646] adapt bg image --- config/asset_compress.ini | 1 + webroot/css/dark-mode.css | 1 - webroot/css/global.css | 1 - webroot/js/background-image.js | 30 ++++++++++++++++++++++++++++++ webroot/js/helper.js | 6 ++++++ 5 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 webroot/js/background-image.js diff --git a/config/asset_compress.ini b/config/asset_compress.ini index ddb4a750d4..7942c46dd0 100644 --- a/config/asset_compress.ini +++ b/config/asset_compress.ini @@ -45,6 +45,7 @@ files[] = scrolltofixed/jquery-scrolltofixed.js files[] = swiper/swiper-bundle.js files[] = webrtc-adapter/out/adapter.js files[] = @ericblade/quagga2/dist/quagga.min.js +files[] = background-image.js files[] = helper.js files[] = self-service.js files[] = cart.js diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 4546f4f475..6b7d695f4c 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -17,7 +17,6 @@ --main-font-color: #CDCDCD; } body.dark { - background-image: none; background-color: var(--main-bg-color); color: var(--main-font-color); } diff --git a/webroot/css/global.css b/webroot/css/global.css index e8d917ceb8..0b93c24bca 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -21,7 +21,6 @@ body { color: #333333; background-attachment: fixed; background-color: #e6e6e6; - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='600' height='600' viewBox='0 0 600 600'%3E%3Cpath fill='%23cccccc' fill-opacity='0.33' d='M600 325.1v-1.17c-6.5 3.83-13.06 7.64-14.68 8.64-10.6 6.56-18.57 12.56-24.68 19.09-5.58 5.95-12.44 10.06-22.42 14.15-1.45.6-2.96 1.2-4.83 1.9l-4.75 1.82c-9.78 3.75-14.8 6.27-18.98 10.1-4.23 3.88-9.65 6.6-16.77 8.84-1.95.6-3.99 1.17-6.47 1.8l-6.14 1.53c-5.29 1.35-8.3 2.37-10.54 3.78-3.08 1.92-6.63 3.26-12.74 5.03a384.1 384.1 0 0 1-4.82 1.36c-2.04.58-3.6 1.04-5.17 1.52a110.03 110.03 0 0 0-11.2 4.05c-2.7 1.15-5.5 3.93-8.78 8.4a157.68 157.68 0 0 0-6.15 9.2c-5.75 9.07-7.58 11.74-10.24 14.51a50.97 50.97 0 0 1-4.6 4.22c-2.33 1.9-10.39 7.54-11.81 8.74a14.68 14.68 0 0 0-3.67 4.15c-1.24 2.3-1.9 4.57-2.78 8.87-2.17 10.61-3.52 14.81-8.2 22.1-4.07 6.33-6.8 9.88-9.83 12.99-.47.48-.95.96-1.5 1.48l-3.75 3.56c-1.67 1.6-3.18 3.12-4.86 4.9a42.44 42.44 0 0 0-9.89 16.94c-2.5 8.13-2.72 15.47-1.76 27.22.47 5.82.51 6.36.51 8.18 0 10.51.12 17.53.63 25.78.24 4.05.56 7.8.97 11.22h.9c-1.13-9.58-1.5-21.83-1.5-37 0-1.86-.04-2.4-.52-8.26-.94-11.63-.72-18.87 1.73-26.85a41.44 41.44 0 0 1 9.65-16.55c1.67-1.76 3.18-3.27 4.83-4.85.63-.6 3.13-2.96 3.75-3.57a71.6 71.6 0 0 0 1.52-1.5c3.09-3.16 5.86-6.76 9.96-13.15 4.77-7.42 6.15-11.71 8.34-22.44.86-4.21 1.5-6.4 2.68-8.6.68-1.25 1.79-2.48 3.43-3.86 1.38-1.15 9.43-6.8 11.8-8.72 1.71-1.4 3.26-2.81 4.7-4.3 2.72-2.85 4.56-5.54 10.36-14.67a156.9 156.9 0 0 1 6.1-9.15c3.2-4.33 5.9-7.01 8.37-8.07 3.5-1.5 7.06-2.77 11.1-4.02a233.84 233.84 0 0 1 7.6-2.2l2.38-.67c6.19-1.79 9.81-3.16 12.98-5.15 2.14-1.33 5.08-2.33 10.27-3.65l6.14-1.53c2.5-.63 4.55-1.2 6.52-1.82 7.24-2.27 12.79-5.06 17.15-9.05 4.05-3.72 9-6.2 18.66-9.9l4.75-1.82c1.87-.72 3.39-1.31 4.85-1.91 10.1-4.15 17.07-8.32 22.76-14.4 6.05-6.45 13.95-12.4 24.49-18.92 1.56-.96 7.82-4.6 14.15-8.33v-64.58c-4 8.15-8.52 14.85-12.7 17.9-2.51 1.82-5.38 4.02-9.04 6.92a1063.87 1063.87 0 0 0-6.23 4.98l-1.27 1.02a2309.25 2309.25 0 0 1-4.87 3.9c-7.55 6-12.9 10.05-17.61 13.19-3.1 2.06-3.86 2.78-8.06 7.13-5.84 6.07-11.72 8.62-29.15 10.95-11.3 1.5-20.04 4.91-30.75 11.07-1.65.94-7.27 4.27-6.97 4.1-2.7 1.58-4.69 2.69-6.64 3.66-5.63 2.8-10.47 4.17-15.71 4.17-17.13 0-41.44 11.51-51.63 22.83-12.05 13.4-31.42 27.7-45.25 31.16-7.4 1.85-11.85 7.05-14.04 14.69-1.26 4.4-1.58 8.28-1.58 13.82 0 .82.01.98.24 3.63.45 5.18.35 8.72-.77 13.26-1.53 6.2-4.89 12.6-10.59 19.43-13.87 16.65-22.88 46.58-22.88 71.68 0 2.39.02 4.26.06 8.75.12 10.8.1 15.8-.22 21.95-.56 11.18-2.09 20.73-5 29.3h-1.05c2.94-8.56 4.49-18.12 5.05-29.35.31-6.13.34-11.1.22-21.9-.04-4.48-.06-6.36-.06-8.75 0-25.32 9.07-55.47 23.12-72.32 5.6-6.72 8.88-12.99 10.38-19.03 1.09-4.4 1.18-7.85.74-12.93-.23-2.7-.24-2.86-.24-3.72 0-5.62.32-9.57 1.62-14.1 2.28-7.95 6.97-13.44 14.76-15.39 13.6-3.4 32.82-17.59 44.75-30.84C409 360.14 433.58 348.5 451 348.5c5.07 0 9.77-1.33 15.26-4.07 1.93-.96 3.9-2.05 6.58-3.62-.3.18 5.33-3.16 6.98-4.11 10.82-6.21 19.66-9.67 31.11-11.2 17.23-2.3 22.9-4.75 28.57-10.64 4.25-4.41 5.04-5.16 8.22-7.28 4.68-3.11 10.01-7.14 17.55-13.14a1113.33 1113.33 0 0 0 4.86-3.89l1.28-1.02a4668.54 4668.54 0 0 1 6.23-4.98c3.67-2.9 6.55-5.12 9.07-6.95 4.37-3.19 9.16-10.56 13.29-19.4v66.9zm0-116.23c-.62.01-1.27.06-1.95.13-6.13.63-13.83 3.45-21.83 7.45-3.64 1.82-8.46 2.67-14.17 2.71-4.7.04-9.72-.47-14.73-1.33-1.7-.3-3.26-.61-4.67-.93a31.55 31.55 0 0 0-3.55-.57 273.4 273.4 0 0 0-16.66-.88c-10.42-.16-17.2.74-17.97 2.73-.38.97.6 2.55 3.03 4.87 1.01.97 2.22 2.03 4.04 3.55a1746.07 1746.07 0 0 0 4.79 4.02c1.39 1.2 3.1 1.92 5.5 2.5.7.16.86.2 2.64.54 3.53.7 5.03 1.25 6.15 2.63 1.41 1.76 1.4 4.54-.15 8.88-2.44 6.83-5.72 10.05-10.19 10.33-3.63.23-7.6-1.29-14.52-5.06-4.53-2.47-6.82-7.3-8.32-15.26-.17-.87-.32-1.78-.5-2.86l-.43-2.76c-1.05-6.58-1.9-9.2-3.73-10.11-.81-.4-1.59-.74-2.36-1-2.27-.77-4.6-1.02-8.1-.92-2.29.07-14.7 1-13.77.93-20.55 1.37-28.8 5.05-37.09 14.99a133.07 133.07 0 0 0-4.25 5.44l-2.3 3.09-2.51 3.32c-4.1 5.36-7.06 8.48-10.39 11.12-.65.52-1.33 1.04-2.13 1.62l-4.11 2.94a106.8 106.8 0 0 0-5.16 3.99c-4.55 3.74-9.74 8.6-16.25 15.38-8.25 8.58-11.78 13.54-11.7 15.95.07 1.65 1.64 2.11 6.79 2.38 1.61.09 2.15.12 2.98.2 2.95.24 5.09.73 6.81 1.68 7.48 4.15 11.63 7.26 13.95 11.58 3.3 6.15.8 12.88-8.89 20.26-8.28 6.3-11.1 10.37-11.31 14.96-.06 1.17 0 1.93.26 4.43.69 6.47.25 10.65-2.8 17.42a44.23 44.23 0 0 1-4.16 7.53c-2.82 3.97-5.47 5.74-10.6 7.69-.43.16-3.34 1.23-4.27 1.59-1.8.68-3.38 1.36-5.01 2.14-4.18 2-8.4 4.6-13.1 8.24-8.44 6.51-13.23 14.56-15.98 25.06-1.1 4.2-1.55 6.81-2.8 15.21-1.26 8.6-2.17 12.64-4.08 16.55-2.1 4.28-11.93 26.59-12.97 28.88a382.7 382.7 0 0 1-6.37 13.41c-4.07 8.11-7.61 14.07-10.73 17.81-5.38 6.46-8.98 14.37-13.77 28.42a810.14 810.14 0 0 0-1.89 5.6c-1.8 5.35-2.96 8.6-4.26 11.85-6.13 15.32-25.43 26.31-46.46 26.31-11.2 0-20.58-2.74-31.02-8.55-5.6-3.13-4.55-2.42-22.26-14.54-14.33-9.8-17.7-10.73-20.47-6.9-.37.5-1.81 2.74-1.83 2.77a52.24 52.24 0 0 1-4.94 5.9c-.73.79-5.52 5.87-6.97 7.45-2.38 2.6-4.3 4.81-5.98 6.93a45.6 45.6 0 0 0-5.08 7.66c-1.29 2.57-1.9 5.25-2.66 10.6a997.6 997.6 0 0 1-.46 3.18h-1l.47-3.32c.77-5.45 1.4-8.2 2.75-10.9a46.54 46.54 0 0 1 5.2-7.84c1.7-2.14 3.63-4.38 6.03-6.98 1.45-1.59 6.24-6.68 6.96-7.46a51.58 51.58 0 0 0 4.84-5.78s1.47-2.26 1.86-2.8c3.25-4.5 7.08-3.44 21.84 6.67 17.67 12.08 16.62 11.38 22.19 14.48 10.3 5.73 19.5 8.43 30.53 8.43 20.65 0 39.57-10.77 45.54-25.69a219.7 219.7 0 0 0 4.24-11.8 6752.32 6752.32 0 0 0 1.88-5.6c4.83-14.16 8.47-22.14 13.96-28.73 3.05-3.66 6.56-9.57 10.6-17.61 1.97-3.93 4.04-8.31 6.35-13.38 1.03-2.28 10.88-24.61 12.98-28.91 1.85-3.79 2.75-7.76 4-16.25 1.24-8.44 1.7-11.07 2.81-15.32 2.8-10.7 7.71-18.94 16.33-25.6a73.18 73.18 0 0 1 13.29-8.35c1.66-.8 3.27-1.48 5.08-2.18.94-.36 3.86-1.43 4.28-1.59 4.95-1.88 7.44-3.55 10.14-7.33 1.35-1.9 2.68-4.3 4.06-7.37 2.97-6.58 3.39-10.59 2.72-16.9a27.13 27.13 0 0 1-.27-4.58c.22-4.94 3.21-9.24 11.7-15.7 9.33-7.11 11.66-13.34 8.62-19-2.2-4.09-6.25-7.12-13.55-11.17-1.57-.88-3.6-1.33-6.42-1.57-.8-.07-1.34-.1-2.95-.19-5.77-.3-7.63-.85-7.72-3.34-.1-2.81 3.5-7.87 11.97-16.69 6.53-6.8 11.75-11.69 16.33-15.45 1.79-1.47 3.42-2.72 5.2-4.03l4.12-2.94c.79-.58 1.46-1.08 2.1-1.59 3.26-2.6 6.16-5.65 10.21-10.94a383.2 383.2 0 0 0 2.5-3.32l2.31-3.09c1.8-2.39 3.04-4 4.29-5.48 8.47-10.17 16.98-13.96 37.27-15.3-.44.02 12-.9 14.32-.98 3.62-.1 6.05.16 8.46.98.8.27 1.62.62 2.47 1.04 2.27 1.14 3.17 3.87 4.27 10.85l.44 2.76c.17 1.07.33 1.97.5 2.83 1.44 7.69 3.62 12.29 7.8 14.57 6.76 3.68 10.6 5.15 13.99 4.94 4-.25 6.99-3.17 9.3-9.67 1.45-4.04 1.46-6.49.32-7.92-.9-1.12-2.28-1.62-5.57-2.27a55.8 55.8 0 0 1-2.67-.55c-2.54-.6-4.39-1.4-5.93-2.71a252.63 252.63 0 0 0-4.78-4.01 84.35 84.35 0 0 1-4.08-3.6c-2.73-2.6-3.86-4.43-3.28-5.95 1.02-2.64 7.82-3.54 18.93-3.37a230.56 230.56 0 0 1 16.73.88c2.76.39 3.2.49 3.68.6 1.4.3 2.95.62 4.62.91a82.9 82.9 0 0 0 14.56 1.32c5.56-.04 10.24-.86 13.73-2.6 8.1-4.05 15.89-6.9 22.17-7.56.7-.07 1.4-.11 2.05-.13v1zm0-100.94v1.5c-8.62 16.05-17.27 29.55-23.65 35.92-3.19 3.2-7.62 4.9-13.54 5.56-4.45.48-8.28.4-19.18-.2-9.91-.55-15.32-.44-20.52.78a84.05 84.05 0 0 1-15 2.11l-2.25.14c-12.49.75-19.37 1.78-32.72 5.74-4.5 1.33-9.27 2.49-14.3 3.48a246.27 246.27 0 0 1-32.6 3.97c-7.56.45-13.21.57-20.24.57-5.4 0-11.9 1.61-18 5.18-8.3 4.87-15.06 12.87-19.53 24.5a68.57 68.57 0 0 1-4.56 9.8c-3.6 6.2-6.92 8.99-13.38 12.18l-4.03 1.96a64.48 64.48 0 0 0-15.16 10.25c-8.2 7.33-13.72 16.63-22.54 35.6l-2.08 4.49c-7.3 15.7-11.5 23.3-17.35 29.87-7.7 8.66-20.25 14.42-40.31 20.08-4.37 1.23-19.04 5.08-19.24 5.13-6.92 1.87-11.68 3.34-15.63 4.92-10.55 4.22-18.71 10.52-36.38 26.52l-1.7 1.54c-8.58 7.76-13.41 11.9-18.81 15.88-3.95 2.9-8 5.67-12.97 8.91-2.06 1.34-10.3 6.6-12.33 7.94-11.52 7.5-18.53 13.04-24.62 20.08a62.01 62.01 0 0 0-6.44 8.85c-4.13 6.91-6.27 13.15-9.2 25.11l-1.54 6.26c-.6 2.45-1.15 4.54-1.72 6.58-2.97 10.7-6.9 17.36-14.78 26.91L69.6 491a148.51 148.51 0 0 0-4.19 5.3 23.9 23.9 0 0 0-3.44 6.28c-1.16 3.23-1.52 5.9-1.87 11.94-.58 10.05-1.42 15.04-4.63 22.67-1.57 3.72-5.66 14.02-6.41 15.8a73.46 73.46 0 0 1-3.57 7.4c-2.88 5.14-6.71 10.12-13.12 16.95-5.96 6.36-8.87 10.9-10.61 16a56.88 56.88 0 0 0-1.38 4.82l-.46 1.84h-1.03l.52-2.08c.52-2.09.92-3.49 1.4-4.9 1.8-5.25 4.78-9.9 10.84-16.36 6.35-6.78 10.13-11.7 12.97-16.77a72.5 72.5 0 0 0 3.52-7.29c.75-1.76 4.84-12.06 6.4-15.8 3.17-7.5 3.99-12.4 4.56-22.33.35-6.14.72-8.88 1.93-12.23a24.9 24.9 0 0 1 3.58-6.54c1.27-1.7 2.6-3.37 4.22-5.34l4.11-4.95c7.8-9.46 11.66-16 14.59-26.54.56-2.04 1.1-4.12 1.71-6.56l1.53-6.26c2.96-12.04 5.13-18.36 9.32-25.39 1.84-3.08 4-6.05 6.54-8.99 6.17-7.12 13.24-12.7 24.83-20.26 2.05-1.33 10.28-6.6 12.33-7.94 4.96-3.22 9-5.98 12.92-8.87 5.37-3.95 10.19-8.08 18.74-15.82l1.7-1.54c17.76-16.09 25.98-22.43 36.67-26.7 4-1.6 8.8-3.09 15.75-4.96.21-.06 14.87-3.9 19.22-5.13 19.9-5.61 32.32-11.31 39.85-19.78 5.76-6.48 9.93-14.02 17.18-29.64l2.09-4.5c8.87-19.07 14.44-28.46 22.77-35.9a65.48 65.48 0 0 1 15.38-10.4l4.04-1.97c6.3-3.1 9.47-5.77 12.96-11.77a67.6 67.6 0 0 0 4.48-9.67c4.56-11.84 11.47-20.02 19.97-25 6.25-3.66 12.93-5.32 18.5-5.32 7.01 0 12.65-.12 20.17-.57a245.3 245.3 0 0 0 32.47-3.96c5-.98 9.75-2.13 14.22-3.45 13.43-3.98 20.38-5.02 32.94-5.78l2.24-.14c5.76-.37 9.8-.9 14.85-2.09 5.31-1.25 10.79-1.35 22.6-.7 9.04.5 12.84.58 17.21.1 5.71-.62 9.94-2.26 12.95-5.26 6.44-6.45 15.3-20.37 24.35-36.72zm0 450.21c-1.28-4.6-2.2-10.55-3.33-20.25l-.24-2.04-.23-2.03c-1.82-15.7-3.07-21.98-5.55-24.47-2.46-2.46-3.04-5.03-2.52-8.64.1-.6.18-1.1.39-2.15.69-3.54.77-5.04.08-6.84-.91-2.38-3.31-4.41-7.79-6.26-5.08-2.09-6.52-4.84-4.89-8.44.66-1.45 1.79-3.02 3.52-5.01 1.04-1.2 5.48-5.96 5.08-5.53 6.15-6.7 8.98-11.34 8.98-16.48a15.2 15.2 0 0 1 6.5-12.89v1.26a14.17 14.17 0 0 0-5.5 11.63c0 5.47-2.93 10.29-9.24 17.16.38-.42-4.04 4.33-5.07 5.5-1.67 1.93-2.75 3.43-3.36 4.77-1.37 3.04-.23 5.22 4.36 7.1 4.71 1.95 7.32 4.16 8.34 6.83.78 2.04.7 3.67-.03 7.4-.2 1.03-.3 1.51-.38 2.09-.48 3.33.03 5.59 2.23 7.8 2.74 2.74 3.98 8.96 5.84 25.06l.24 2.03.23 2.04c.82 7.01 1.53 12.06 2.34 16.03v4.33zm0-62.16c-1.4-3.13-4.43-9.9-4.95-11.17-1.02-2.53-1.25-3.8-.91-5.18.2-.84 2.05-4.68 2.32-5.33a70.79 70.79 0 0 0 3.54-11.2v3.99a62.82 62.82 0 0 1-2.62 7.6c-.31.75-2.09 4.46-2.27 5.18-.28 1.12-.08 2.22.87 4.57.41 1.02 2.5 5.7 4.02 9.09v2.45zm0-85.09c-1.65 1.66-3.66 2.9-6.4 4.13-.25.1-13.97 5.47-20.4 8.43-9.35 4.32-16.7 5.9-23.03 5.25-5.08-.53-9.02-2.25-14.77-5.92l-3.2-2.07a77.4 77.4 0 0 0-5.44-3.27c-4.05-2.18-3.25-5.8 1.47-10.47 3.71-3.68 9.6-7.93 18.73-13.8l4.46-2.82c17.95-11.33 18.22-11.5 22.27-14.74 11.25-9 19.69-14.02 26.31-15.1v1.02c-6.37 1.1-14.62 6-25.69 14.86-4.1 3.28-4.34 3.44-22.36 14.8a652.4 652.4 0 0 0-4.45 2.83c-9.07 5.83-14.92 10.05-18.57 13.66-4.31 4.28-4.95 7.13-1.7 8.88 1.7.91 3.29 1.88 5.5 3.3l3.2 2.08c5.64 3.59 9.45 5.25 14.34 5.76 6.13.64 13.32-.9 22.52-5.15 6.46-2.98 20.18-8.35 20.4-8.44 3.04-1.37 5.1-2.71 6.81-4.69v1.47zm0-41.37v1c-6.56.26-12.11 3.13-19.71 9.08l-4.63 3.68a51.87 51.87 0 0 1-4.4 3.14c-.82.52-5.51 3.33-6.22 3.76-3.31 2-6.15 3.8-8.87 5.6a112.61 112.61 0 0 0-8.16 5.92c-4.61 3.72-7.4 6.9-7.97 9.35-.63 2.67 1.48 4.53 7.05 5.46 10.7 1.78 20.92-.05 30.45-4.65a61.96 61.96 0 0 0 17.1-12.2 41.8 41.8 0 0 0 5.36-7.42v1.92a38.94 38.94 0 0 1-4.64 6.19 62.95 62.95 0 0 1-17.39 12.41c-9.7 4.68-20.13 6.55-31.05 4.73-6.06-1-8.65-3.29-7.85-6.67.64-2.74 3.53-6.05 8.31-9.9 2.35-1.9 5.1-3.88 8.24-5.97 2.73-1.82 5.58-3.61 8.9-5.62.72-.44 5.4-3.24 6.22-3.75 1.26-.8 2.6-1.76 4.3-3.09.8-.62 3.9-3.1 4.63-3.67 7.77-6.1 13.49-9.04 20.33-9.3zm0-154.6v1c-1.75-.24-4.3.23-7.82 1.55-10.01 3.75-13.8 5.07-19.15 6.76-1.78.56-2.63.83-3.87 1.24-1.48.5-3.16.76-6.74 1.16a1550.34 1550.34 0 0 0-2.64.3c-7.8.94-11.28 2.47-11.28 6.07 0 4.45 2.89 13.18 7.96 25.81a57.34 57.34 0 0 1 2.33 7.6 258.32 258.32 0 0 1 .84 3.46c1.86 7.62 3.17 10.71 5.56 11.67 2.21.88 4.7.6 7.47-.72 3.48-1.69 7.22-4.94 11.2-9.47 1.52-1.7 2.97-3.49 4.59-5.57l3.16-4.1c2.59-3.23 6.07-12.21 8.39-20.23v3.45c-2.29 7.2-5.27 14.5-7.61 17.41-.44.55-2.67 3.46-3.15 4.09-1.63 2.1-3.1 3.9-4.62 5.62-4.08 4.61-7.9 7.94-11.53 9.7-2.99 1.44-5.77 1.75-8.28.74-2.84-1.13-4.2-4.34-6.15-12.35a2097.48 2097.48 0 0 1-.84-3.46c-.8-3.2-1.47-5.45-2.28-7.46-5.14-12.8-8.04-21.55-8.04-26.19 0-4.37 3.84-6.06 12.16-7.07a160.9 160.9 0 0 1 2.65-.3c3.5-.39 5.15-.64 6.53-1.1 1.26-.42 2.1-.7 3.88-1.26 5.34-1.68 9.11-3 19.1-6.74 3.53-1.32 6.22-1.84 8.18-1.61zM0 292c10.13-11.31 18.13-23.2 23.07-35.39 3.3-8.14 6.09-16.12 10.81-30.55l1.59-4.84c6.53-19.94 10.11-29.82 14.77-39.56 6.07-12.72 12.55-21.18 20.27-25.54 6.66-3.76 10.2-7.86 12.22-13.15a46.6 46.6 0 0 0 1.86-6.58c1.23-5.2 2.05-7.59 3.93-10.36 2.45-3.62 6.27-6.53 12.1-8.96 15.78-6.58 16.73-7.04 18.05-9.01.65-.98.83-2.15.74-4.51-.03-.73-.23-3.82-.24-4A93.8 93.8 0 0 1 119 94c0-10.04.18-11.37 2.37-13.15.52-.42 1.13-.8 2.07-1.3.27-.14 2.18-1.12 2.84-1.48a68.4 68.4 0 0 0 9.12-5.87c2.06-1.54 2.64-2.14 8.01-7.93 3.78-4.09 6.21-6.36 8.96-8.12 3.64-2.33 7.2-3.12 10.9-2.11 4.4 1.2 10.81 2 18.78 2.46 6.9.4 12.9.5 21.95.5 4.87 0 8.97.47 15.4 1.57 7.77 1.33 9.3 1.54 12.38 1.54 4.05 0 7.43-.88 10.68-2.95 5.06-3.22 8.11-4.67 11.2-5.2 3.62-.64 4.77-.46 16.55 2.06 17.26 3.7 30.85 1.36 41.06-9.7 5.1-5.53 5.48-8.9 3.48-14.8-.83-2.42-1.03-3.1-1.17-4.3-.29-2.52.5-4.71 2.71-6.93 2.65-2.65 4.72-9.17 6.22-18.29h2.03c-1.56 9.71-3.77 16.65-6.83 19.7-1.79 1.8-2.36 3.39-2.14 5.28.11 1 .3 1.63 1.07 3.9 2.22 6.53 1.76 10.66-3.9 16.8-10.77 11.66-25.07 14.13-42.95 10.3-11.42-2.45-12.55-2.62-15.78-2.06-2.77.48-5.62 1.84-10.47 4.92a20.93 20.93 0 0 1-11.76 3.27c-3.25 0-4.81-.22-12.73-1.57C212.74 59.46 208.73 59 204 59c-9.1 0-15.11-.1-22.07-.5-8.09-.47-14.62-1.29-19.2-2.54-5.62-1.53-10.17 1.38-17.85 9.66-5.5 5.94-6.08 6.53-8.28 8.18a70.38 70.38 0 0 1-9.38 6.03c-.68.37-2.58 1.35-2.84 1.49-.84.44-1.35.76-1.75 1.08C121.16 83.6 121 84.8 121 94c0 1.85.06 3.54.17 5.44 0 .17.2 3.28.24 4.03.1 2.75-.13 4.29-1.08 5.71-1.67 2.5-2.27 2.8-18.95 9.74-5.48 2.29-8.99 4.96-11.2 8.24-1.71 2.51-2.47 4.73-3.64 9.7-.83 3.5-1.21 4.92-1.94 6.83-2.18 5.73-6.05 10.19-13.1 14.18-7.3 4.12-13.55 12.28-19.46 24.66-4.6 9.64-8.17 19.46-14.67 39.32l-1.58 4.84c-4.75 14.47-7.54 22.48-10.86 30.69-5.28 13.01-13.95 25.65-24.93 37.6v-2.97zm0 78v-.5l1-.01c6.32 0 7.47 5.2 4.6 13.36a60.36 60.36 0 0 1-5.6 11.3v-1.92a57.76 57.76 0 0 0 4.65-9.72c2.69-7.6 1.71-12.02-3.65-12.02-.34 0-.67 0-1 .02v-46.59a340.96 340.96 0 0 0 13.71-8.34c13.66-9.46 29.79-37.6 29.79-53.59 0-18.1 21.57-72.64 32.23-79.42 12.71-8.09 32.24-27.96 35.8-37.75 1.93-5.3 5.5-7.27 14.42-9.37 6.15-1.44 8.64-2.42 10.67-4.79 1.5-1.74 2.72-4.79 4.33-10.3.23-.78 1.9-6.68 2.43-8.46 3.62-12.08 7.3-18.49 13.47-20.39 2.5-.76 3.03-.98 9.74-3.7 7.49-3.03 11.97-4.43 17.12-4.92 6.75-.65 13.13.75 19.55 4.67 5.43 3.32 12.19 4.72 20.17 4.56 6.03-.12 12.2-1.07 19.83-2.8 1.82-.4 7.38-1.74 8.26-1.94 2.69-.6 4.34-.89 5.48-.89 4.97 0 8.93-.05 14.2-.27 7.9-.32 15.56-.92 22.75-1.88 8.5-1.14 15.9-2.73 21.88-4.82 18.9-6.62 32.64-18.3 33.67-27.59.29-2.56.4-2.96 2.79-11.11 2.33-7.95 3.21-12.93 2.72-18.23-.2-2.24-.69-4.38-1.48-6.42-1.5-3.92-2.63-9.4-3.43-16.18h.9c.77 6.47 1.89 11.72 3.47 15.82a24.93 24.93 0 0 1 1.54 6.69c.5 5.46-.4 10.54-2.77 18.6-2.36 8.06-2.47 8.47-2.74 10.95-1.09 9.75-15.1 21.68-34.33 28.41-6.06 2.12-13.52 3.72-22.09 4.87-7.22.96-14.92 1.57-22.83 1.89-5.3.21-9.27.27-14.25.27-1.04 0-2.64.27-5.26.87-.87.2-6.43 1.53-8.26 1.94-7.68 1.73-13.92 2.7-20.03 2.82-8.15.17-15.1-1.27-20.71-4.7-6.23-3.81-12.4-5.16-18.93-4.54-5.04.48-9.44 1.86-16.84 4.86-6.75 2.74-7.29 2.95-9.82 3.73-5.73 1.76-9.28 7.96-12.81 19.72-.53 1.77-2.2 7.66-2.43 8.46-1.66 5.65-2.91 8.78-4.53 10.67-2.22 2.58-4.84 3.62-12.01 5.3-7.8 1.83-11.13 3.66-12.9 8.54-3.65 10.04-23.32 30.06-36.2 38.25C65.94 190 44.5 244.2 44.5 262c0 16.34-16.3 44.78-30.22 54.41-2.14 1.48-8.24 5.12-14.28 8.68v-1.16 46.09zm0-173.7v-1.11c7.42-3.82 14.55-10.23 21.84-18.98 3.8-4.56 14.21-18.78 15.79-20.55 1.8-2.04 4.06-3.96 7.42-6.45 1.08-.8 4.92-3.57 5.49-3.99 9.36-6.85 14-11.96 15.98-19.36.8-2.98 1.54-6.78 2.46-12.3.23-1.44 2-12.46 2.56-15.79 2.87-16.77 5.73-26.79 10.07-32.1C92.46 52.43 101.5 38.13 101.5 33c0-2.54.34-3.35 6.05-15.71.68-1.49 1.25-2.74 1.77-3.93 2.5-5.75 3.9-10.04 4.14-13.36h1c-.23 3.48-1.66 7.87-4.23 13.76-.52 1.2-1.09 2.45-1.78 3.95-5.54 12.01-5.95 12.99-5.95 15.29 0 5.47-9.09 19.84-20.11 33.31-4.2 5.12-7.03 15.06-9.86 31.64-.57 3.33-2.33 14.33-2.57 15.78-.92 5.56-1.67 9.38-2.48 12.4-2.05 7.68-6.82 12.93-16.35 19.91l-5.49 3.98c-3.3 2.45-5.51 4.34-7.27 6.31-1.53 1.73-11.94 15.93-15.76 20.53-7.52 9.02-14.88 15.6-22.61 19.46zm0 361.83v-4.33c.48 2.36 1 4.35 1.6 6.15 2 6.03 4.6 8.26 8.19 6.59C28.76 557.69 43.5 542.4 43.5 527c0-16.2 6.37-31.99 17.1-46.3 1.88-2.5 3.66-4.4 5.53-6 .73-.62 1.45-1.18 2.3-1.8l2-1.43c3.68-2.68 5.32-5.28 7.08-12.59.75-3.07 1.38-5.02 4.2-13.26l.63-1.88c3.24-9.58 4.56-14.97 4.17-18.65-.48-4.43-3.8-5.23-11.3-1.64a81.12 81.12 0 0 1-9.15 3.7c-13.89 4.67-26.96 5.8-42.66 5.42l-1.95-.05-1.45-.02a39.8 39.8 0 0 0-15.05 2.96A21.81 21.81 0 0 0 0 438.37v-1.26a23.55 23.55 0 0 1 4.55-2.57 40.77 40.77 0 0 1 16.92-3.02l1.95.05c15.6.38 28.57-.75 42.32-5.37a80.12 80.12 0 0 0 9.04-3.65c8.04-3.84 12.16-2.85 12.72 2.43.42 3.89-.92 9.34-4.21 19.08l-.64 1.88c-2.8 8.2-3.43 10.15-4.16 13.18-1.82 7.52-3.59 10.34-7.47 13.16l-2 1.43c-.84.6-1.54 1.15-2.25 1.75a35.45 35.45 0 0 0-5.37 5.84c-10.61 14.15-16.9 29.74-16.9 45.7 0 15.88-15 31.45-34.29 40.45-4.3 2.01-7.39-.66-9.56-7.18-.23-.68-.44-1.39-.65-2.13zm0-62.16v-2.45l1.46 3.27c2.1 4.8 3.46 10.33 4.26 16.77.66 5.3.84 9.3 1.04 18.5.2 9.32.5 12.75 1.63 15.05 1.28 2.6 3.67 2.35 8.29-1.5 17.14-14.3 21.82-22.9 21.82-38.62 0-7.17 1.1-12.39 3.7-17.68 2.27-4.67 3.65-6.62 13.4-19.62a69.8 69.8 0 0 1 7.6-8.79 44.76 44.76 0 0 1 3.54-3.06c.38-.3.64-.52.89-.74a10.47 10.47 0 0 0 2.63-3.32 35.78 35.78 0 0 0 2.26-5.94l.37-1.2.36-1.15c.29-.91.48-1.55.66-2.16.45-1.53.74-2.68.91-3.66.38-2.2.12-3.49-.85-4.15-2.35-1.61-9.28-.24-23.8 4.94-9.54 3.4-16.12 4.17-27.85 4.26-7.71.06-10.43.4-13.25 2.12-3.48 2.12-5.84 6.4-7.58 14.26-.5 2.2-.99 4.19-1.49 5.98v-3.98l.51-2.22c1.8-8.1 4.28-12.6 8.04-14.9 3.04-1.85 5.86-2.2 13.77-2.26 11.61-.09 18.1-.84 27.51-4.2 14.93-5.32 21.95-6.71 24.7-4.83 1.38.94 1.71 2.6 1.28 5.15a33.69 33.69 0 0 1-.94 3.78l-.66 2.17-.36 1.15-.37 1.2a36.64 36.64 0 0 1-2.33 6.1c-.8 1.53-1.61 2.52-2.86 3.61l-.92.77-1.02.83c-.9.74-1.65 1.4-2.47 2.18a68.84 68.84 0 0 0-7.48 8.66c-9.7 12.93-11.07 14.87-13.31 19.46-2.52 5.15-3.59 10.22-3.59 17.24 0 16.04-4.82 24.91-22.18 39.38-5.04 4.2-8.18 4.55-9.83 1.18-1.22-2.5-1.52-5.94-1.73-15.47-.2-9.16-.38-13.15-1.03-18.4-.79-6.34-2.12-11.8-4.19-16.49L0 495.98zM379.27 0h1.04l1.5 5.26c3.28 11.56 4.89 19.33 5.26 27.8.49 11.01-1.52 21.26-6.63 31.17-7.8 15.13-20.47 26.5-36.22 34.1-12.38 5.96-26.12 9.17-36.22 9.17-6.84 0-17.24 1.38-37.27 4.62l-2.27.37c-24.5 3.99-31.65 5-37.46 5-3.49 0-4.08-.08-19.54-2.8-3.56-.64-6.32-1.1-9-1.5-20.23-2.96-31-1.2-31.96 7.86-.1.85-.18 1.72-.29 2.81l-.27 2.73c-1.1 10.9-2.02 15.73-4.31 19.96-2.9 5.34-7.77 7.95-15.63 7.95-10.2 0-12.92.6-15.5 3.17.52-.51-5.03 5.85-8.16 8.7-2.75 2.5-14.32 12.55-15.77 13.83a341.27 341.27 0 0 0-6.54 5.92c-6.97 6.49-11.81 11.76-14.6 16.15-5.92 9.3-10.48 18.04-11.69 24.08-1.66 8.3 3.67 9.54 19.02 1.21a626.23 626.23 0 0 1 44.54-21.9c3.5-1.56 14.04-6.2 15.68-6.95 5.05-2.25 8.3-3.8 10.78-5.15l1.95-1.07 2.18-1.18c1.76-.94 3.38-1.76 5-2.55 18.1-8.72 34.48-10.46 50.33-1.2 22.89 13.34 38.28 37.02 38.28 56.44 0 19.12-.73 25.13-5.18 33.2a45.32 45.32 0 0 1-4.94 7.12c-6.47 7.77-11.81 16.2-12.76 21.27-1.2 6.34 4.69 7.03 20.17-.05 13.31-6.08 22.4-14.95 28.5-26.32a80.51 80.51 0 0 0 6.1-15.13c.9-2.98 3.17-11.65 3.41-12.48a29.02 29.02 0 0 1 1.75-4.83c7.47-14.93 21.09-30.5 36.25-37.24 7.61-3.38 13-9.65 19.4-20.79.84-1.48 4.26-7.64 5.14-9.17 3.52-6.1 6.22-9.7 9.37-11.98 10.15-7.4 28.7-11.1 50.29-11.1 7.52 0 16.54-1.24 27.51-3.58a420.1 420.1 0 0 0 14.96-3.52c-1.3.33 15.54-3.98 19.42-4.89 14.15-3.33 41.07-5.01 64.11-5.01 17.36 0 27.82-9.23 38.53-38.67 6.62-18.21 6.62-26.37 2.69-34.35l-1.18-2.37A13.36 13.36 0 0 1 587.5 58c0-4.03 0-4.01 2.5-24.56.46-3.73.8-6.74 1.12-9.64.9-8.45 1.38-15.2 1.38-20.8 0-.94-.02-1.94-.04-3h1c.03 1.06.04 2.06.04 3 0 5.65-.48 12.43-1.39 20.9-.3 2.91-.66 5.93-1.11 9.66-2.5 20.45-2.5 20.47-2.5 24.44 0 1.97.45 3.57 1.45 5.68.24.51 1.16 2.35 1.17 2.36 4.06 8.24 4.06 16.68-2.65 35.13-10.84 29.8-21.63 39.33-39.47 39.33-22.96 0-49.83 1.68-63.89 4.99-3.86.9-20.69 5.2-19.4 4.88a421.05 421.05 0 0 1-14.99 3.53c-11.04 2.35-20.11 3.6-27.72 3.6-21.4 0-39.76 3.67-49.7 10.9-3 2.19-5.64 5.7-9.1 11.68-.87 1.52-4.29 7.68-5.14 9.17-6.49 11.3-12 17.71-19.86 21.2-14.9 6.63-28.38 22.03-35.75 36.77a28.17 28.17 0 0 0-1.69 4.67c-.23.8-2.5 9.49-3.4 12.5a81.48 81.48 0 0 1-6.19 15.3c-6.2 11.56-15.44 20.58-28.96 26.76-16.1 7.36-23 6.55-21.58-1.04 1-5.29 6.4-13.83 12.99-21.73a44.33 44.33 0 0 0 4.82-6.96c4.35-7.88 5.06-13.77 5.06-32.72 0-19.04-15.19-42.4-37.72-55.55-15.57-9.08-31.62-7.38-49.45 1.21a132.9 132.9 0 0 0-7.14 3.71l-1.95 1.07a158.83 158.83 0 0 1-10.85 5.19c-1.65.74-12.18 5.38-15.69 6.95a625.25 625.25 0 0 0-44.46 21.86c-15.95 8.66-22.37 7.16-20.48-2.29 1.24-6.2 5.83-15.02 11.82-24.42 2.85-4.48 7.74-9.8 14.77-16.34 1.98-1.85 4.12-3.79 6.56-5.94 1.46-1.29 13.02-11.33 15.75-13.82 3.09-2.8 8.6-9.14 8.14-8.67 2.82-2.82 5.75-3.46 16.2-3.46 7.5 0 12.04-2.43 14.75-7.42 2.2-4.07 3.11-8.84 4.2-19.59l.26-2.73.3-2.81c.56-5.42 4.47-8.5 11.23-9.6 5.44-.88 12.51-.51 21.86.86 2.7.4 5.47.86 9.04 1.49 15.33 2.7 15.96 2.8 19.36 2.8 5.73 0 12.9-1.03 37.3-5l2.27-.36c20.1-3.26 30.52-4.64 37.43-4.64 9.95 0 23.54-3.18 35.78-9.08 15.57-7.5 28.09-18.73 35.78-33.65 5.02-9.75 7-19.82 6.51-30.67-.37-8.37-1.96-16.08-5.23-27.57L379.27 0zm13.68 0h1.02c.78 3.9 1.92 8.7 3.51 14.88 3.63 14.05 3.06 27.03-.75 38.77a61 61 0 0 1-11.35 20.68 138.36 138.36 0 0 1-19.32 18.77c-11.32 9.02-23.36 15.49-35.95 18.39a258.63 258.63 0 0 1-22.57 4.07c-3.17.44-6.36.85-10.3 1.32l-9.39 1.12c-11.53 1.41-17.45 2.55-21.64 4.46-9.28 4.21-28.35 6.04-49.21 6.04-1.37 0-2.8-.12-4.3-.35-2.62-.41-5-1.03-9.14-2.29-7.34-2.21-9.63-2.75-12.63-2.56-3.9.23-6.63 2.29-8.47 6.89-1.86 4.66-2.42 7.53-3.34 14.98-1.1 8.98-2.87 12.12-9.97 14.3a40.12 40.12 0 0 0-6.8 2.66c-.63.33-1.16.64-1.76 1.02l-1.34.86c-1.9 1.14-3.86 1.49-9.25 1.49-3.2 0-8.83-.55-9.51-.39-1.22.28-.75-.14-7.14 6.24-1.5 1.5-3.49 3.18-6.32 5.37-1.52 1.18-7.16 5.43-7.94 6.03-4.96 3.78-8.33 6.6-11.06 9.38-4.88 4.98-6.85 9.15-5.56 12.7 1.34 3.67 4.07 4.42 8.9 2.82a55.72 55.72 0 0 0 7.77-3.48c1.5-.77 7.78-4.13 9.37-4.96a116.8 116.8 0 0 1 12.31-5.68 162.2 162.2 0 0 0 11.04-4.84c2.04-.97 10.74-5.16 13-6.22 4.41-2.1 8.1-3.78 11.65-5.29 17.14-7.3 29.32-9.9 37.67-6.65l5.43 2.1c2.3.88 4.17 1.62 6.02 2.38a150.9 150.9 0 0 1 13.07 6c18.34 9.63 30.35 22.13 34.79 39.87 6.96 27.85 3.6 45.53-8.08 62.4-3.97 5.75-3.52 9.2.06 8.97 4.14-.28 10.21-4.95 15.11-12.52 3.1-4.8 5.1-10.45 8.05-21.53l1.69-6.35c.66-2.47 1.24-4.52 1.83-6.5 4.93-16.56 11-27.28 21.56-34.76 7.15-5.06 23.73-15.5 25.48-16.75 6.74-4.81 10.53-9.44 14.34-18 7.74-17.44 21.09-24.34 44.47-24.34 9.36 0 17.91-1.13 29.53-3.49a624.86 624.86 0 0 0 6.2-1.28c2.4-.5 4.07-.84 5.66-1.13 4.03-.74 7.04-1.1 9.61-1.1 4.44 0 9.39-1 31.39-5.99l2.95-.66c16.34-3.67 25.64-5.35 31.66-5.35 1.54 0 2.4.01 6.4.1 7.8.15 12.27.13 17.33-.2 16.41-1.06 26.73-5.36 29.8-14.56a87.1 87.1 0 0 1 3.55-8.83c-.15.31 2.29-4.96 2.9-6.38 5.38-12.3 5.57-21.92-1.44-39.44a86.4 86.4 0 0 1-5.26-20.72c-1.61-11.98-1.38-23.14.1-40.35l.2-2.12h1l-.2 2.2c-1.48 17.15-1.7 28.24-.11 40.14a85.4 85.4 0 0 0 5.2 20.47c7.1 17.78 6.91 27.67 1.43 40.22-.62 1.43-3.06 6.72-2.91 6.4a86.17 86.17 0 0 0-3.52 8.73c-3.23 9.72-13.9 14.15-30.68 15.24-5.1.33-9.58.35-17.42.2-3.98-.09-4.84-.1-6.37-.1-5.91 0-15.18 1.67-31.44 5.32l-2.95.67c-22.16 5.02-27.05 6.01-31.61 6.01-2.5 0-5.45.36-9.43 1.09-1.58.29-3.25.62-5.64 1.11a4894.21 4894.21 0 0 0-6.2 1.29c-11.68 2.37-20.3 3.51-29.73 3.51-23.02 0-36 6.71-43.53 23.66-3.9 8.8-7.82 13.58-14.7 18.5-1.78 1.27-18.36 11.7-25.48 16.75-10.34 7.32-16.3 17.87-21.19 34.23-.58 1.96-1.15 4-1.82 6.47l-1.69 6.35c-2.98 11.18-5 16.9-8.17 21.81-5.05 7.81-11.37 12.68-15.89 12.98-4.7.31-5.3-4.23-.94-10.53 11.52-16.64 14.82-34.03 7.92-61.6-4.35-17.42-16.16-29.72-34.27-39.22-4-2.1-8.2-4-12.99-5.97-1.84-.75-3.7-1.49-6-2.38l-5.43-2.08c-8.03-3.12-20.02-.58-36.92 6.63-3.52 1.5-7.21 3.19-11.61 5.27l-13 6.22c-4.71 2.22-8.16 3.75-11.11 4.88a115.87 115.87 0 0 0-12.21 5.63c-1.58.83-7.86 4.18-9.37 4.96a56.55 56.55 0 0 1-7.9 3.54c-5.3 1.75-8.62.85-10.17-3.43-1.46-4.02.66-8.5 5.8-13.74 2.75-2.82 6.16-5.66 11.15-9.48.79-.6 6.43-4.85 7.94-6.02a66.96 66.96 0 0 0 6.23-5.28c6.74-6.74 6.1-6.16 7.61-6.51.87-.2 6.69.36 9.74.36 5.22 0 7.03-.32 8.74-1.35l1.31-.84c.62-.4 1.18-.72 1.84-1.07a41.07 41.07 0 0 1 6.96-2.72c6.64-2.04 8.22-4.84 9.28-13.47.93-7.53 1.5-10.47 3.4-15.24 1.99-4.95 5.04-7.26 9.34-7.51 3.17-.2 5.5.35 12.97 2.6a63.54 63.54 0 0 0 9.02 2.26c1.45.22 2.83.34 4.14.34 20.71 0 39.7-1.82 48.8-5.96 4.32-1.96 10.29-3.1 21.93-4.53l9.4-1.12c3.92-.48 7.11-.88 10.27-1.32 8.16-1.14 15.4-2.43 22.49-4.06 12.42-2.86 24.33-9.26 35.55-18.2a137.4 137.4 0 0 0 19.18-18.64 60.02 60.02 0 0 0 11.15-20.32c3.76-11.57 4.32-24.36.75-38.23A284.86 284.86 0 0 1 392.95 0zM506.7 0h1.26c-.5.66-.9 1.18-1.17 1.51-3.95 4.96-6.9 7.92-9.82 9.57A10.02 10.02 0 0 1 492 12.5c-2.38 0-4.24.67-6.71 2.21l-2.65 1.71c-4.38 2.8-8.01 4.08-13.64 4.08-5.6 0-9.99-1.26-16.08-4.05a202.63 202.63 0 0 1-2.3-1.06l-2.18-.98c-1.6-.7-2.92-1.17-4.17-1.48a13.42 13.42 0 0 0-3.27-.43c-2.3 0-4.3-.68-11-3.37l-1.56-.62c-5-1.97-8.1-2.82-10.52-2.66-2.93.2-4.42 2.03-4.42 6.15 0 20.76-5.21 50.42-12.15 57.35-7.58 7.59-26.55 23.7-34.06 29.06-13.16 9.4-31.17 20.2-44.11 25.06a106.87 106.87 0 0 1-13.32 4.03c-3.28.78-6.6 1.43-11.25 2.24-.53.1-8.8 1.5-11.5 1.99-4.86.87-9.3 1.74-14 2.76-20.62 4.48-25.07 5.01-38.11 5.01-2.49 0-2.9-.07-14.05-2-2.42-.42-4.31-.73-6.15-1-8.11-1.19-13.83-1.36-17.64-.2-4.54 1.4-5.93 4.65-3.7 10.52 2.02 5.28 4.84 8.61 8.84 10.74 3.26 1.74 6.75 2.6 13.82 3.71 9.42 1.48 10.94 1.75 15.5 2.92a78.2 78.2 0 0 1 18.62 7.37c8.3 4.58 14.58 11.5 19.98 20.89 2.73 4.73 9.46 19.33 10.54 21.19 3.4 5.85 6.26 6.63 10.89 2 4.95-4.94 10.35-8.37 21.13-14.06.47-.25 2.06-1.1 2.12-1.12 7.98-4.21 11.92-6.51 15.87-9.54 5.11-3.9 8.66-8.1 10.77-13.11 8.52-20.24 20.75-33.31 32.46-33.31l5.5.03c10.53.08 17.35.02 24.9-.31 13.66-.62 23.78-2.09 29.39-4.67 5.85-2.7 13.42-5.49 24.18-9.02 3.46-1.14 6.29-2.05 12.7-4.1 7.7-2.45 11.08-3.54 15.17-4.9a1059.43 1059.43 0 0 1 11.33-3.72c3.67-1.2 5.96-2 8.03-2.78a59.88 59.88 0 0 0 6.66-2.94c1.87-.98 3.76-2.1 5.86-3.5 3.48-2.33 6.15-3.13 12.04-4.13l1.15-.2c5.71-1.01 9-2.3 12.76-5.63 7.82-6.96 8.58-23.18 3.84-44.52-1.7-7.67-2.1-19.28-1.57-35.47A837.22 837.22 0 0 1 546.76 0h1l-.15 3.06c-.32 6.42-.53 11.02-.68 15.62-.51 16.1-.12 27.65 1.56 35.21 4.82 21.68 4.04 38.2-4.16 45.48-3.91 3.48-7.37 4.84-13.24 5.87l-1.16.2c-5.76.99-8.32 1.75-11.65 3.98a63.73 63.73 0 0 1-5.96 3.56 60.86 60.86 0 0 1-6.77 2.99c-2.09.79-4.39 1.58-8.07 2.79a5398.31 5398.31 0 0 1-11.32 3.71c-4.1 1.37-7.48 2.46-15.18 4.92-6.42 2.04-9.24 2.95-12.7 4.08-10.73 3.53-18.27 6.3-24.07 8.98-5.76 2.66-15.97 4.14-29.77 4.77-7.56.33-14.4.39-24.95.31l-5.49-.03c-11.19 0-23.16 12.79-31.54 32.7-2.19 5.19-5.84 9.52-11.08 13.52-4.02 3.07-7.99 5.39-16.01 9.62l-2.12 1.12c-10.7 5.65-16.04 9.04-20.9 13.9-5.14 5.14-8.75 4.15-12.45-2.22-1.12-1.92-7.85-16.5-10.54-21.2-5.33-9.24-11.48-16.02-19.6-20.5a77.2 77.2 0 0 0-18.4-7.28c-4.5-1.17-6.02-1.43-15.4-2.9-7.17-1.12-10.74-2-14.13-3.81-4.22-2.25-7.2-5.77-9.3-11.27-2.43-6.39-.78-10.26 4.34-11.83 4-1.22 9.82-1.05 18.08.17 1.84.27 3.74.58 6.17 1 11.02 1.9 11.48 1.98 13.88 1.98 12.96 0 17.35-.52 37.9-4.99 4.71-1.02 9.16-1.9 14.03-2.77 2.71-.48 10.98-1.9 11.5-1.98 4.64-.81 7.95-1.46 11.2-2.23 4.55-1.07 8.76-2.34 13.2-4 12.83-4.81 30.79-15.59 43.88-24.94 7.47-5.33 26.4-21.4 33.94-28.94C407.3 61.98 412.5 32.49 412.5 12c0-4.61 1.86-6.9 5.35-7.15 2.63-.18 5.8.7 10.96 2.73l1.56.62c6.53 2.62 8.53 3.3 10.63 3.3 1.14 0 2.3.16 3.5.46 1.32.33 2.68.82 4.34 1.53a90.97 90.97 0 0 1 3.34 1.52l1.15.54c5.98 2.73 10.23 3.95 15.67 3.95 5.41 0 8.87-1.21 13.1-3.92.2-.13 2.1-1.38 2.66-1.72 2.62-1.63 4.64-2.36 7.24-2.36 1.47 0 2.94-.43 4.47-1.3 2.78-1.56 5.67-4.45 9.54-9.31l.7-.89zM324.54 600h-2.03c.49-2.96.91-6.2 1.28-9.66.44-4.1.76-8.25.98-12.21.08-1.39.14-2.65-.35-7.29-.47-1.94-.93-4.14-1.36-6.54-2.01-11.26-2.66-22.9-1.14-33.78a60.76 60.76 0 0 1 5.18-17.95 70.78 70.78 0 0 1 12.6-18.22c3.38-3.6 5.53-5.5 11.83-10.79 4.5-3.78 6.35-5.56 7.52-7.5.64-1.07.95-2.06.95-3.06 0-1.75 0-1.74-.75-9.23-.36-3.7-.57-6.3-.68-8.96-.5-12.1 1.62-19.6 8.11-21.76 15.9-5.3 25.89-12.1 33.45-25.54C409.6 390.65 425.85 376 436 376c12.36 0 20-1.96 29.41-8.8 6.76-4.92 9.5-6.6 12.47-7.46 2.22-.64 3.8-.74 9.12-.74 1.86 0 3.53-.83 5.57-2.62 1.08-.96 5.11-5.12 5.6-5.6 6.04-5.85 11.98-8.78 20.83-8.78 2.45 0 4.54.04 7.32.12 7.51.23 8.87.17 11.27-.7 3.03-1.1 5.53-3.03 14.75-11.17 8-7.06 10.72-8.92 22.87-16.47 1.44-.9 2.59-1.63 3.69-2.37a69.45 69.45 0 0 0 9.46-7.5c4.12-3.88 8.02-7.85 11.64-11.9v2.98a201.58 201.58 0 0 1-10.27 10.38c-3.18 3-6.2 5.35-9.72 7.7-1.12.76-2.28 1.5-3.75 2.4-12.05 7.5-14.71 9.32-22.6 16.28-9.46 8.35-12.01 10.32-15.39 11.55-2.74 1-4.19 1.06-12.01.82-2.76-.08-4.83-.12-7.26-.12-8.27 0-13.75 2.7-19.43 8.22-.44.43-4.52 4.64-5.68 5.66-2.37 2.09-4.46 3.12-6.89 3.12-5.1 0-6.6.1-8.56.66-2.67.78-5.29 2.37-11.85 7.15-9.8 7.13-17.85 9.19-30.59 9.19-9.22 0-24.96 14.2-34.13 30.49-7.84 13.94-18.24 21.02-34.55 26.46-5.31 1.77-7.21 8.51-6.75 19.78.1 2.6.31 5.19.68 8.84.75 7.62.75 7.58.75 9.43 0 1.38-.42 2.73-1.24 4.09-1.33 2.2-3.26 4.07-7.94 8-6.25 5.24-8.36 7.12-11.67 10.63a68.8 68.8 0 0 0-12.25 17.71 58.8 58.8 0 0 0-5 17.36c-1.49 10.66-.85 22.09 1.13 33.15.43 2.37.88 4.53 1.33 6.44.16.66.3 1.25.6 4.06a249.3 249.3 0 0 1-1.17 16.12c-.37 3.37-.78 6.53-1.25 9.44zm-13.4 0h-1.05l.12-.28c3.07-7.16 4.29-11.83 4.29-18.72 0-3.57-.07-4.93-.76-15.65-.77-12.04-1-19.64-.55-28.3.58-11.5 2.4-22.1 5.81-32.16 1.3-3.8 2.8-7.5 4.55-11.1 3.46-7.14 6.83-12.39 10.42-16.6a59.02 59.02 0 0 1 4.35-4.56c.43-.4 3-2.8 3.67-3.45 5.72-5.6 7.51-11.52 7.51-29.18 0-18.84 2.9-23.77 15.82-28.24 1.09-.37 1.92-.67 2.77-.98a51.3 51.3 0 0 0 6.1-2.7c4.95-2.6 9.64-6.22 14.44-11.42 25.5-27.63 37.15-35.16 56.37-35.16 8.28 0 14.54-1.95 22-6.3 1.78-1.03 13.82-8.82 18.16-11.27 2.83-1.59 5.66-3.03 8.63-4.39 7.92-3.6 13.97-4.45 26.6-4.8 7.53-.2 10.7-.49 14.26-1.58 4.55-1.4 8.06-4 10.93-8.43 2.2-3.41 6.85-7.08 14.66-12.06 1.61-1.03 3.27-2.05 5.65-3.5 9.53-5.85 11.56-7.13 14.81-9.57 5.34-4 9.3-8.37 13.68-14.77a204.2 204.2 0 0 0 5.62-8.75v1.9c-1.97 3.17-3.4 5.38-4.8 7.42-4.42 6.48-8.46 10.92-13.9 15-3.29 2.46-5.32 3.75-14.89 9.61a375.06 375.06 0 0 0-5.63 3.5c-7.7 4.9-12.26 8.52-14.36 11.76-3 4.63-6.7 7.39-11.48 8.85-3.68 1.12-6.9 1.42-14.53 1.63-12.5.34-18.44 1.18-26.2 4.7a111.08 111.08 0 0 0-8.56 4.35c-4.3 2.43-16.34 10.22-18.15 11.27-7.6 4.43-14.03 6.43-22.5 6.43-18.87 0-30.3 7.4-55.63 34.84-4.88 5.28-9.67 8.97-14.7 11.62-2 1.05-4 1.92-6.23 2.75-.86.32-1.7.62-5.37 1.87-5.08 1.76-7.44 3.25-9.28 6.37-2.23 3.78-3.29 9.94-3.29 20.05 0 17.9-1.87 24.07-7.8 29.89-.69.67-3.27 3.06-3.69 3.46a58.04 58.04 0 0 0-4.28 4.49c-3.53 4.14-6.86 9.32-10.28 16.38a95.19 95.19 0 0 0-4.5 10.99c-3.38 9.97-5.18 20.48-5.76 31.9-.44 8.6-.22 16.17.55 28.17.69 10.76.76 12.12.76 15.72 0 6.35-1.02 10.87-4.35 19zm25.08 0h-1c-.04-4.73.06-9.39.28-15.02.26-6.41-.4-11.79-2.53-24.37l-.31-1.86c-2.12-12.55-2.76-19.35-1.97-26.47 1.03-9.25 4.75-16.68 12-22.67 22.04-18.2 29.81-30.18 29.81-44.61 0-2.6-.3-4.81-.98-8.17-.97-4.79-1.1-5.68-.97-7.57.2-2.56 1.27-4.7 3.56-6.72 2.67-2.35 7.05-4.6 13.72-7.01 9.72-3.5 15.52-9.18 24.3-21.57l1.78-2.5c4.48-6.33 7.1-9.63 10.43-12.78 4.31-4.07 8.98-6.77 14.54-8.17 13.3-3.32 20.37-5.47 25.34-7.64a49.5 49.5 0 0 0 5.28-2.7c1.1-.65 1.75-1.04 4.24-2.6 2.7-1.68 5.22-2.08 11.38-2.28 5.44-.18 7.9-.43 10.97-1.41a21.47 21.47 0 0 0 9.54-6.22c4.87-5.3 10.03-7.61 17.79-8.9 1.07-.18 1.88-.3 3.86-.58 6.9-.97 9.94-1.69 13.48-3.62 4.5-2.45 6.79-4.44 23.46-19.68l3.14-2.85c9.65-8.71 16.12-13.83 21.42-16.48 4.25-2.12 7.6-4.69 11.22-8.6v1.45c-3.42 3.57-6.69 6-10.78 8.05-5.18 2.59-11.61 7.67-21.2 16.32l-3.12 2.85c-16.8 15.35-19.05 17.3-23.66 19.82-3.68 2-6.8 2.75-13.82 3.73-1.97.28-2.78.4-3.84.57-7.56 1.26-12.52 3.48-17.21 8.6a22.47 22.47 0 0 1-9.97 6.5c-3.2 1-5.72 1.27-11.25 1.45-5.98.2-8.39.57-10.89 2.13a144 144 0 0 1-4.25 2.61 50.48 50.48 0 0 1-5.39 2.75c-5.04 2.2-12.15 4.37-25.5 7.7-9.74 2.44-15.26 7.65-24.4 20.56l-1.77 2.5c-8.9 12.54-14.82 18.34-24.78 21.93-6.57 2.36-10.85 4.57-13.4 6.82-2.1 1.86-3.05 3.74-3.22 6.04-.13 1.76 0 2.63.95 7.3.7 3.42 1 5.7 1 8.37 0 14.79-7.93 27-30.18 45.39-7.03 5.8-10.64 13-11.64 22-.78 7-.14 13.73 1.96 26.2l.32 1.85c2.15 12.65 2.8 18.07 2.54 24.58-.22 5.57-.32 10.2-.28 14.98zM95.9 600h-2.04c.68-3.82 1.14-8.8 1.61-15.98.2-3.11.27-4.06.39-5.6 1.3-17.54 4.04-27.14 11.5-33.2 4.65-3.77 7.22-8.92 8.67-16 .51-2.52.7-3.87 1.33-9.17.66-5.5 1.16-8.06 2.24-10.36 1.45-3.09 3.82-4.69 7.39-4.69 14.28 0 38.48 9.12 53.6 20.2 8.66 6.35 21.26 13.32 31.74 17.11 13.03 4.71 21.89 4.41 24.75-1.73 1.7-3.64 1.92-4.11 2.65-5.77 2.93-6.67 4.69-12.2 5.25-17.5.23-2.17.24-4.23.02-6.2-.32-2.75-1.42-4.55-4.08-7.35l-1.32-1.37a30.59 30.59 0 0 1-2.41-2.79 30.37 30.37 0 0 1-2.5-4.07l-1.13-2.14c-1.62-3.1-2.68-4.6-4.12-5.56-5.26-3.5-14.8-5.5-28.55-6.83a272.42 272.42 0 0 0-9.04-.71l-2.18-.17c-9.57-.73-15.12-1.56-19.06-3.2C156.57 471.07 136 450.5 136 440c0-5.34 1.74-9.53 5.47-14.13 1.98-2.44 11.12-11.71 12.79-13.54 4.52-4.97 10.16-9.54 17.68-14.66 2.8-1.9 14.78-9.6 17.49-11.49a50.54 50.54 0 0 0 6.34-5.43c1.53-1.5 6.96-7.13 7.12-7.3 7.18-7.3 12.7-11.56 19.74-14.38 3.36-1.34 8.13-2.79 17.45-5.38a9577.18 9577.18 0 0 1 11.78-3.28 602.6 602.6 0 0 0 12.67-3.7c20.4-6.24 34-12.08 40.79-18.44 8.74-8.2 11.78-13.84 15.73-26.02 2.02-6.22 3.09-9.04 5.07-12.72 9.54-17.71 28.71-39.37 43.5-45.45C383.77 238.25 389 232.34 389 226c0-2.89 2.73-8.4 6.83-13.73 4.76-6.2 10.65-11.36 16.75-14.18 12.5-5.77 33.5-10.09 47.42-10.09 5.32 0 9.83-1.5 16.42-4.89 9.2-4.71 10.1-5.11 13.58-5.11 10.42 0 32.06-2.55 45.76-5.97l3.88-.98 3.47-.89c2.6-.66 4.33-1.08 5.93-1.43 3.9-.86 6.76-1.23 9.58-1.17 2.74.06 5.47.52 8.67 1.48 4.56 1.37 13.71-.9 22.87-5.68a68.07 68.07 0 0 0 9.84-6.2v2.4c-11.09 8.14-25.76 13.66-33.29 11.4a29.72 29.72 0 0 0-8.13-1.4c-2.63-.05-5.36.3-9.11 1.12a238 238 0 0 0-9.33 2.3l-3.9.99C522.38 177.43 500.58 180 490 180c-2.99 0-3.91.4-12.67 4.89-6.85 3.51-11.61 5.11-17.33 5.11-13.65 0-34.35 4.26-46.58 9.9-5.78 2.67-11.42 7.62-16 13.58-3.85 5.02-6.42 10.2-6.42 12.52 0 7.27-5.8 13.82-20.62 19.92-14.27 5.88-33.16 27.21-42.5 44.55-1.9 3.55-2.95 6.28-4.93 12.4-4.05 12.47-7.23 18.39-16.27 26.86-7.08 6.64-20.87 12.57-41.57 18.89a604.52 604.52 0 0 1-12.7 3.71 1495.1 1495.1 0 0 1-11.8 3.28c-9.24 2.58-13.97 4.01-17.24 5.32-6.73 2.69-12.05 6.8-19.05 13.92-.15.15-5.6 5.8-7.15 7.32a52.4 52.4 0 0 1-6.6 5.65c-2.74 1.92-14.75 9.63-17.5 11.5-7.4 5.04-12.94 9.52-17.33 14.35-1.72 1.9-10.8 11.11-12.71 13.46-3.47 4.26-5.03 8.03-5.03 12.87 0 9.5 20 29.5 33.38 35.08 3.67 1.53 9.1 2.34 18.45 3.05a586.23 586.23 0 0 0 4.34.32c3.24.23 5.07.37 6.93.55 14.08 1.37 23.82 3.4 29.45 7.17 1.82 1.2 3.02 2.91 4.8 6.29l1.11 2.13a28.55 28.55 0 0 0 2.34 3.81c.62.83 1.3 1.6 2.26 2.61.23.24 1.1 1.16 1.32 1.37 2.93 3.09 4.24 5.23 4.61 8.5.24 2.12.23 4.33-.01 6.64-.59 5.55-2.4 11.25-5.41 18.1-.74 1.67-.96 2.15-2.66 5.8-3.49 7.47-13.33 7.8-27.25 2.77-10.67-3.86-23.43-10.92-32.25-17.38C164.62 515.96 140.82 507 127 507c-5 0-6.4 3.02-7.64 13.29a99.03 99.03 0 0 1-1.36 9.33c-1.53 7.5-4.3 13.04-9.37 17.16-6.87 5.58-9.5 14.78-10.77 31.8-.11 1.52-.18 2.47-.38 5.57-.46 7.01-.91 11.99-1.57 15.85zm8.05 0h-1.02c.29-1.41.58-2.94.9-4.59l1.05-5.62c2.5-13.3 4.2-19.92 6.68-24.05 1.7-2.84 3.68-5.5 8.05-11.03 8.21-10.36 10.88-14.55 10.88-18.71l-.02-1.69c-.02-1.78-.02-2.7.02-3.77.21-5.05 1.47-8.2 4.64-9.4 3.92-1.5 10.39.44 20.12 6.43 9.56 5.88 17.53 10.7 25.91 15.66 1.31.78 14.27 8.41 17.67 10.45a714.21 714.21 0 0 1 6.42 3.9c13.82 8.5 38.94 5.05 46.3-7.83 3.6-6.28 4.54-8.52 7.78-17.32a82.3 82.3 0 0 1 1.18-3.07 42.27 42.27 0 0 1 4.06-7.64c9.33-13.98 14.92-26.1 14.92-36.72 0-3.66.75-6.62 3.36-14.85.52-1.64.83-2.66 1.15-3.73 3.64-12.23 3.04-19.12-4.29-24a23.1 23.1 0 0 0-9.98-3.78c-7.2-.93-14.49 1.17-23.91 5.88-1.55.78-6.64 3.44-7.6 3.93a62.6 62.6 0 0 0-4.14 2.3l-4.4 2.66c-11.62 6.92-20.4 9.18-32.81 6.08-3.32-.84-6.24-1.4-13.1-2.64-13.25-2.39-18.7-3.75-23.33-6.46-6.23-3.67-7.46-9.02-2.88-16.65A93.1 93.1 0 0 1 172 415.42a157 157 0 0 1 8.32-7.66c-.07.05 6.16-5.3 7.82-6.77a85.12 85.12 0 0 0 6.5-6.33c7.7-8.46 12.78-13.36 20.08-18.57 9.94-7.1 21.4-12.36 35.18-15.58 37.03-8.64 51-12.7 58.83-17.93 8.6-5.73 21.3-24.77 36.84-54.81 5.22-10.1 12.27-18.4 21.13-25.71 5.13-4.24 9.56-7.25 17.55-12.23 7.42-4.62 9.62-6.14 11.38-8.16a21.15 21.15 0 0 0 2.95-4.87c.61-1.3 2.87-6.47 3-6.77 1.36-3 2.56-5.4 3.95-7.73 6.53-10.97 16.03-18 31.4-20.8 12.73-2.3 19.85-2.7 29.68-2.3 3.25.13 4.13.16 5.6.14 5.15-.07 9.71-1.04 16.61-3.8 20.74-8.3 38.75-12.04 59.19-12.04 3.05 0 6.03.15 10.48.48l2.09.16c12.45.96 18.08.96 25.34-.63a49.65 49.65 0 0 0 14.09-5.45v1.15a50.52 50.52 0 0 1-13.88 5.28c-7.38 1.61-13.08 1.61-25.63.65l-2.08-.16c-4.43-.33-7.39-.48-10.41-.48-20.3 0-38.2 3.72-58.81 11.96-7.01 2.8-11.7 3.8-16.97 3.88-1.5.02-2.39-.01-5.66-.14-9.76-.4-16.8-.01-29.47 2.3-15.06 2.73-24.32 9.58-30.71 20.31a72.8 72.8 0 0 0-3.9 7.63c-.12.28-2.39 5.47-3.01 6.79a22 22 0 0 1-3.1 5.1c-1.86 2.13-4.07 3.66-11.6 8.35-7.95 4.96-12.35 7.95-17.44 12.15-8.76 7.23-15.73 15.43-20.89 25.4-15.61 30.2-28.36 49.32-37.16 55.19-7.98 5.32-21.97 9.39-59.17 18.07-13.65 3.18-24.98 8.39-34.82 15.42-7.22 5.16-12.27 10.01-19.92 18.43a86.07 86.07 0 0 1-6.57 6.4c-1.67 1.48-7.91 6.83-7.84 6.77-3.27 2.84-5.8 5.16-8.26 7.62a92.1 92.1 0 0 0-14.27 18.13c-4.3 7.16-3.22 11.89 2.53 15.26 4.47 2.63 9.88 3.99 23.24 6.39a185.7 185.7 0 0 1 12.92 2.6c12.11 3.03 20.64.84 32.06-5.96l4.4-2.65c1.66-1 2.96-1.73 4.2-2.35.95-.48 6.04-3.14 7.6-3.92 9.59-4.8 17.04-6.94 24.49-5.98a24.1 24.1 0 0 1 10.4 3.93c7.82 5.21 8.45 12.52 4.7 25.13-.32 1.07-.64 2.1-1.16 3.74-2.57 8.12-3.31 11.04-3.31 14.55 0 10.88-5.66 23.14-15.08 37.28a41.28 41.28 0 0 0-3.97 7.46c-.37.9-.73 1.82-1.18 3.04-3.25 8.85-4.21 11.13-7.84 17.47-7.67 13.42-33.43 16.95-47.7 8.18a578.4 578.4 0 0 0-6.4-3.89c-3.4-2.04-16.36-9.67-17.67-10.45-8.38-4.97-16.36-9.78-25.92-15.66-9.5-5.85-15.7-7.7-19.24-6.36-2.68 1.02-3.8 3.82-4 8.51a61.12 61.12 0 0 0-.02 3.72l.02 1.7c0 4.5-2.69 8.73-11.52 19.87-3.92 4.95-5.87 7.59-7.55 10.39-2.39 3.97-4.08 10.56-6.56 23.72l-1.05 5.62-.86 4.4zm10.5 0h-1c.03-.34.04-.68.04-1 0-12.39 8.48-33.57 19.16-43.37a26.18 26.18 0 0 0 3.67-4.17 35.8 35.8 0 0 0 2.88-4.9c.36-.72 1.75-3.66 2.1-4.36 3.22-6.29 6.84-6.54 16.97.39 1.34.9 6.07 4.16 6.4 4.38 2.62 1.8 4.67 3.2 6.7 4.56 5.03 3.39 9.37 6.2 13.51 8.7 14.33 8.67 25.49 13.27 34.11 13.27 16.86 0 32.71-5.95 39.6-14.8 1.59-2.04 3.2-5.17 5.06-9.63.8-1.92 1.64-4.06 2.67-6.8l2.74-7.33c4.66-12.44 7.76-19.06 11.56-23.27 7.9-8.79 14.87-36 14.87-52.67 0-1.9.17-3.11 1.02-8.27.37-2.2.58-3.6.74-5.07.63-5.51.21-9.46-1.68-12.39-4.6-7.1-19.7-9.23-38.46-4.78a100.57 100.57 0 0 0-18.94 6.3c-5.17 2.37-17.11 9.74-16.5 9.4-6.72 3.64-12.97 4.15-24.8 1.3-29.55-7.14-30.43-8.62-15.26-26.81 17.44-20.93 47.12-46.18 56.38-46.18 9.92 0 53.84-11.98 65.78-17.95 9.46-4.73 24.32-21.18 36.82-37.85.71-.95 13.5-21.6 19.2-29.6 9.35-13.13 18.22-22.55 26.95-27.53 7.29-4.17 13.16-10.28 18.8-18.73 1.93-2.9 10.52-17.65 12.73-20.41 1.54-1.93 3-3.21 4.52-3.89 14.07-6.25 24.22-9.04 39.2-9.04h29c4.05 0 7.36-.4 22.93-2.5l4.3-.57c9.92-1.3 16.57-1.93 21.77-1.93 1.66 0 2.95.01 6.03.04 18.61.19 28.55-.48 44.86-4.03 3.1-.67 6.13-1.78 9.11-3.31v1.12a37.96 37.96 0 0 1-8.9 3.17c-16.4 3.56-26.4 4.24-45.08 4.05-3.08-.03-4.36-.04-6.02-.04-5.15 0-11.76.63-21.64 1.92l-4.3.58c-15.64 2.11-18.94 2.5-23.06 2.5h-29c-14.81 0-24.84 2.75-38.8 8.96-1.34.6-2.69 1.78-4.14 3.6-2.16 2.68-10.72 17.39-12.68 20.33-5.72 8.57-11.7 14.8-19.13 19.04-8.57 4.9-17.36 14.23-26.63 27.24-5.68 7.97-18.47 28.64-19.22 29.63-12.6 16.8-27.52 33.32-37.18 38.15-12.06 6.03-56.14 18.05-66.22 18.05-8.82 0-38.39 25.15-55.62 45.82-14.6 17.52-14.19 18.21 14.74 25.2 11.6 2.8 17.6 2.3 24.09-1.2-.67.35 11.31-7.03 16.56-9.44 5.41-2.48 11.6-4.59 19.11-6.37 19.13-4.53 34.65-2.35 39.54 5.22 2.05 3.17 2.48 7.32 1.84 13.04a96.34 96.34 0 0 1-.75 5.13c-.84 5.08-1.01 6.29-1.01 8.1 0 16.9-7.03 44.33-15.13 53.33-3.68 4.09-6.76 10.65-11.37 22.96-.35.93-2.2 5.94-2.73 7.33-1.04 2.76-1.88 4.9-2.68 6.84-1.9 4.53-3.55 7.73-5.2 9.85-7.1 9.13-23.25 15.19-40.39 15.19-8.86 0-20.15-4.65-34.63-13.42-4.15-2.51-8.5-5.32-13.55-8.72a861.54 861.54 0 0 1-6.71-4.56l-6.4-4.39c-9.68-6.63-12.61-6.42-15.5-.75-.35.68-1.74 3.62-2.1 4.35a36.77 36.77 0 0 1-2.96 5.03c-1.12 1.57-2.37 3-3.81 4.33-10.47 9.6-18.84 30.51-18.84 42.63l-.03 1zm-29.65 0h-1.1c1.17-2.52 1.79-5.2 1.79-8 0-20 4.83-42.04 12.15-49.35 5.17-5.18 7.77-8.38 9.9-12.74 2.64-5.41 3.95-12 3.95-20.91 0-6.82 1.14-11.59 3.37-15.07 1.74-2.7 3.6-4.21 8.91-7.52a31.64 31.64 0 0 0 3.9-2.79c4.61-3.96 6.58-6.2 7.72-9.41 1.43-4.02.93-9.04-1.86-16.02a68.98 68.98 0 0 0-3.99-8.07l-.93-1.7a75.47 75.47 0 0 1-2.64-5c-5.16-10.71-3.77-18.9 7.68-29.78a204 204 0 0 1 26.81-21.55c3.96-2.69 16.8-10.8 19.24-12.5 1.99-1.4 4.33-3.3 7.77-6.3-.02 0 7.23-6.39 9.47-8.3 4.97-4.26 9.09-7.5 13.05-10.15 4.72-3.15 8.97-5.28 12.87-6.32 12.78-3.41 15.6-4.18 21.77-5.97 12.55-3.64 21.96-6.9 28.14-10a45.47 45.47 0 0 1 7.47-2.79c8.66-2.66 12.02-4.1 16.97-8.1 6.78-5.46 13.07-14.25 19.33-27.87 15.97-34.77 19.08-39.39 32.15-49.19 3.14-2.36 6.37-4.1 11.43-6.4l2.33-1.04c11.93-5.35 16.87-8.93 21.1-17.38 1.88-3.77 2.48-6.29 3.37-12.27.78-5.19 1.48-7.56 3.53-10.25 2.57-3.4 7.03-6.27 14.36-9.01 3.37-1.26 7.36-2.5 12.05-3.73 16.33-4.3 25.28-5.36 39.6-5.81 6.9-.22 9.5-.56 12.66-2 1.19-.54 2.36-1.23 3.58-2.11 3.7-2.7 8.14-4.54 13.24-5.67 5.71-1.27 10.69-1.54 18.7-1.45l2.35.02c2.82 0 6.8-1 19.7-4.69 10.83-3.08 15.95-4.31 19.3-4.31.82 0 1.9.13 3.55.41l5.01.9c9.82 1.68 17.44 1.89 25.15-.21 7.98-2.18 14.8-6.77 20.29-14.24V147c-5.47 7.04-12.21 11.42-20.03 13.55-7.88 2.15-15.63 1.94-25.58.23l-5-.9c-1.6-.26-2.64-.39-3.39-.39-3.2 0-8.32 1.22-19.74 4.48-12.35 3.53-16.3 4.52-19.26 4.52l-2.36-.02c-7.94-.1-12.85.17-18.47 1.42-4.97 1.11-9.3 2.9-12.88 5.5a21.4 21.4 0 0 1-3.75 2.22c-3.32 1.5-6 1.87-13.04 2.09-14.25.44-23.13 1.5-39.37 5.77a125.56 125.56 0 0 0-11.95 3.7c-7.17 2.7-11.49 5.46-13.93 8.68-1.9 2.52-2.58 4.76-3.33 9.8-.9 6.08-1.53 8.68-3.47 12.56a30.6 30.6 0 0 1-9.66 11.45c-3.12 2.26-5.95 3.73-11.93 6.4l-2.31 1.04c-5.01 2.27-8.18 3.99-11.25 6.29-12.9 9.68-15.93 14.17-31.85 48.8-6.31 13.76-12.7 22.68-19.6 28.25-5.08 4.1-8.53 5.57-17.3 8.27a44.64 44.64 0 0 0-7.33 2.73c-6.24 3.12-15.7 6.4-28.3 10.06a867.4 867.4 0 0 1-21.8 5.97c-3.77 1.01-7.93 3.1-12.56 6.19a137.35 137.35 0 0 0-12.95 10.07c-2.24 1.92-9.48 8.3-9.48 8.3a98.2 98.2 0 0 1-7.84 6.37c-2.46 1.72-15.32 9.83-19.26 12.5a203 203 0 0 0-26.69 21.45c-11.13 10.58-12.43 18.3-7.47 28.63a74.52 74.52 0 0 0 2.62 4.95l.94 1.7a69.84 69.84 0 0 1 4.03 8.17c2.88 7.2 3.4 12.46 1.89 16.73-1.22 3.43-3.28 5.77-8.02 9.84-1.14.97-2.32 1.8-5.3 3.67-3.92 2.45-5.69 3.89-7.31 6.42-2.13 3.3-3.22 7.89-3.22 14.53 0 9.05-1.34 15.79-4.05 21.34-2.19 4.49-4.85 7.77-10.1 13.01-7.07 7.07-11.85 28.9-11.85 48.65 0 2.8-.58 5.48-1.7 8zm282.54 0h-1.01l-1.1-5.8c-3.08-16.26-4.05-26.2-2.74-37.26.7-5.8.77-9.68.55-15.3-.18-4.45-.17-5.68.19-7.63.78-4.3 3.44-8.53 10.39-16.34 9.07-10.2 12.26-15.41 19.8-30.15 1.35-2.64 2.33-4.47 3.38-6.3.9-1.58 1.82-3.06 2.77-4.5 3.14-4.7 7.03-8.42 16.84-16.81 11.22-9.6 15.5-13.86 18.13-19.13.7-1.4 1.3-2.8 1.93-4.4a206 206 0 0 0 1.49-4.05c3.63-9.94 8.01-13.93 22.9-17.81 4.99-1.3 20.55-5.13 21.38-5.34 16.19-4.1 25.33-7.36 33.48-12.6 5.86-3.77 5.84-3.76 27.66-16.53l2.6-1.52c10.23-6 17.1-10.2 22.73-13.95a149.3 149.3 0 0 0 8.8-6.3 723.7 723.7 0 0 0 6.37-5.08A87.74 87.74 0 0 1 600 342.95v1.12a85.76 85.76 0 0 0-15.49 9.9c.18-.14-4.76 3.84-6.38 5.1a150.3 150.3 0 0 1-8.85 6.35c-5.65 3.76-12.53 7.96-22.78 13.97l-2.6 1.53c-21.8 12.75-21.78 12.74-27.63 16.5-8.27 5.32-17.49 8.61-33.78 12.73-.83.21-16.39 4.04-21.36 5.33-8.03 2.1-13.15 4.5-16.45 7.5-2.66 2.42-4 4.86-5.77 9.7l-1.5 4.07a51.12 51.12 0 0 1-1.96 4.47c-2.72 5.45-7.04 9.75-18.38 19.45-9.73 8.32-13.6 12.02-16.65 16.6a77.18 77.18 0 0 0-2.74 4.45c-1.05 1.81-2.01 3.63-3.35 6.25-7.58 14.81-10.82 20.08-19.96 30.36-6.83 7.7-9.4 11.78-10.15 15.86-.34 1.85-.34 3.04-.17 7.4.22 5.68.14 9.6-.55 15.47-1.3 10.92-.34 20.79 2.73 36.95l1.12 5.99zm-76.59 0h-2.1l1.39-4.3c1.04-3.3 1.93-6.78 2.68-10.4 2.65-12.73 3.27-23.63 3.27-41.3 0-5.71-1.86-9.75-4.13-9.75-2.94 0-6.96 5.61-10.93 17.08C271.14 579.68 258.3 593 238 593c-22.42 0-29.26-1.35-48.42-10.09a87.69 87.69 0 0 1-9.42-5.04c-2.95-1.8-12.78-8.57-14.84-9.72-4.2-2.36-7-2.71-9.72-.99-.63.4-1.26.91-1.9 1.55a57.69 57.69 0 0 1-4.31 3.86 147.88 147.88 0 0 1-3.06 2.44l-1 .8C137.01 582.43 134 587.18 134 597c0 1.02-.02 2.01-.07 3h-2c.05-.99.07-1.98.07-3 0-10.52 3.33-15.78 12.09-22.76a265.61 265.61 0 0 1 2-1.6c.83-.64 1.43-1.13 2.03-1.61a55.76 55.76 0 0 0 4.17-3.74c.74-.73 1.48-1.34 2.24-1.82 3.47-2.2 7-1.75 11.77.93 2.15 1.21 12.03 8 14.9 9.76a85.7 85.7 0 0 0 9.22 4.93C209.29 589.7 215.85 591 238 591c19.25 0 31.49-12.7 41.06-40.33 4.24-12.25 8.66-18.42 12.81-18.42 3.8 0 6.13 5.06 6.13 11.75 0 17.8-.63 28.8-3.3 41.7-.77 3.7-1.68 7.23-2.75 10.6-.4 1.3-.8 2.53-1.19 3.7zm-149.25 0l.5-.94a160.1 160.1 0 0 0 6.53-13.26c2.73-6.29 5.78-9.64 9.24-10.52 3.74-.95 7.15.74 12.56 5.13 5.43 4.4 6.07 4.86 7.73 5.1 1.6.22 4.28 1.14 8.86 2.95 1.3.5 10.78 4.35 13.85 5.55 3.07 1.2 5.85 2.25 8.49 3.18 3.1 1.1 5.98 2.04 8.65 2.81h-3.45c-1.76-.56-3.6-1.18-5.54-1.87a281.2 281.2 0 0 1-8.51-3.19c-3.08-1.2-12.57-5.04-13.86-5.55-4.5-1.78-7.15-2.68-8.63-2.9-1.94-.27-2.53-.7-8.22-5.3-5.17-4.2-8.36-5.78-11.69-4.94-3.1.78-5.94 3.92-8.56 9.95a161 161 0 0 1-6.82 13.8h-1.13zm112.89 0a30.34 30.34 0 0 0 11.27-6.27c1.55-1.36 3.32-3.46 5.34-6.29 1.05-1.46 2.15-3.1 3.41-5.04a349.73 349.73 0 0 0 2.5-3.9l.47-.75.93-1.47a89.17 89.17 0 0 1 3.25-4.86c1.05-1.43 1.82-2.23 2.44-2.46 1.02-.37 1.49.48 1.49 2.04l.01 2.11c.05 6.91-.08 11.32-.7 16.33a48.4 48.4 0 0 1-2.38 10.56h-1.07a46.47 46.47 0 0 0 2.45-10.68c.62-4.96.75-9.33.7-16.2l-.01-2.12c0-.97-.08-1.12-.15-1.1-.36.14-1.05.85-1.97 2.1a88.44 88.44 0 0 0-3.22 4.82l-.92 1.46-.48.75a1268.1 1268.1 0 0 1-2.5 3.92c-1.26 1.95-2.38 3.6-3.44 5.08-2.06 2.88-3.87 5.04-5.5 6.45a30.87 30.87 0 0 1-8.94 5.52h-2.98zm-183.72 0H69.3c3.37-3.43 5.19-8.33 5.19-15 0-18.6-.04-17.35 1.02-20.77.6-1.93 1.5-3.74 3.27-6.63.42-.7 4.92-7.8 6.78-10.86 3.04-4.97 11.04-16.5 12.21-18.56 3.48-6.08 4.72-12.06 4.72-24.18 0-7.85 2.5-14.2 8.1-23.44l2.84-4.63a72.67 72.67 0 0 0 2.49-4.4c1.62-3.15 2.48-5.78 2.62-8.28.2-3.78-1.3-7.29-4.9-10.9-5.13-5.12-8.6-5.43-11.2-1.85-2.12 2.92-3.48 7.74-5.06 16.47-.2 1.03-.82 4.6-.82 4.57-.83 4.67-1.4 7.33-2.1 9.6-1.35 4.42-3.7 7.61-8.36 12.26l-3.26 3.2c-6.38 6.39-9.68 11.51-11.36 19.5l-1.16 5.52c-.87 4.1-1.56 7.04-2.33 9.94-3.67 13.74-9.65 25.97-22.59 44.72-7.68 11.14-11.05 18.87-10.92 23.72h-1c-.12-5.16 3.35-13.05 11.1-24.28 12.87-18.67 18.8-30.8 22.44-44.42.77-2.88 1.45-5.8 2.32-9.89l1.16-5.51c1.73-8.22 5.13-13.5 11.64-20 .63-.64 2.84-2.8 3.25-3.21 4.57-4.54 6.82-7.62 8.12-11.84a81.58 81.58 0 0 0 2.07-9.48l.81-4.57c1.62-8.9 3-13.8 5.24-16.89 3-4.15 7.2-3.78 12.71 1.74 3.8 3.8 5.42 7.58 5.2 11.66-.15 2.66-1.05 5.41-2.73 8.68a73.6 73.6 0 0 1-2.52 4.46l-2.84 4.63c-5.52 9.1-7.96 15.3-7.96 22.92 0 12.28-1.28 18.43-4.85 24.68-1.2 2.1-9.21 13.65-12.22 18.58-1.87 3.06-6.37 10.18-6.78 10.86-1.73 2.82-2.6 4.57-3.17 6.4-1.02 3.28-.98 2.1-.98 20.48 0 6.52-1.7 11.44-4.82 15zM310.09 0h1.06c-.37.9-.77 1.83-1.2 2.82-3.9 9.06-5.45 15.15-5.45 25.18 0 7.64-2.1 11.6-6.64 13.05-3.46 1.1-5.72.98-17.57-.43-11.55-1.36-19.17-1.58-28.16-.14-6.24 2.49-25.91 7.02-32.13 7.02-11.15 0-36.76-2.88-54.12-7.01a22.08 22.08 0 0 0-16.95 2.48c-4.05 2.33-7.09 5.03-13.9 11.97-6.28 6.39-9.53 9.23-13.8 11.5-7.09 3.79-11.22 7.65-13.4 12.27-1.82 3.85-2.33 7.84-2.33 15.29 0 4.4-2.65 6.69-9.45 9.74.1-.05-2.97 1.31-3.84 1.71-8.78 4.06-12.71 8.29-12.71 16.55 0 12.52-4.86 19.22-17.34 27.96l-4.56 3.14c-1.9 1.3-3.3 2.3-4.67 3.3-.92.68-1.79 1.34-2.62 2-7.16 5.62-11 14.54-15.56 33.28-.63 2.57-3.3 14-4.07 17.14a350.44 350.44 0 0 1-5.2 19.33c-1.37 4.5-4.5 15.07-4.96 16.53-1.05 3.4-1.64 4.94-2.46 6.32-.82 1.4-6.85 9.08-12.64 18.27L0 277.98v-1.9l4.58-7.35a270.8 270.8 0 0 1 12.61-18.23c-.3.5 1.35-2.8 2.38-6.12.45-1.44 3.58-12.01 4.95-16.53 1.83-6.03 3.44-12.09 5.19-19.27.76-3.13 3.44-14.56 4.06-17.14 4.62-18.95 8.52-28.02 15.92-33.83.84-.67 1.72-1.33 2.65-2.01 1.38-1.02 2.8-2.01 4.7-3.32l4.54-3.14C73.83 140.57 78.5 134.13 78.5 122c0-8.74 4.2-13.26 13.29-17.45.88-.41 3.96-1.77 3.85-1.73 6.46-2.9 8.86-4.97 8.86-8.82 0-7.6.53-11.7 2.42-15.71 2.29-4.84 6.57-8.85 13.84-12.73 4.15-2.21 7.35-5 14.15-11.93 6.28-6.4 9.36-9.13 13.52-11.53a23.07 23.07 0 0 1 17.69-2.59c17.27 4.12 42.8 6.99 53.88 6.99 6.1 0 25.73-4.53 31.92-7 9.12-1.46 16.83-1.25 28.49.13 11.63 1.38 13.9 1.5 17.15.47 4.06-1.3 5.94-4.85 5.94-12.1 0-10.1 1.56-16.3 6.6-28zm25.12 0h1c.05 5.62.26 11.48.65 19.4.47 9.7.64 14.57.64 21.6 0 9.81-4.68 17.46-13.1 23.16-6.53 4.43-14.94 7.46-24.33 9.33-3.74.54-9.42.56-22.68.23-6.74-.17-9.35-.22-12.39-.22-2.77 0-4.97.43-7.63 1.36-.88.3-4.55 1.74-5.58 2.11-6.55 2.35-13.59 3.53-24.79 3.53-8.1 0-13.58-1.38-22.46-4.9l-3.18-1.25c-12.55-4.87-21.27-5.15-37.18 1.12-11.15 4.39-18.13 9.2-22.28 14.81-3.15 4.26-4.33 7.8-5.94 15.8-1.22 6.09-1.93 8.74-3.5 12.13-1.65 3.53-3.97 5.81-7.07 7.22-2.33 1.07-4.35 1.5-9.32 2.19-9.04 1.27-12.77 3.09-15.61 9.58-3.71 8.48-7.72 13.87-14.22 19.76-2.4 2.18-13.14 11.02-15.91 13.42-8.2 7.1-13.85 17.37-18.7 31.97a258.81 258.81 0 0 0-3.27 10.7c-.01.05-2.26 7.97-2.88 10.1-8.49 28.85-17.88 52.95-26.13 61.2-2.8 2.8-5.06 5.64-10.4 12.96-3.4 4.68-6.23 8.25-8.95 11.1v-1.55c2.74-2.98 5.73-6.82 9.48-11.97 4.03-5.52 6.32-8.4 9.17-11.24 8.07-8.08 17.44-32.14 25.87-60.8.62-2.1 2.86-10.03 2.88-10.08 1.21-4.24 2.21-7.53 3.28-10.74 4.9-14.75 10.63-25.16 19-32.4 2.78-2.42 13.5-11.25 15.89-13.4 6.4-5.8 10.32-11.09 13.97-19.43 1.68-3.83 4.05-6.31 7.2-7.86 2.4-1.17 4.64-1.67 9.53-2.36 4.54-.63 6.5-1.05 8.7-2.06 2.89-1.31 5.03-3.42 6.58-6.73 1.53-3.3 2.23-5.9 3.43-11.9 1.64-8.14 2.85-11.79 6.11-16.2 4.28-5.79 11.41-10.7 22.73-15.16 16.15-6.36 25.13-6.07 37.9-1.11l3.19 1.26c8.77 3.47 14.13 4.82 22.09 4.82 11.09 0 18.02-1.16 24.46-3.47 1-.36 4.68-1.8 5.58-2.11A22.5 22.5 0 0 1 265 72.5c3.05 0 5.67.05 14.07.26 11.53.29 17.2.27 20.83-.25 9.25-1.85 17.54-4.83 23.94-9.17C332 57.8 336.5 50.46 336.5 41c0-7-.17-11.86-.7-22.7-.35-7.26-.55-12.83-.59-18.3zM93.87 0h2.04c-.7 4-1.61 6.82-3.03 9.47-2.33 4.38-2.85 5.75-5.26 13.03a40.46 40.46 0 0 1-1.94 5.03c-2.24 4.66-5.92 8.8-13.07 14.26-8.01 6.13-14.27 16.55-20.03 31.55-2.4 6.23-8.75 25.63-9.64 28.01-2.69 7.16-6.56 12.7-15.63 23.68l-2.68 3.24c-6.02 7.34-9.35 12.07-11.72 17.15-2.3 4.94-7.12 9.9-12.91 14.15v-2.4c5.14-3.94 9.1-8.3 11.1-12.6 2.46-5.27 5.87-10.1 11.98-17.56l2.68-3.26c8.94-10.8 12.72-16.22 15.3-23.1.88-2.33 7.24-21.74 9.65-28.03 5.89-15.31 12.3-26 20.68-32.41 6.92-5.3 10.4-9.2 12.48-13.55.65-1.35 1.16-2.7 1.85-4.79 2.45-7.4 3-8.83 5.4-13.34A27.68 27.68 0 0 0 93.87 0zm9.07 0h1.02c-1.66 8.3-2.91 12.67-4.54 15.26a59.14 59.14 0 0 0-4.1 8.21c-1.27 3-2.44 6.2-3.5 9.4-.38 1.12-.7 2.16-2.41 5.39a251.48 251.48 0 0 0-12.81 13.3c-3.48 3.96-5.95 7.27-7.15 9.66-.95 1.9-2.06 5.99-3.61 12.97-.64 2.9-3.65 17.15-4.51 21.07-3.63 16.45-6.63 26.69-9.9 32-7.66 12.45-10.64 15.71-37.08 41.1A69.78 69.78 0 0 1 0 179.21v-1.15a69.39 69.39 0 0 0 13.65-10.42c26.4-25.33 29.32-28.55 36.92-40.9 3.2-5.18 6.18-15.37 9.78-31.7.86-3.91 3.87-18.16 4.51-21.06 1.57-7.09 2.7-11.2 3.7-13.2 1.24-2.5 3.76-5.86 7.29-9.89.9-1.03 1.86-2.1 2.86-3.18 2.4-2.6 4.96-5.22 7.53-7.76.9-.88 1.73-1.7 3.37-3.4a129.02 129.02 0 0 1 4.78-13.46 60.07 60.07 0 0 1 4.19-8.35c1.52-2.44 2.74-6.71 4.36-14.74zM83.71 0h1.1c-2.09 4.74-6.03 8.92-11.42 12.3-7.2 4.52-16.5 7.2-24.39 7.2-8.9 0-11.8 7-11.74 21.52 0 1.7.04 3.17.12 5.99.1 3.3.12 4.45.12 5.99 0 5.73-.76 11.3-2.01 16.5a66.67 66.67 0 0 1-2.15 6.97 2597.76 2597.76 0 0 1-7 15.86A4270.8 4270.8 0 0 1 6.44 136.2 54.64 54.64 0 0 1 0 147v-1.65a54.87 54.87 0 0 0 5.55-9.57A4269.82 4269.82 0 0 0 30.7 79.97c.53-1.2.99-2.23 2.44-5.9A69.23 69.23 0 0 0 36.5 53c0-1.52-.03-2.66-.12-5.95-.08-2.83-.12-4.31-.12-6.01-.03-6.79.53-11.62 2.07-15.34 1.94-4.68 5.39-7.19 10.67-7.19 7.7 0 16.81-2.63 23.86-7.05C77.93 8.27 81.66 4.38 83.7 0zm282.63 0h1.01c1.86 10.02 2.18 12.67 2.32 18.3a123.43 123.43 0 0 1 .37 27.83c-.96 8.78-3.1 16.01-6.63 21.15-11.34 16.5-39.8 29.22-66.41 29.22-5.09 0-10.47.28-16.31.83a413.8 413.8 0 0 0-24.37 3.16c-21.56 3.26-27.66 4.01-36.32 4.01-6.92 0-12.2-1.05-21.69-3.9l-2.78-.83c-1.39-.41-2.54-.74-3.65-1.02-8-2.05-14.22-2.04-21.7.72a16.32 16.32 0 0 0-9.17 8.18c-1.6 3.05-2.5 6.06-4.02 12.83-1.5 6.64-2.34 9.52-3.99 12.64a16.16 16.16 0 0 1-9.85 8.36 104.8 104.8 0 0 0-9.5 3.42c-6.55 2.8-10.1 5.57-13.8 10.47-1.33 1.75-1.03 1.3-5.43 7.9-1.98 2.97-4.66 5.8-8.48 9.14-2.01 1.76-10.71 8.83-12.88 10.7-7.37 6.35-12.58 12.14-16.63 19.14-4.22 7.3-7.8 18.3-11.28 33.26-.87 3.73-1.72 7.64-2.64 12.14l-1.18 5.8-1.09 5.45c-1.8 8.96-2.77 13.28-3.77 16.26-6.8 20.44-17.26 42.16-27.13 51.2-5.11 4.7-8.1 7.07-11.1 8.86-.9.54-1.84 1.04-2.92 1.57-.44.22-9.6 4.4-14.1 6.66l-1.22.62v-1.13l.78-.39c4.52-2.26 13.67-6.44 14.1-6.65a41.19 41.19 0 0 0 2.84-1.54c2.94-1.75 5.88-4.09 10.94-8.73 9.71-8.9 20.1-30.51 26.87-50.79.97-2.92 1.94-7.22 3.73-16.13l1.1-5.46a490.5 490.5 0 0 1 3.82-17.96c3.5-15.06 7.1-26.14 11.39-33.54 4.11-7.11 9.4-12.98 16.83-19.4 2.19-1.88 10.88-8.95 12.88-10.7 3.77-3.28 6.39-6.05 8.3-8.93 4.43-6.64 4.12-6.18 5.47-7.96 3.8-5.03 7.5-7.91 14.21-10.78 2.61-1.12 5.74-2.24 9.59-3.46a15.17 15.17 0 0 0 9.27-7.86c1.59-3.02 2.42-5.85 4.03-12.99 1.41-6.27 2.32-9.33 3.98-12.48a17.31 17.31 0 0 1 9.7-8.66c7.7-2.83 14.1-2.84 22.3-.75 1.12.29 2.28.61 3.68 1.03l3.73 1.11c8.47 2.54 13.66 3.58 20.46 3.58 8.59 0 14.67-.75 36.18-4a414.64 414.64 0 0 1 24.41-3.17c5.88-.54 11.29-.83 16.41-.83 26.3 0 54.45-12.58 65.59-28.78 3.42-4.98 5.5-12.06 6.46-20.7.84-7.74.73-16.02.02-23.9a136.2 136.2 0 0 0-.57-5.12c0-4.47-.3-6.94-2.16-17zM18.88 0h1.03C18 7.57 17.15 10.18 14.46 16.2c-1.95 4.37-2.67 9.19-2.42 14.89.2 4.33.71 7.7 2.28 16.13 1.09 5.88 1.57 8.77 1.94 12.2.96 8.9.24 16.08-2.8 22.79A463.4 463.4 0 0 1 0 109.43v-2.12a465 465 0 0 0 12.54-25.52c2.97-6.52 3.67-13.53 2.72-22.27-.36-3.4-.84-6.26-1.93-12.12-1.57-8.47-2.1-11.88-2.29-16.27-.26-5.84.48-10.81 2.5-15.33 2.64-5.9 3.48-8.47 5.34-15.8zm280.47 0a70.78 70.78 0 0 1-4.91 11.24c-2.56 4.7-4.01 8.45-4.86 11.98l-.4 1.8-.28 1.45a5.28 5.28 0 0 1-.74 2.07c-.74 1.03-1.93 1.28-5.13 1.25.92 0-9.85-.29-15.03-.29-10.2 0-18.45.82-29.46 2.56-16.87 2.66-17.73 2.77-23.66 2.52a42.57 42.57 0 0 1-8-1.09c-17.7-4.16-46.18-5.86-54.72-3.01-2.72.9-5.88 2.8-9.52 5.59a112.37 112.37 0 0 0-6.54 5.48c-1.4 1.25-9.17 8.5-10.78 9.84-1.45 1.2-8.18 7.42-8.85 8.02a114.65 114.65 0 0 1-4.55 3.9c-4.99 4.03-8.9 6.2-11.92 6.2-3.52.05-4.32 0-5.14-.4-1.13-.56-1.5-1.72-1.13-3.57.74-3.63 4.47-10.84 12.84-24.8 5.69-9.48 9.42-18 11.78-26.2 1.45-5.04 1.94-7.4 2.97-14.54h1.01c-1.05 7.3-1.54 9.7-3.01 14.82-2.39 8.28-6.16 16.89-11.9 26.44-8.3 13.84-12 21.01-12.7 24.48-.3 1.45-.08 2.14.59 2.47.6.3 1.35.35 3.48.3 3.92 0 7.69-2.1 12.5-5.98 1.4-1.13 2.87-2.39 4.51-3.86.66-.59 7.41-6.83 8.88-8.05 1.59-1.33 9.34-8.55 10.75-9.82 2.4-2.15 4.55-3.96 6.6-5.53 3.72-2.85 6.97-4.8 9.81-5.74 8.76-2.92 37.41-1.22 55.27 2.99 2.57.6 5.14.95 7.81 1.06 5.84.25 6.7.14 23.47-2.51 11.05-1.75 19.36-2.57 29.6-2.57 5.2 0 15.99.3 15.05.29 2.87.03 3.84-.17 4.3-.83.23-.32.4-.8.58-1.7l.28-1.43.4-1.85c.88-3.6 2.36-7.44 4.96-12.22 1.87-3.43 3.44-7 4.73-10.76h1.06zm-8.59 0c-5.91 17.94-9.55 22-19.76 22-4.5 0-10.22.32-28.69 1.5l-1.53.1c-15.6.99-23.47 1.4-28.78 1.4-5.35 0-13.24-.96-28.86-3.28l-1.54-.23C163.18 18.75 157.47 18 153 18c-4.45 0-7.3 1.01-10.96 3.34-.1.06-1.8 1.17-2.3 1.47-2.43 1.5-4.32 2.19-6.74 2.19-2.8 0-4.11-1.46-4.11-4.22 0-1.04.16-2.29.5-4.1.16-.82.9-4.4 1.07-5.32.8-4.11 1.3-7.68 1.47-11.36h2c-.17 3.82-.68 7.5-1.5 11.75-.19.94-.92 4.5-1.07 5.31a21.04 21.04 0 0 0-.47 3.72c0 1.7.46 2.22 2.11 2.22 1.99 0 3.55-.57 5.7-1.9.47-.28 2.15-1.37 2.26-1.44C144.92 17.14 148.12 16 153 16c4.62 0 10.3.74 28.9 3.51l1.53.23C198.93 22.04 206.8 23 212 23c5.25 0 13.11-.41 28.65-1.4l1.54-.1C260.73 20.32 266.43 20 271 20c8.95 0 12.15-3.4 17.66-20h2.1zM141.51 0h1.13c-2.06 3.86-2.63 5.1-2.77 6.19-.15 1.12.42 1.64 2.32 1.96 1.8.3 3.85.35 10.81.35 6.02 0 13 .56 21.35 1.62 3.95.5 8.03 1.1 13.13 1.89 24 3.7 22.5 3.49 26.83 3.49 24.02 0 51.83-2.24 60.45-6.94 2.88-1.57 5.05-4.49 6.6-8.56h1.07c-1.64 4.47-3.98 7.69-7.2 9.44-8.83 4.82-36.67 7.06-60.92 7.06-4.41 0-2.84.22-26.98-3.5-5.1-.8-9.17-1.38-13.1-1.88-8.31-1.06-15.26-1.62-21.23-1.62-7.04 0-9.1-.05-10.97-.37-2.38-.4-3.38-1.32-3.15-3.07.16-1.22.69-2.41 2.63-6.06zm76.4 0c5.69 1.64 10.37 2.5 14.09 2.5 9.59 0 16.7-.71 22.4-2.5h2.98C251.12 2.53 243.2 3.5 232 3.5c-4.5 0-10.32-1.21-17.53-3.5h3.45zM70.69 0c-2.87 3.27-6.95 5.39-12.02 6.53-3.98.89-7.5 1.08-12.92 1A97.24 97.24 0 0 0 44 7.5c-5.37 0-8.86-1.24-10.1-4.97A8.6 8.6 0 0 1 33.5 0h.99c.02.82.14 1.56.36 2.22C35.91 5.39 39.02 6.5 44 6.5l1.76.02c5.35.09 8.8-.1 12.69-.97C62.95 4.54 66.63 2.74 69.3 0h1.37zM0 207.87c7.31-.16 11.5 3.33 11.5 11.13 0 11.41-5.05 28.35-11.5 41.5v-2.3c5.93-12.72 10.5-28.47 10.5-39.2 0-7.18-3.7-10.3-10.5-10.13v-1zm0 7.05c1.23.14 2.18.58 2.87 1.31 1.4 1.48 1.6 3.72 1.16 7.58l-.16 1.3A28.93 28.93 0 0 0 3.5 229c0 3.2-1.48 9.52-3.5 15.9v-3.45c1.49-5.13 2.5-9.87 2.5-12.45 0-.98.08-1.75.37-4.02l.16-1.29c.42-3.56.24-5.59-.88-6.77-.5-.53-1.21-.87-2.15-1v-1zM0 410.9v-1.47a21.67 21.67 0 0 0 2.97-4.7c1.32-2.7 2.68-6.28 4.56-11.89 7.85-23.55 7.83-26.6.25-30.4-2.25-1.12-4.8-1.43-7.78-.91v-1.02a13.1 13.1 0 0 1 8.22 1.04c8.24 4.12 8.26 7.6.25 31.6-1.88 5.66-3.25 9.27-4.6 12.02A20.82 20.82 0 0 1 0 410.9zM33.64 452c1.68 0 3.04-.23 8.34-1.31l2.38-.47c8.26-1.57 12.72-1.3 14.53 2.33 1.38 2.75-.47 5.86-4.75 9.68a75.6 75.6 0 0 1-5.08 4.07c-.94.7-4.89 3.59-5.79 4.27-1.86 1.4-2.97 2.37-3.47 3.03a19.08 19.08 0 0 0-2.89 5.5c.07-.2-4.02 13.65-6.96 22.22-2.7 7.85-5.56 10.72-8.82 8.59-2.11-1.4-3.66-4.24-6.6-11.03-1.98-4.62-2.5-5.76-3.4-7.4-4.55-8.18-3.9-23.9-.05-32.87a9.6 9.6 0 0 1 6.98-5.96c2.59-.66 4.86-.75 11.78-.67l3.8.02zm0 2c-1.13 0-2.09 0-3.82-.02-12.07-.13-14.83.57-16.9 5.41-3.63 8.47-4.26 23.55-.05 31.12.96 1.73 1.48 2.88 3.5 7.58 2.72 6.3 4.24 9.08 5.86 10.14 1.64 1.08 3.5-.8 5.82-7.55a682.9 682.9 0 0 0 6.97-22.24 21.03 21.03 0 0 1 3.18-6.04c.65-.87 1.85-1.9 3.86-3.43.92-.7 4.87-3.57 5.8-4.27 2.02-1.5 3.6-2.77 4.95-3.97 3.63-3.23 5.09-5.7 4.3-7.28-1.21-2.42-5.07-2.65-12.38-1.27l-2.35.47c-5.49 1.11-6.86 1.35-8.74 1.35zm345.63 146c-3.45-12.26-3.77-14.13-3.77-19 0-3.33-.13-6.27-.43-11.34-.63-10.33-.65-13.5.26-17.07 1.21-4.74 4.21-7.1 9.67-7.1h26c4.08 0 5.19 1.85 5.93 7.11.1.79.13.97.19 1.32.84 5.35 2.8 7.58 8.88 7.58 3.64 0 5.54.4 6.43 1.37.76.83.76 1.44.36 3.93-.85 5.26.5 8.85 7.5 13.8 6.32 4.45 11.63 5.36 16.55 3.37 3.8-1.54 6.73-4.16 11.92-10l1.1-1.23 1.09-1.23a75.6 75.6 0 0 1 2.7-2.86 35.81 35.81 0 0 1 9.57-6.73c1.52-.76 1.72-.86 5.66-2.63 6.1-2.73 9.01-4.5 11.74-7.62 2.63-3 4.67-4.85 6.7-6.04 3.18-1.85 5.46-2.13 13.68-2.13 5.98 0 10.56-4.32 18-14.99l2.82-4.03c1.06-1.5 1.94-2.7 2.79-3.79 7.87-10.12 19.38-10.4 30.74.96 5.54 5.53 10.17 19.43 13.64 38.51 2.5 13.75 4.18 29.46 4.47 39.84h-1c-.3-10.32-1.96-25.97-4.45-39.66-3.43-18.87-8.02-32.65-13.36-37.99-10.95-10.95-21.76-10.68-29.26-1.04-.83 1.07-1.7 2.26-2.75 3.75l-2.81 4.02c-7.65 10.95-12.38 15.42-18.83 15.42-8.04 0-10.21.26-13.17 2-1.92 1.12-3.9 2.9-6.45 5.83-2.86 3.26-5.87 5.09-12.09 7.88a103.35 103.35 0 0 0-5.62 2.6 34.84 34.84 0 0 0-9.32 6.54 74.67 74.67 0 0 0-3.75 4.05l-1.1 1.24c-5.28 5.95-8.29 8.64-12.28 10.25-5.26 2.13-10.92 1.17-17.5-3.48-7.33-5.17-8.82-9.15-7.92-14.77.34-2.12.34-2.6-.1-3.1-.64-.69-2.34-1.04-5.7-1.04-6.63 0-8.96-2.63-9.87-8.42l-.2-1.34c-.67-4.82-1.53-6.24-4.93-6.24h-26c-5 0-7.6 2.04-8.7 6.34-.88 3.43-.85 6.57-.23 16.76a177 177 0 0 1 .43 11.4c0 4.78.32 6.63 3.81 19h-1.04zm13.68 0c-1.31-6.58-1.61-10.71-1.36-14.84.04-.7.1-1.44.18-2.38l.23-2.56c.34-3.81.5-6.97.5-11.22 0-4.94 1.46-7.76 4.21-8.42 2.38-.58 5.56.54 9.2 3 6.64 4.52 13.99 13.07 16.55 19.23 4.77 11.44 14.12 15.69 33.54 15.69 8.6 0 14.32-2.35 20.67-7.88 1.45-1.26 15.06-15 21-20 7.21-6.07 11.77-7.59 20.62-8.32 5.52-.45 7.98-.9 11.44-2.36 4.58-1.95 9.36-5.48 14.9-11.29 7.43-7.76 13.25-8.92 17.47-4.3 3.32 3.63 5.46 10.58 6.82 20.24.73 5.17.94 7.74 1.58 17.38.25 3.75.17 5.32-.92 18.03h-1c1.09-12.7 1.17-14.28.92-17.97-.64-9.6-.85-12.16-1.57-17.3-1.33-9.47-3.43-16.27-6.56-19.7-3.76-4.11-8.93-3.08-16 4.32-5.65 5.9-10.54 9.5-15.25 11.5-3.58 1.53-6.13 1.99-11.6 2.44-8.8.72-13.17 2.18-20.2 8.1-5.9 4.96-19.5 18.7-21 19.99-6.52 5.68-12.47 8.12-21.32 8.12-19.78 0-29.5-4.42-34.46-16.3-2.49-5.97-9.71-14.38-16.2-18.79-3.42-2.32-6.36-3.35-8.4-2.86-2.2.53-3.44 2.92-3.44 7.45 0 4.28-.16 7.47-.5 11.31l-.23 2.56c-.09.93-.14 1.65-.19 2.35-.24 4.08.06 8.18 1.39 14.78h-1.02zm113.75 0c2.52-3.26 8.93-11.79 10.9-14.3 5.48-6.98 13.05-12.38 19.4-13.94 7.01-1.71 11.5 1.45 11.5 9.24 0 4.02-.04 5.16-.74 19h-1c.7-13.85.74-15 .74-19 0-7.12-3.86-9.83-10.26-8.26-6.11 1.5-13.5 6.77-18.85 13.57-1.86 2.36-7.65 10.07-10.43 13.69h-1.26zm-9.86-338.96c3.44 2.71 7 5.1 11.44 7.75 1.06.64 8.42 4.9 10.35 6.1 11.27 7 15 13.35 12.35 25.33-1.45 6.52-4.53 11.1-9.39 14.44-3.83 2.63-8.07 4.26-16.08 6.56-11.97 3.45-13.68 3.99-18.82 6.28a60.18 60.18 0 0 0-7.81 4.18c-11.11 7.07-19.1 7.7-27.96 3.28-3.56-1.77-17.2-11-17.2-11.01a101.77 101.77 0 0 0-5.2-3.07c-16.04-8.83-34.27-24.16-34.52-31.85-.11-3.46 1.99-6.57 6.28-10.26 1.03-.9 2.18-1.81 3.68-2.95.72-.55 3.38-2.56 3.94-3 4.47-3.4 7.18-5.79 9.32-8.45 11.12-13.82 26.55-28.68 34.36-32.28 12.06-5.54 19.84-5.77 27.37.12 3.25 2.54 5.65 6.54 8.58 13.35.29.65 2.3 5.45 2.88 6.74 1.62 3.65 2.9 5.8 4.24 6.94.72.6 1.45 1.2 2.2 1.8zm-3.49-.28c-1.63-1.39-3.03-3.74-4.77-7.65-.58-1.3-2.6-6.12-2.88-6.76-2.81-6.5-5.08-10.3-7.98-12.56-6.83-5.35-13.85-5.15-25.3.12-7.45 3.42-22.7 18.12-33.64 31.72-2.27 2.82-5.08 5.3-9.67 8.79l-3.94 2.98a79.98 79.98 0 0 0-3.59 2.88c-3.87 3.33-5.67 6-5.58 8.69.21 6.64 18.14 21.72 33.48 30.15 1.76.97 3.5 2 5.3 3.13.12.08 13.61 9.22 17.03 10.92 8.22 4.1 15.46 3.52 26-3.18a62.17 62.17 0 0 1 8.07-4.31c5.25-2.35 7-2.9 19.08-6.38 7.8-2.24 11.9-3.82 15.5-6.3 4.44-3.04 7.23-7.18 8.56-13.22 2.44-11.02-.83-16.6-11.45-23.2-1.9-1.18-9.23-5.42-10.32-6.08-4.5-2.69-8.13-5.12-11.64-7.9-.77-.6-1.52-1.21-2.26-1.84zM87.72 241.6c4.3-2.98 7.88-5 12.14-6.95.84-.4 1.73-.78 2.78-1.24l4.37-1.88a164.3 164.3 0 0 0 17.74-8.96 320.67 320.67 0 0 1 27.87-14.5c4.22-1.95 21.89-9.84 21.17-9.52 19.17-8.62 28.1-6.93 49.5 8.05 7.91 5.54 13.24 13.25 16.45 22.66 3.02 8.83 3.76 16.51 3.76 27.75 0 8.32-.66 12.95-3.68 18.97-4.18 8.36-12.3 16.14-25.58 23.47-24.45 13.49-38.83 27.55-52.83 47.84-8.83 12.8-47.76 44.21-65.16 54.15C75.04 413.55 48.89 423.5 31 423.5c-10.05 0-14.67-4.78-14.76-13.37-.07-6.32 2.06-13.73 6.3-24.32 2.95-7.37 2.02-12.9-2.16-22.29-3.19-7.17-3.88-9.14-3.88-12.52 0-3.35 1.87-6.9 5.52-11.07 2.61-3 3.5-3.83 11.9-11.5 5.09-4.66 8.08-7.6 10.7-10.75 9.46-11.36 12.62-19.47 17.9-44.78 3.12-15.05 6.63-20.28 15.12-25.25.8-.47 3.95-2.25 4.7-2.68a76.66 76.66 0 0 0 5.38-3.38zm.56.82a77.63 77.63 0 0 1-5.44 3.43l-4.7 2.67c-8.23 4.82-11.57 9.81-14.65 24.6-5.3 25.45-8.51 33.7-18.1 45.21-2.66 3.19-5.68 6.16-10.8 10.84-8.36 7.64-9.24 8.48-11.82 11.42-3.5 4.01-5.27 7.36-5.27 10.42 0 3.18.68 5.1 3.8 12.12 4.27 9.6 5.24 15.37 2.16 23.07-4.18 10.47-6.29 17.78-6.22 23.93.08 8.06 4.26 12.38 13.76 12.38 17.67 0 43.68-9.9 64.75-21.93 17.28-9.88 56.1-41.2 64.84-53.85 14.08-20.42 28.57-34.59 53.17-48.16 13.12-7.23 21.09-14.87 25.17-23.03 2.92-5.86 3.57-10.35 3.57-18.53 0-11.13-.74-18.73-3.7-27.43-3.15-9.22-8.36-16.75-16.09-22.16-21.13-14.8-29.7-16.42-48.5-7.95.7-.32-16.96 7.56-21.17 9.5-1.7.8-3.3 1.55-4.86 2.3a319.68 319.68 0 0 0-22.93 12.17 165.3 165.3 0 0 1-17.85 9.01l-4.37 1.88c-1.04.45-1.92.84-2.76 1.23a74.56 74.56 0 0 0-11.99 6.86zm-7.6 12.2c7.7-6.25 12.3-8.17 23.68-11.27 6.12-1.67 9.12-2.95 12.31-5.72 3.8-3.3 7.47-4.52 15.86-6.1 2.75-.52 3.67-.7 5.06-1.02 5.48-1.24 9.48-2.93 13.1-5.89 10.42-8.53 25.4-14.11 36.31-14.11 5.33 0 16.77 7.58 25.74 17.16 10.73 11.46 15.96 23.27 12.73 32.5-3.18 9.1-11.39 18.57-23.03 27.86-8.44 6.73-18.36 13-25.22 16.43-3.72 1.86-6.59 4.88-9.77 9.99-.69 1.1-11.1 20.25-16.03 27.83-5.62 8.65-15.4 17.36-30.23 27.96a552.58 552.58 0 0 1-9.2 6.42c-.13.09-6.81 4.65-8.6 5.89-6.47 4.46-10.35 7.35-13.05 9.83-11.64 10.67-37.14 15.54-43.7 8.98-1.96-1.96-2.2-4.06-1.95-10.52.37-9.42-.5-14.5-4.95-20.51a34.09 34.09 0 0 0-7.04-6.92c-3.93-2.95-6.07-6.11-6.56-9.49-.97-6.61 3.87-13.06 14.17-21.69 1.58-1.32 6.67-5.44 7.09-5.78a48.03 48.03 0 0 0 5.23-4.77c4.1-4.63 5.85-9.55 7.8-20.07a501.52 501.52 0 0 0 .8-4.37c.33-1.87.6-3.3.88-4.73.74-3.78 1.5-7.18 2.4-10.63 1-3.78 1.38-5.5 2.36-10.37.6-3.02.93-4.21 1.56-5.47 1.22-2.45 1.27-2.5 12.25-11.42zm.64.78c-10.77 8.74-10.88 8.84-12 11.08-.58 1.16-.88 2.3-1.47 5.22-.98 4.89-1.36 6.63-2.37 10.44-.9 3.43-1.65 6.8-2.39 10.56a339.79 339.79 0 0 0-1.29 6.95l-.39 2.15c-1.98 10.68-3.77 15.74-8.04 20.54a48.77 48.77 0 0 1-5.34 4.88c-.42.34-5.5 4.47-7.07 5.78-10.04 8.4-14.72 14.65-13.83 20.78.45 3.1 2.44 6.03 6.17 8.83 3 2.25 5.39 4.62 7.24 7.12 4.63 6.24 5.52 11.52 5.15 21.15-.25 6.14-.01 8.1 1.66 9.78 6.1 6.1 31.02 1.33 42.31-9.02 2.75-2.52 6.66-5.43 13.16-9.92l8.6-5.89c3.63-2.48 6.45-4.44 9.19-6.4 14.73-10.54 24.44-19.18 29.97-27.7 4.9-7.54 15.31-26.68 16.02-27.8 3.27-5.26 6.26-8.41 10.18-10.37 6.79-3.4 16.65-9.63 25.03-16.32 11.52-9.18 19.61-18.53 22.72-27.4 3.07-8.78-2.02-20.27-12.52-31.49-8.8-9.4-20.04-16.84-25.01-16.84-10.67 0-25.43 5.5-35.68 13.89-3.76 3.07-7.9 4.81-13.5 6.09-1.41.32-2.35.5-5.11 1.02-8.21 1.55-11.76 2.73-15.38 5.88-3.34 2.9-6.45 4.22-12.7 5.92-11.26 3.07-15.75 4.94-23.31 11.09zM212 251.85c0 7.56-.6 10.92-2.6 14.3-1.1 1.84-7.66 10.05-8.6 11.3-5.96 7.94-9.33 10.28-17.26 13.76-1.34.58-2.2 1-3.03 1.5-.55.33-1.2.66-2 1.02-.71.33-4.46 1.9-5.52 2.39-6.05 2.78-8.99 5.8-8.99 10.73 0 10.97-18.95 36.12-34.51 44.87-8.18 4.6-21.3 9.36-32.78 11.86-13.33 2.9-22.49 2.48-24.62-2.32-1.32-2.97-4.4-4.26-11.98-5.81l-.6-.12c-4.84-.99-6.94-1.55-9.03-2.64-2.92-1.5-4.48-3.7-4.48-6.84 0-2.74 1.08-5.77 3.25-9.67.85-1.53 1.82-3.13 3.23-5.35-.16.25 2.83-4.4 3.67-5.76 6.69-10.7 9.85-18.5 9.85-27.22 0-18.41 11.22-33.37 27.5-42.86 5.22-3.05 9.23-3.31 15.2-2.12 5.04 1 6.05.9 7.43-1.52 4.5-7.85 7.04-9.5 15.87-9.5 3.93 0 6.97-.98 10.47-3.16 1.56-.97 8.67-6.17 10.99-7.68 9.2-5.98 11.34-7 25.2-11.95 6.95-2.48 15.18 1.28 22.33 9.12 6.55 7.19 11.01 16.61 11.01 23.67zm-2 0c0-6.5-4.25-15.48-10.49-22.32-6.67-7.32-14.16-10.74-20.17-8.59-13.73 4.9-15.73 5.85-24.8 11.75-2.24 1.46-9.37 6.68-11.01 7.7-3.8 2.36-7.2 3.46-11.53 3.46-8.08 0-9.98 1.23-14.13 8.5-1.1 1.91-2.51 2.88-4.35 3.09-1.3.14-1.9.05-5.22-.61-5.53-1.1-9.07-.88-13.8 1.88-15.72 9.17-26.5 23.55-26.5 41.14 0 9.2-3.28 17.29-10.15 28.28l-3.68 5.77c-1.39 2.19-2.35 3.77-3.17 5.25-2.02 3.63-3 6.38-3 8.7 0 4.19 2.87 5.67 11.9 7.52l.61.12c8.27 1.7 11.7 3.13 13.4 6.95 3.17 7.14 36 0 54.6-10.46 14.98-8.43 33.49-32.99 33.49-43.13 0-5.9 3.47-9.48 10.16-12.55 1.1-.5 4.85-2.08 5.52-2.38.74-.34 1.32-.64 1.8-.93.92-.55 1.85-1 3.25-1.62 7.65-3.35 10.75-5.5 16.47-13.12 1.02-1.36 7.47-9.42 8.47-11.11 1.79-3.01 2.33-6.06 2.33-13.3zm-37.18-22.4c.15-.1 2.4-1.51 2.95-1.84.96-.57 1.7-.94 2.43-1.17 2.57-.83 5.06-.1 11.04 3.12 14.86 8 19.43 22.87 9.18 38.71-4.04 6.24-9.37 9-18.72 11.11-.85.2-1.2.27-3.13.68-6.04 1.29-8.78 2.08-11.6 3.65-3.63 2.02-6.09 4.98-7.5 9.44-7.87 24.93-19.72 43.34-36.28 50.31-16.45 6.93-21.13 8.53-27.98 8.89-4.94.25-9.8-.65-15.4-2.89a44.45 44.45 0 0 1-5.64-2.6c-4.02-2.33-5.14-4.74-4.5-9.31.3-2.13 3.77-15.53 4.84-20.65.63-3.05 1.19-6.14 1.75-9.69a464.04 464.04 0 0 0 1.35-8.9c1.42-9.41 2.5-14.27 4.49-18.65 2.46-5.43 6.13-9.03 11.72-11.13 6.59-2.47 10.54-3.1 18.03-3.53 4.75-.27 6.68-.64 9-2.05.61-.37 1.22-.81 1.82-1.33a30.61 30.61 0 0 0 3.37-3.4c.59-.69 2.38-2.9 2.63-3.19 3.36-4 6.3-5.53 12.33-5.53 3.94 0 5.9-.92 8.18-3.36-.17.18 2.75-3.14 3.85-4.22a30.95 30.95 0 0 1 6.79-5c1.5-.83 3.15-1.62 4.99-2.38a64.92 64.92 0 0 0 10.01-5.1zm-14.52 8.34a29.95 29.95 0 0 0-6.57 4.84 116.68 116.68 0 0 0-3.82 4.2c-2.46 2.63-4.68 3.67-8.91 3.67-5.72 0-8.39 1.39-11.57 5.17-.23.28-2.03 2.5-2.63 3.2a31.6 31.6 0 0 1-3.47 3.51c-.65.55-1.3 1.03-1.96 1.43-2.5 1.51-4.55 1.9-9.47 2.19-7.39.42-11.25 1.04-17.72 3.47-5.34 2-8.82 5.4-11.17 10.6-1.93 4.27-3 9.07-4.41 18.39l-.65 4.34-.7 4.57c-.57 3.56-1.12 6.67-1.76 9.73-1.08 5.18-4.54 18.53-4.83 20.59-.59 4.17.35 6.18 4.01 8.3 1.35.77 3.1 1.58 5.52 2.55 5.46 2.18 10.18 3.05 14.97 2.8 6.69-.34 11.32-1.93 27.65-8.8 16.21-6.83 27.92-25.01 35.71-49.7 1.49-4.7 4.12-7.86 7.97-10 2.93-1.63 5.74-2.45 11.87-3.76 1.92-.4 2.28-.49 3.12-.68 9.12-2.06 14.24-4.7 18.1-10.67 9.92-15.34 5.55-29.55-8.82-37.29-5.75-3.1-8.03-3.76-10.25-3.05-.65.2-1.33.54-2.23 1.08-.55.32-2.77 1.72-2.93 1.82a65.91 65.91 0 0 1-10.16 5.17c-1.8.75-3.42 1.52-4.89 2.33zm-42.39 32.72c16.15-2.87 26.36-.97 32.47 6.16 5.08 5.93 1.13 21.42-5.93 35.55-4.79 9.58-10.6 16.21-23.16 25.19-14.15 10.1-35.5 12.2-40.71 3.85-1.86-2.97-2.1-8.14-1.06-15.73.78-5.68 1.86-10.71 4.73-22.98l.12-.51c1.59-6.8 2.37-10.31 3.14-14.14 1.45-7.25 3.74-11.47 7.26-13.74 2.81-1.8 5.53-2.28 12.33-2.62 5.33-.27 7.56-.46 10.81-1.03zm.18.98c-3.3.59-5.56.78-10.94 1.05-6.62.33-9.23.78-11.84 2.46-3.25 2.1-5.42 6.09-6.82 13.1-.77 3.84-1.56 7.35-3.15 14.17l-.12.5c-2.86 12.24-3.93 17.26-4.7 22.9-1.03 7.36-.79 12.36.9 15.07 4.82 7.7 25.54 5.67 39.29-4.15 12.43-8.88 18.13-15.39 22.84-24.81 6.86-13.72 10.75-29 6.07-34.45-5.84-6.81-15.7-8.65-31.53-5.84zM132 276.5c7.12 0 10.66 3.08 11.25 8.7.42 4.02-.43 8.14-2.77 15.94-2.56 8.52-18.36 25.38-27.2 31.28-7.01 4.67-20.02 5.67-26.57.99-3.99-2.85-3.53-12.08.02-26.46.68-2.75 1.47-5.65 2.37-8.76a412.6 412.6 0 0 1 3.05-10.14l.37-1.2c1.48-4.8 5.1-7.75 10.73-9.27 4.4-1.2 9.54-1.5 17.48-1.33l3.89.1c3.87.11 5.42.15 7.38.15zm0 1c-1.97 0-3.53-.04-7.41-.15l-3.88-.1c-7.85-.17-12.92.13-17.2 1.3-5.32 1.43-8.67 4.16-10.03 8.6a1277.83 1277.83 0 0 1-1.6 5.21c-.68 2.2-1.27 4.17-1.82 6.1-.9 3.1-1.68 5.99-2.36 8.73-3.43 13.88-3.87 22.93-.4 25.4 6.17 4.42 18.73 3.45 25.42-1 8.66-5.78 24.33-22.49 26.8-30.73 2.3-7.67 3.14-11.71 2.73-15.56-.53-5.1-3.64-7.8-10.25-7.8zm-17.79 7a31.3 31.3 0 0 1 8.57 1.4c5.42 1.78 8.72 5.03 8.72 10.1 0 9.59-9.51 17.2-22.34 21.47-9.82 3.28-13.62-1.79-11.66-16.54.84-6.28 3.82-10.67 8.24-13.46a20.38 20.38 0 0 1 8.47-2.97zm-.6 1.08a19.39 19.39 0 0 0-7.34 2.73c-4.18 2.64-6.98 6.78-7.77 12.76-1.89 14.11 1.36 18.45 10.34 15.46C121.3 312.37 130.5 305 130.5 296c0-4.56-2.98-7.5-8.03-9.15a28.05 28.05 0 0 0-8.2-1.35c-.13 0-.35.03-.66.08zm80.87-23.45c-2.72 9.8-14.93 9.86-26.72 3.3-10.17-5.64-13.8-17.98-5-22.87a66.53 66.53 0 0 0 4.48-2.7l2.03-1.3a50.15 50.15 0 0 1 3.92-2.3c4.73-2.43 8.82-2.8 14-.72 9.16 3.66 10.98 13.33 7.3 26.6zm-20.83-24.98a49.26 49.26 0 0 0-3.84 2.25l-2.03 1.3c-.84.53-1.5.95-2.16 1.35-.82.5-1.6.96-2.38 1.39-7.94 4.4-4.59 15.8 5 21.12 11.31 6.29 22.8 6.23 25.28-2.7 3.57-12.83 1.85-21.97-6.7-25.4-4.9-1.95-8.69-1.62-13.17.7zm17.85 12.15c0 5.7-2.44 9-6.64 9.96-3.3.76-7.56-.05-11.08-1.81l-1.89-.94c-.67-.34-1.18-.62-1.63-.88-4.07-2.38-4.13-4.97.34-10.93 6.8-9.06 20.9-7.16 20.9 4.6zm-1 0c0-5.3-2.87-8.55-7.32-9.16-4.23-.57-8.99 1.44-11.78 5.16-4.15 5.54-4.1 7.44-.64 9.47.44.25.93.51 1.59.85l1.87.93c3.34 1.67 7.36 2.44 10.42 1.74 3.73-.86 5.86-3.74 5.86-9zM387 530.3c0-12.8 2.44-16.74 18.48-29.77a56.8 56.8 0 0 1 7.61-5.2c2.6-1.5 5.33-2.82 8.5-4.18 1.24-.53 2.48-1.05 4.1-1.7l3.92-1.57c9.4-3.83 13.74-6.7 16.62-12.05 1.2-2.22 2.21-4.4 3.23-6.83a148.57 148.57 0 0 0 1.54-3.84l.3-.74.56-1.44c3.2-8.02 6.05-12.08 12.7-16.5a35.26 35.26 0 0 0 4.96-4 46.36 46.36 0 0 0 3.88-4.29c.27-.34 2.55-3.2 3.2-3.98 3.48-4.15 6.51-5.9 11.51-5.9 3.08 0 5.62-.63 9.57-2.1 5.42-2.02 6.53-2.34 8.96-2.2 2.53.13 4.85 1.26 7.18 3.59 1.3 1.3 5.55 5.83 6.52 6.78 5.06 5 9.44 6.92 17.77 6.92a197.5 197.5 0 0 1 12.08.45c15.93.87 21.94.57 25.28-2.21 6.91-5.77 11.64-2.73 11.64 7.76 0 10.73-8.6 20-19 20-4.8 0-8.32 1.43-9.34 3.67-1.12 2.48.68 6.15 5.98 10.57 13.6 11.33 11.24 20.76-7.64 20.76a21.91 21.91 0 0 0-14.6 5.24c-3.28 2.71-5.8 5.86-9.85 11.82l-1.52 2.25c-3.1 4.57-5.01 7.1-7.32 9.4-6.21 6.21-9.3 7.64-13.05 6.89l-1-.23a10.82 10.82 0 0 0-2.66-.37c-1.6 0-2.41.67-8.18 6.22-4.85 4.67-8.07 6.78-11.82 6.78-1.33 0-3.46 1.15-6.45 3.45-1.27.98-2.68 2.14-4.5 3.7l-4.92 4.29a181.11 181.11 0 0 1-4.54 3.82c-9.33 7.56-15.63 10.2-20.21 6.52-2.7-2.15-4.14-4.51-4.63-7.26-.37-2.04-.26-3.63.29-7.3.87-5.85.65-8.42-1.83-11.6-2.32-2.98-2.96-3.22-3.77-2.39-.25.26-1.35 1.63-1.61 1.94-2.21 2.5-4.85 3.57-9 2.82-4.6-.84-5.57-4.11-4.72-10.09l.24-1.56c.6-3.66.68-4.93.25-5.8-.44-.86-1.9-.94-5.23.4l-.74.29c-13.78 5.54-15.26 6.09-19.43 6.67-6.03.84-9.31-1.6-9.31-7.9zm2 0c0 5 2.14 6.6 7.04 5.92 3.91-.55 5.43-1.1 18.95-6.55l.75-.3c4.17-1.66 6.7-1.54 7.76.58.71 1.43.62 2.76-.06 7l-.24 1.53c-.72 5.04-.06 7.27 3.09 7.84 3.43.62 5.38-.17 7.15-2.18.2-.23 1.34-1.66 1.68-2 1.9-1.96 3.82-1.25 6.78 2.55 2.9 3.74 3.17 6.77 2.22 13.12-1 6.75-.52 9.4 3.62 12.71 3.49 2.8 9.1.45 17.7-6.51 1.35-1.1 2.75-2.28 4.49-3.78l4.93-4.3c1.84-1.58 3.27-2.76 4.58-3.77 3.34-2.56 5.74-3.86 7.67-3.86 3.04 0 5.95-1.9 10.43-6.22l2.46-2.39c.94-.89 1.67-1.56 2.37-2.13 1.81-1.49 3.3-2.26 4.74-2.26 1.03 0 1.81.13 3.1.42.7.16.71.17.96.21 2.96.6 5.45-.55 11.23-6.33 2.2-2.2 4.06-4.65 7.09-9.11l1.52-2.25c4.15-6.11 6.76-9.37 10.22-12.24a23.9 23.9 0 0 1 15.88-5.7c16.87 0 18.62-7.01 6.36-17.23-5.9-4.92-8.12-9.41-6.52-12.93 1.42-3.12 5.67-4.84 11.16-4.84 9.25 0 17-8.34 17-18 0-8.94-2.88-10.79-8.36-6.23-3.94 3.28-9.98 3.59-26.67 2.68l-1.02-.06c-5.09-.27-7.99-.39-10.95-.39-8.88 0-13.76-2.14-19.18-7.5-1-.98-5.26-5.53-6.53-6.79-1.99-1.99-3.86-2.9-5.87-3-2.03-.12-3.06.18-8.15 2.07-4.15 1.55-6.9 2.22-10.27 2.22-4.33 0-6.84 1.46-9.98 5.2-.63.74-2.89 3.6-3.18 3.95a48.29 48.29 0 0 1-4.04 4.46 37.26 37.26 0 0 1-5.24 4.23c-6.26 4.17-8.9 7.91-11.95 15.58l-.57 1.43-.28.74a531.5 531.5 0 0 1-1.56 3.88 77.49 77.49 0 0 1-3.32 7c-3.16 5.88-7.82 8.97-17.63 12.96l-3.92 1.58c-1.6.64-2.84 1.15-4.05 1.67a79.2 79.2 0 0 0-8.3 4.08 54.8 54.8 0 0 0-7.35 5.02C391.12 514.78 389 518.21 389 530.31zm133.22-79.76c3.06 1.53 6.54 2.02 10.68 1.7 2.53-.2 4.91-.62 8.8-1.49 5.36-1.19 6.33-1.38 8.33-1.54 2.78-.23 4.82.17 6.29 1.4 1.58 1.31 1.96 2.72 1.26 4.22-.66 1.38-1.05 1.74-5.05 5.07-3.53 2.93-5.03 4.83-5.03 7.09 0 7.3 1.29 10.02 7.83 15.62 3.86 3.3 5.93 6.84 5.28 9.62-.75 3.25-4.96 5.02-12.61 5.02-7.18 0-12.7 4.61-20.03 14.68-.5.7-3.96 5.57-4.94 6.87a38.89 38.89 0 0 1-4.72 5.5c-1.06.98-2.09 1.7-3.1 2.15-2.85 1.26-5.05 1.57-9.83 1.74-7.66.27-10.87 1.45-14.98 7.1-1.58 2.17-3.11 4-4.68 5.6a42.87 42.87 0 0 1-8.65 6.69c-.15.08-10.69 6.19-14.8 8.83-3.76 2.42-6.45 2.04-8.22-.77-1.28-2.03-1.9-4.54-2.87-10.35-.84-5.08-1.27-7.08-2.06-8.93-.97-2.3-2.21-3.24-4.02-2.88-6.2 1.24-8.95 1.39-10.98.2-2.37-1.4-3.13-4.62-2.62-10.73.16-1.96-1.04-2.87-3.76-3.04-2.24-.13-4.9.2-9.94 1.12l-.69.12c-7.97 1.45-10.72 1.72-12.72.73-2.91-1.43-1.6-5.27 4.23-12.21 5.48-6.53 10.6-10.81 15.76-13.53 3.74-1.97 5.94-2.65 12.16-4.1 7.29-1.72 10.4-3.51 14.04-9.31 2.96-4.75 10.74-18.62 12.14-20.84 3.59-5.67 6.8-9.1 11.05-11.34 2.6-1.38 4.72-2.82 9.17-6.07l1.38-1.01c7.85-5.72 12.3-7.98 17.68-7.98 4.22 0 6.49 1.36 9.13 4.77.34.43 1.67 2.22 2 2.67.85 1.09 1.6 1.98 2.45 2.83a24.29 24.29 0 0 0 6.64 4.78zm-.44.9c-2.8-1.4-5-3.03-6.92-4.97-.87-.9-1.65-1.81-2.51-2.93-.35-.46-1.68-2.25-2.01-2.67-2.47-3.18-4.46-4.38-8.34-4.38-5.09 0-9.4 2.2-17.09 7.78l-1.38 1.01c-4.49 3.29-6.63 4.74-9.3 6.15-4.06 2.15-7.16 5.45-10.66 11-1.39 2.19-9.16 16.05-12.15 20.82-3.79 6.07-7.13 7.98-14.66 9.75-6.13 1.45-8.27 2.1-11.92 4.02-5.04 2.66-10.05 6.86-15.46 13.3-5.43 6.46-6.53 9.69-4.55 10.66 1.7.84 4.48.57 12.1-.81l.7-.13c5.12-.93 7.82-1.27 10.17-1.12 3.21.2 4.92 1.48 4.7 4.11-.48 5.76.2 8.64 2.13 9.78 1.73 1.02 4.34.88 10.27-.31 2.35-.47 4 .78 5.14 3.47.83 1.95 1.27 4 2.07 8.8l.06.36c.94 5.65 1.55 8.11 2.72 9.98 1.46 2.3 3.52 2.6 6.84.46 4.14-2.66 14.69-8.77 14.81-8.85a41.9 41.9 0 0 0 8.46-6.54 47.89 47.89 0 0 0 4.6-5.48c4.32-5.95 7.81-7.23 15.74-7.5 4.66-.17 6.76-.47 9.46-1.67.9-.4 1.85-1.06 2.84-1.96a38.03 38.03 0 0 0 4.6-5.36c.96-1.3 4.4-6.16 4.93-6.87 7.5-10.31 13.22-15.09 20.83-15.09 7.24 0 11.02-1.6 11.64-4.24.54-2.32-1.36-5.55-4.97-8.64-6.75-5.79-8.17-8.79-8.17-16.38 0-2.67 1.64-4.74 5.39-7.86 3.8-3.17 4.23-3.56 4.78-4.73.5-1.06.25-1.99-.99-3.03-2.23-1.85-4.72-1.65-13.76.36-3.93.87-6.35 1.3-8.94 1.5-4.3.34-7.97-.18-11.2-1.8zm-28-3.9c5.65-2.82 8.96-2.2 12.9 1.37.56.5 2.6 2.47 3.02 2.87 4.2 3.89 8.07 5.71 14.3 5.71 11.37 0 14 1.41 16.1 8.09.26.83 1.35 4.6 1.66 5.62.8 2.63 1.64 5.03 2.7 7.6 2.13 5.17 2.64 8.32 1.72 10.24-.77 1.61-2.1 2.18-5.37 2.79-2.32.43-2.8.53-3.85.85-1.85.58-3.35 1.4-4.6 2.66-1 1-2.02 2.13-3.31 3.66-.6.71-2.91 3.5-3.46 4.14-7.2 8.54-12.43 12.35-19.59 12.35-3.76 0-6.95 1.28-10.59 4-1.84 1.37-11.62 10.31-15.22 13.06a73.09 73.09 0 0 1-8.95 5.88c-4.58 2.54-7.35 3.22-8.98 2.23-1.32-.8-1.65-2.07-1.94-5.5a52.53 52.53 0 0 0-.16-1.81c-.54-4.73-2.24-6.86-7.16-6.86-7.11 0-8.85-1.23-9.73-5.41-.96-4.61-2.1-6.7-6.55-9.67-3.97-2.65-4.31-5.42-1.52-8.22 2-2 4.63-3.5 11.35-6.87 6.61-3.3 9.2-4.8 11.1-6.68a39.09 39.09 0 0 0 5.3-6.48c.98-1.5 1.83-3.04 2.88-5.13l2.12-4.3c.91-1.83 1.72-3.37 2.61-4.98 5.74-10.32 10.37-14.78 23.22-21.2zm-22.34 21.7c-.89 1.59-1.69 3.12-2.6 4.94l-2.11 4.3a52.9 52.9 0 0 1-2.94 5.23 40.08 40.08 0 0 1-5.44 6.63c-2 2-4.62 3.51-11.35 6.87-6.6 3.3-9.2 4.8-11.1 6.69-2.33 2.34-2.08 4.37 1.38 6.67 4.7 3.14 5.96 5.46 6.97 10.3.78 3.7 2.09 4.62 8.75 4.62 5.5 0 7.57 2.57 8.15 7.75.06.5.09.82.17 1.84.25 3.06.55 4.17 1.46 4.72 1.2.74 3.69.13 7.98-2.25a72.09 72.09 0 0 0 8.82-5.8c3.55-2.7 13.34-11.65 15.24-13.07 3.79-2.83 7.18-4.19 11.18-4.19 6.77 0 11.8-3.67 18.83-12l3.45-4.13a60.07 60.07 0 0 1 3.37-3.72 11.72 11.72 0 0 1 5.01-2.91c1.1-.34 1.6-.45 3.97-.89 2.95-.55 4.07-1.02 4.65-2.23.76-1.59.28-4.5-1.74-9.43a84.46 84.46 0 0 1-2.74-7.69c-.31-1.03-1.4-4.8-1.66-5.61-1.95-6.2-4.16-7.39-15.14-7.39-6.5 0-10.61-1.93-14.98-5.98-.44-.4-2.46-2.37-3.01-2.86-3.65-3.3-6.52-3.85-11.79-1.21-12.67 6.33-17.15 10.65-22.78 20.8zm55.86 11.93c-2.98 6.45-16.78 15.26-26.74 15.26-5.33 0-7.56-2.98-7.11-7.86.32-3.48 2.1-7.91 3.93-10.61l1.52-2.32a44.95 44.95 0 0 1 1.88-2.7c3.66-4.8 7.85-7.45 13.62-7.45 9.06 0 15.75 9.52 12.9 15.68zm-.9-.42c2.52-5.47-3.65-14.26-12-14.26-5.4 0-9.33 2.48-12.82 7.06-.6.8-1.17 1.6-1.85 2.64 0 0-1.2 1.87-1.52 2.33-1.74 2.57-3.46 6.85-3.77 10.14-.4 4.33 1.43 6.77 6.12 6.77 9.57 0 23.02-8.58 25.83-14.68zm-69.67 20.74c2.08.18 4.44.81 5.88 1.8 2.12 1.47 2.2 3.6-.26 6.05-5.14 5.15-12.85 4.34-12.85-1.35 0-4.66 3.14-6.84 7.23-6.5zm-.09 1c-3.56-.3-6.14 1.5-6.14 5.5 0 4.58 6.53 5.26 11.15.65 2.03-2.04 1.98-3.43.4-4.52-1.27-.88-3.48-1.47-5.4-1.63zm29.59-225.95c4.64 2.35 17.27 8.24 19.39 9.43a24.14 24.14 0 0 1 7.05 5.64 45.03 45.03 0 0 1 3.75 5.2c2.4 3.78.04 7.66-6.2 11.63-4.97 3.16-12.18 6.3-21.95 9.82-4.84 1.74-19.63 6.68-21.1 7.2-6.59 2.33-14.85.1-25.14-5.86-3.93-2.27-8-5-12.94-8.54-2.23-1.61-9.5-6.99-10.7-7.85a81.21 81.21 0 0 0-8.63-5.7c-4.82-2.6-4.45-6.64.17-12.13 3.27-3.88 4.17-4.67 18.1-16.33a230.2 230.2 0 0 0 8.89-7.74 95.2 95.2 0 0 0 4.72-4.66c5.08-5.43 9.8-6.49 14.97-3.92 2.24 1.1 4.53 2.85 7.43 5.52 1.48 1.37 6.94 6.72 7.98 7.7 5.2 4.91 9.46 8.2 14.2 10.6zm-.46.9c-4.85-2.45-9.18-5.79-14.44-10.76-1.05-1-6.5-6.34-7.97-7.69-2.83-2.61-5.06-4.3-7.2-5.37-4.75-2.36-9-1.4-13.8 3.71a96.18 96.18 0 0 1-4.76 4.71c-2.48 2.3-5.16 4.62-8.92 7.77-13.86 11.6-14.77 12.4-17.98 16.21-4.28 5.08-4.58 8.4-.46 10.61 2.23 1.2 4.9 2.99 8.74 5.77 1.2.87 8.47 6.24 10.7 7.85a154.8 154.8 0 0 0 12.85 8.49c10.06 5.82 18.07 7.98 24.3 5.78 1.48-.52 16.27-5.47 21.1-7.2 9.7-3.5 16.86-6.61 21.75-9.72 5.84-3.71 7.9-7.1 5.9-10.26a44.09 44.09 0 0 0-3.67-5.08 23.16 23.16 0 0 0-6.78-5.42c-2.08-1.16-14.68-7.05-19.36-9.4zm-38.83 8.05c3.11-.37 5.7-.13 8.4.7 2.15.66 2.74.93 8.64 3.77 4.75 2.29 8.39 3.86 13.19 5.56 8.38 2.97 11.32 6.23 8.83 9.76-2.08 2.94-8.04 5.92-17.84 9.18-8.45 2.82-15.48 2.35-21.43-.9-4.65-2.55-8.33-6.5-12.15-12.3-2.9-4.41-2.73-8.2.16-11.06 2.48-2.45 6.87-4.07 12.2-4.7zm.12 1c-5.13.6-9.33 2.16-11.62 4.42-2.53 2.5-2.68 5.77-.02 9.8 3.73 5.68 7.3 9.51 11.8 11.97 5.7 3.11 12.43 3.57 20.62.84 9.59-3.2 15.44-6.12 17.34-8.82 1.94-2.75-.5-5.45-8.35-8.24-4.84-1.72-8.5-3.3-13.28-5.6-5.84-2.81-6.42-3.07-8.5-3.71a18.42 18.42 0 0 0-8-.66zM202.5 500.38c0 4.78-1.45 7.56-4.43 8.93-2.29 1.05-4.55 1.23-10.79 1.2l-1.78-.01c-9.19 0-17-7.65-17-15.5 0-7.59 10.6-10.51 19.74-5.44 2.78 1.55 4.21 1.94 8.57 2.75 4.44.83 5.69 2.27 5.69 8.07zm-1 0c0-5.3-.9-6.34-4.88-7.08-4.45-.83-5.96-1.25-8.86-2.86-8.57-4.76-18.26-2.1-18.26 4.56 0 7.3 7.36 14.5 16 14.5h1.79c6.06.04 8.26-.14 10.36-1.1 2.6-1.2 3.85-3.6 3.85-8.02zm33.33-117.85c3.71-1.31 8.7-2.7 16.1-4.55 2.58-.65 16.53-4.04 20.56-5.05 19.59-4.93 31.55-8.9 38.23-13.35 14.93-9.95 36.87-33.88 43.83-47.8 2.25-4.5 4.65-6.38 7.68-6.25 1.26.06 2.61.45 4.32 1.2a50.81 50.81 0 0 1 3.54 1.7l1.26.63c4.78 2.34 8.38 3.44 12.65 3.44 7.2 0 10.01 3.07 8.35 7.91-1.4 4.06-5.92 8.91-11.1 12.02-8.3 4.98-11.75 17.3-11.75 33.57 0 3.59-1.37 6.28-3.98 8.36-1.98 1.58-4.2 2.6-8.47 4.16l-1.02.37c-4.85 1.75-6.98 2.77-8.68 4.46-5.09 5.1-12.54 7.15-20.35 7.15-1.38 0-2.47.92-3.99 3.1-.29.41-1.32 1.95-1.47 2.18-2.68 3.92-4.93 5.72-8.54 5.72-7.84 0-10.74.93-21.76 6.94-5.18 2.82-8.8 3.58-14.66 3.68-.26 0-.47 0-.92.02-4.82.06-7.12.3-10.51 1.34a73.43 73.43 0 0 0-8.89 3.56c-2.17 1-10.53 5.01-10.23 4.87-7.79 3.7-13.32 5.98-18.9 7.57-12.41 3.55-18.58 2.24-27.42-4.07-2.58-1.85-2.72-4.43-.83-7.62 1.45-2.45 3.9-5.09 8.08-8.97l1.78-1.64c3.92-3.6 4.48-4.11 5.9-5.53 2.32-2.32 3.12-3.5 5.48-7.63 1.93-3.36 3.37-5.11 6.27-7.06 2.3-1.54 5.34-2.98 9.44-4.43zm.34.94c-4.03 1.42-7 2.83-9.22 4.32-2.75 1.85-4.1 3.49-5.96 6.73-2.4 4.2-3.24 5.44-5.64 7.83-1.43 1.44-2 1.96-5.94 5.57l-1.77 1.63c-4.1 3.82-6.52 6.41-7.9 8.75-1.65 2.79-1.54 4.8.55 6.3 8.6 6.14 14.46 7.38 26.57 3.92 5.5-1.57 11-3.84 18.74-7.51-.3.14 8.06-3.88 10.24-4.88a74.3 74.3 0 0 1 9.01-3.6c3.51-1.09 5.89-1.33 10.8-1.4h.91c5.72-.1 9.18-.83 14.2-3.57 11.16-6.08 14.2-7.06 22.24-7.06 3.19 0 5.2-1.6 7.71-5.28l1.48-2.2c1.7-2.43 3-3.52 4.81-3.52 7.57 0 14.78-2 19.65-6.85 1.83-1.84 4.04-2.9 9.04-4.7l1.02-.37c8.6-3.13 11.79-5.67 11.79-11.58 0-16.6 3.53-29.2 12.24-34.43 5-3 9.35-7.67 10.66-11.48 1.42-4.13-.83-6.59-7.4-6.59-4.45 0-8.19-1.14-13.09-3.54-7.52-3.67-6.78-3.34-8.72-3.43-2.58-.1-4.65 1.52-6.74 5.7-7.04 14.07-29.1 38.14-44.17 48.19-6.81 4.54-18.84 8.52-38.55 13.48-4.03 1.02-17.98 4.4-20.56 5.05-7.37 1.84-12.33 3.23-16 4.52zM252 387.5c2.08 0 4-.2 7.25-.69 5.22-.77 6.64-.9 8.46-.5 2.52.56 3.79 2.35 3.79 5.69 0 4.05-2.27 7.29-6.62 10.11-3.24 2.1-6.53 3.53-14.15 6.4l-.27.1-2.28.86c-3.04 1.16-5.27 2.52-9.33 5.43l-.8.57c-8.19 5.88-13.35 8.03-23.05 8.03-4.98 0-6.88-2.03-5.75-5.62.87-2.81 3.58-6.56 7.8-11.13 1.26-1.37 2.64-2.8 4.15-4.3 3.17-3.14 11.25-10.61 11.45-10.8.46-.47.93-.89 1.4-1.26 3.38-2.71 5.77-3.08 14.18-2.93 1.65.03 2.63.04 3.77.04zm0 1c-1.15 0-2.13-.01-3.79-.04-8.18-.14-10.4.2-13.54 2.71-.44.35-.88.74-1.32 1.18-.2.21-8.3 7.69-11.45 10.82a134.6 134.6 0 0 0-4.12 4.26c-4.12 4.47-6.76 8.12-7.58 10.75-.9 2.88.45 4.32 4.8 4.32 9.46 0 14.44-2.07 22.46-7.84l.8-.57c4.13-2.96 6.42-4.36 9.56-5.56l2.3-.86.25-.1c7.55-2.84 10.8-4.25 13.97-6.3 4.08-2.65 6.16-5.6 6.16-9.27 0-2.89-.97-4.26-3-4.7-1.65-.37-3.05-.25-8.1.5-3.3.5-5.26.7-7.4.7zm112.47-45.34c-1.88 5.44-1.98 6.76-.98 12.76 1.18 7.06-1.38 16.58-5.49 16.58a16.89 16.89 0 0 0-1.51.07l-.64.04c-2.86.18-4.83.17-6.94-.17-6.55-1.06-10.41-5.14-10.41-13.44 0-13.9 2.14-19.69 8.13-26.33a21.9 21.9 0 0 0 2.52-3.75c.59-1.03 2.78-5.13 2.72-5.01 4.44-8.14 7.71-11.53 12.25-10.4 1.17.3 2.2.77 3.58 1.59l1.39.84a20 20 0 0 0 3.1 1.6c.7.27 1.8.32 4.75.26l.72-.01c3.16-.05 4.78.08 5.83.66 1.61.89 1.2 2.56-1.14 4.9a215.9 215.9 0 0 1-3.86 3.76c-10.6 10.1-12.75 12.4-14.02 16.05zm-.94-.32c1.34-3.9 3.46-6.17 14.27-16.46 1.55-1.47 2.73-2.62 3.85-3.73 1.94-1.95 2.17-2.88 1.35-3.33-.82-.45-2.37-.58-5.32-.53l-.72.01c-3.14.06-4.26.02-5.14-.34-1.06-.41-1.97-.9-3.25-1.67l-1.38-.83a12.1 12.1 0 0 0-3.31-1.47c-3.88-.97-6.92 2.17-11.13 9.9.07-.13-2.14 3.98-2.73 5.02a22.71 22.71 0 0 1-2.65 3.92c-5.81 6.47-7.87 12-7.87 25.67 0 7.79 3.48 11.47 9.57 12.45 2.01.33 3.92.34 6.71.16a371.33 371.33 0 0 0 1.23-.07c.42-.03.73-.04.99-.04 3.2 0 5.6-8.9 4.5-15.42-1.02-6.16-.91-7.64 1.03-13.24zm-9.26 12.42c.58.52 2.5 1.9 2.55 1.93 1.96 1.57 2.04 3.31.01 6.36-3.74 5.64-8.83 3.09-8.83-4.55 0-3.81.51-5.67 2.07-6.02 1.18-.26 2 .3 4.2 2.28zm-1.34 1.48c-1.5-1.35-2.23-1.85-2.43-1.8-.17.03-.5 1.23-.5 4.06 0 5.87 2.67 7.21 5.17 3.45 1.5-2.26 1.47-2.84.4-3.7.03.03-1.95-1.4-2.64-2zm222.9-130.19c2.2-1.1 3.67-1.66 5.88-2.36l.28-.09a48.92 48.92 0 0 0 8.79-3.55c4.17-2.08 6.35-1.88 6.96.84.44 2 .2 4.01-1.25 12.7-2.27 13.62-9.16 26.14-21.17 36.3-4.3 3.63-7.41 4.39-9.75 2.44-1.88-1.57-3.1-4.57-4.61-10.48-.3-1.15-1.43-5.83-1.72-6.96a114.18 114.18 0 0 0-2.71-9.22c-2.4-6.82-3.03-10.78-2.1-12.94.77-1.83 2.08-2.24 5.6-2.45 1.49-.09 2.09-.14 2.97-.28l1.95-.33c.72-.12 1.22-.2 1.68-.29 1.1-.2 1.92-.38 2.71-.6 1.7-.49 3.42-1.2 6.49-2.73zm.44.9c-3.11 1.54-4.88 2.29-6.65 2.79-.84.23-1.69.42-2.81.63a108.77 108.77 0 0 1-3.81.63c-.77.13-1.39.19-2.92.28-3.13.18-4.17.51-4.74 1.85-.78 1.84-.2 5.62 2.13 12.2a115.12 115.12 0 0 1 2.74 9.31l1.72 6.96c1.46 5.7 2.62 8.58 4.28 9.96 1.87 1.56 4.49.93 8.47-2.44 11.82-10 18.6-22.3 20.83-35.7 1.4-8.45 1.65-10.51 1.25-12.31-.41-1.87-1.86-2-5.54-.16a49.87 49.87 0 0 1-8.93 3.6l-.28.1a35.4 35.4 0 0 0-5.74 2.3zm-4.5 6.58c1.37-.32 2.5-.75 3.9-1.42.35-.18 2.57-1.31 3.32-1.67 1.5-.71 2.97-1.31 4.7-1.89 2.7-.9 4.64-.77 5.88.4.98.94 1.34 2.26 1.41 4.18.02.4.02.7.02 1.37 0 5.63-4.63 16.88-11.34 22.75-4.34 3.8-7.31 4.67-9.92 2.52-2.06-1.7-3.5-4.65-6.67-12.91-1.86-4.83-2.05-8.1-.68-10.2 1.12-1.7 2.9-2.36 5.83-2.7l1.26-.12c1.19-.12 1.75-.19 2.3-.31zm-2.1 2.3l-1.22.12c-2.4.27-3.7.76-4.39 1.81-.93 1.43-.78 4.1.87 8.38 3.02 7.84 4.41 10.71 6.08 12.09 1.63 1.34 3.64.75 7.33-2.48C584.6 250.77 589 240.08 589 235c0-.64 0-.93-.02-1.29-.05-1.44-.3-2.33-.79-2.8-.6-.57-1.8-.65-3.87.04a37.95 37.95 0 0 0-4.47 1.8c-.72.34-2.93 1.47-3.32 1.66a19.54 19.54 0 0 1-4.3 1.56c-.66.16-1.28.24-2.56.36zm-227.73-88.98c-1.59 4.3-3.54 7.25-7.14 11.4l-2.6 2.97a67.02 67.02 0 0 0-2.63 3.23 46.4 46.4 0 0 0-4.68 7.5c-2.85 5.7-7.14 10.18-12.85 13.89-4.25 2.76-8.25 4.62-15.67 7.59-11.01 4.4-16.43 1.26-27.22-16.4-2.86-4.69-8.8-8.63-17.98-12.66-3-1.33-12.88-5.24-14.43-5.92-4.96-2.18-7.04-3.72-6.42-5.85.67-2.32 5.3-4.05 15.48-6.08 16.63-3.32 26.93-3.82 39.93-3.02 7.9.49 9.67.5 12.74-.26 1.99-.48 3.92-1.3 6-2.6l2.79-1.71c9.86-6.14 12.94-7.96 17.3-9.9 6.03-2.71 10.57-3.32 13.94-1.4 7.2 4.12 7.68 7.7 3.44 19.22zm-1.88-.7c3.95-10.7 3.6-13.26-2.56-16.78-2.66-1.52-6.62-.99-12.12 1.48-4.24 1.9-7.3 3.7-17.07 9.77l-2.79 1.73a22.6 22.6 0 0 1-6.57 2.84c-3.36.81-5.22.8-13.34.3-12.84-.78-22.97-.29-39.41 3-4.9.97-8.45 1.88-10.79 2.75-2.03.76-3.04 1.45-3.17 1.91-.16.57 1.48 1.79 5.3 3.46 1.5.67 11.39 4.58 14.44 5.93 9.52 4.19 15.74 8.3 18.87 13.44 10.35 16.93 14.87 19.56 24.78 15.6 7.3-2.93 11.21-4.75 15.33-7.42 5.42-3.53 9.47-7.75 12.15-13.1 1.44-2.9 3.02-5.4 4.86-7.82a68.95 68.95 0 0 1 2.72-3.33l2.6-2.97c3.46-3.99 5.28-6.75 6.77-10.79zm-6.64-.39c-7.94 12.8-18.53 21.75-33.3 25.23-7.82 1.83-12.47-.79-13.12-5.93-.55-4.45 2.29-9.06 6-9.06 3.02 0 5.6-1.68 15.38-9.16 1.47-1.12 2.57-1.96 3.66-2.74 4.4-3.2 7.77-5.17 10.82-6.08 5.57-1.67 9.33-2.15 11.35-1.22 2.5 1.14 2.22 4.13-.79 8.96zm-.84-.52c2.72-4.4 2.94-6.74 1.21-7.53-1.71-.79-5.32-.33-10.65 1.27-2.9.87-6.2 2.79-10.51 5.92-1.08.79-2.18 1.62-3.65 2.74-10.08 7.72-12.62 9.36-15.98 9.36-3.02 0-5.5 4.02-5 7.94.56 4.5 4.62 6.78 11.89 5.07 14.48-3.4 24.86-12.18 32.69-24.77zM461.17 33.53c13.88 4.96 20.75 4.96 31.62.01 3.02-1.37 5.47-2.94 11-6.82 5.57-3.92 8.05-5.51 11.14-6.92 4.14-1.88 7.78-2.38 11.22-1.28 3.92 1.26 6.2 12.3 6.78 28.45.5 14.2-.52 28.93-2.46 34.2-1.82 4.93-5.86 8.17-11.51 10.02A41.7 41.7 0 0 1 506 93.01c-5.79 0-9 2.4-12.2 7.64-.37.59-1.55 2.6-1.71 2.87-1.75 2.9-3.05 4.33-4.93 4.95-.94.32-2.07.83-3.87 1.74l-2.43 1.23c-1.03.53-1.87.94-2.7 1.34-6.43 3.1-11.73 4.72-17.16 4.72-5.71 0-10.04 2.09-14.02 5.92-1.16 1.11-4.2 4.53-4.63 4.94-2.54 2.44-5.93 4.24-10.85 6.1-1.4.52-5.98 2.13-6.25 2.22l-2.06.78c-.89.36-1.78.63-2.7.81-5.55 1.14-11.14-.54-17.98-4.42-1.27-.73-5.13-3.06-5.76-3.42-2.05-1.16-4.12-1.53-9.09-1.9l-1.73-.15c-4.78-.4-7.68-1.14-10.22-2.97-5-3.61-6.77-7.76-5.65-12.33 1.33-5.42 6.5-11.02 14.85-17.28a169.2 169.2 0 0 1 6.5-4.61c-.33.23 4.33-2.92 5.3-3.6 2.73-1.91 4.8-3.9 12.75-12.04l1.09-1.1c3.49-3.56 5.89-5.89 8.12-7.83 2.9-2.5 4.72-5.95 7.5-13.05l.63-1.61c2.7-6.92 4.28-10 6.87-12.33 1.42-1.28 6.68-6.54 7.93-7.5 3.98-3 8.01-2.73 19.57 1.4zm-.34.94c-11.26-4.02-15-4.28-18.62-1.53-1.19.9-6.4 6.11-7.88 7.43-2.42 2.18-3.96 5.19-6.6 11.95l-.63 1.61c-2.83 7.26-4.72 10.8-7.77 13.45a141.85 141.85 0 0 0-9.16 8.87c-8.02 8.2-10.08 10.2-12.88 12.16-.99.69-5.65 3.84-5.31 3.6-2.5 1.71-4.52 3.13-6.47 4.59-8.17 6.13-13.23 11.6-14.48 16.72-1.02 4.15.58 7.9 5.26 11.27 2.36 1.7 5.11 2.4 9.72 2.8l1.73.13c5.12.4 7.28.78 9.5 2.05.65.36 4.5 2.7 5.76 3.4 6.66 3.78 12.04 5.4 17.29 4.32.86-.17 1.7-.42 2.52-.75a67 67 0 0 1 2.1-.8c.28-.1 4.86-1.7 6.24-2.22 4.8-1.8 8.08-3.56 10.5-5.88.4-.38 3.44-3.8 4.63-4.94 4.16-4 8.72-6.2 14.72-6.2 5.25 0 10.42-1.59 16.73-4.62.82-.4 1.65-.8 2.68-1.33.12-.06 1.93-.99 2.43-1.23 1.84-.93 3-1.46 4-1.8 1.6-.52 2.76-1.82 4.39-4.52l1.7-2.88c3.39-5.5 6.87-8.11 13.07-8.11 4.45 0 8.73-.49 12.64-1.77 5.4-1.76 9.2-4.8 10.9-9.41 1.87-5.11 2.9-19.75 2.39-33.83-.56-15.53-2.81-26.48-6.08-27.52-3.18-1.02-6.57-.55-10.5 1.23-3.02 1.37-5.47 2.94-11 6.83-5.57 3.92-8.05 5.5-11.14 6.92-11.13 5.05-18.26 5.05-32.38.01zM475 55c5.38 0 7.55-.21 9.72-.96 1.26-.43 9.95-4.8 14.88-6.96 1.9-.82 3.56-2.44 6.6-6.04 2.56-3.04 3.19-3.75 4.4-4.84 3.7-3.35 7.07-3.28 10.22 1.23 6.23 8.9 5.61 15.94.07 27.02a71.26 71.26 0 0 0-2.5 5.48c-.32.8-1 2.7-1.09 2.9-.17.45-.34.81-.54 1.17-.63 1.14-1.56 2.21-4.05 4.7-2.4 2.4-5.16 3.27-11.68 4.33-1.81.3-2.2.36-3 .51-6.02 1.1-9.6 2.69-12.24 6.07-3.57 4.59-7.9 7.48-14.98 10.74-.55.24-1.1.5-1.8.8l-1.78.8a60.08 60.08 0 0 0-7.7 3.9c-2.57 1.6-4.79 2.35-9.42 3.46-8.58 2.06-12.28 3.76-17.37 9.36-5.12 5.64-10.17 7.64-16.63 6.7-5.36-.79-10.63-3.01-23.56-9.48-6.3-3.15-6.43-7.78-1.5-13.56 3.38-3.94 3.52-4.06 19.4-16.44 8.12-6.33 12.97-10.57 16.63-14.88 2.53-2.98 4.2-5.73 4.96-8.3 5.5-18.3 12.5-21.98 22.78-15.56 1.95 1.22 6.61 4.55 7.18 4.9 3.36 2.15 6.52 2.95 13 2.95zm0 2c-6.84 0-10.37-.89-14.08-3.26-.63-.4-5.27-3.71-7.16-4.9-9.05-5.65-14.66-2.7-19.8 14.45-.86 2.87-2.67 5.85-5.35 9.01-3.78 4.45-8.7 8.75-16.94 15.17-15.66 12.21-15.86 12.38-19.1 16.16-4.17 4.9-4.09 8 .88 10.48 12.71 6.35 17.89 8.54 22.94 9.28 5.78.84 10.18-.9 14.87-6.06 5.42-5.96 9.45-7.82 18.38-9.96 4.43-1.07 6.5-1.76 8.83-3.22a61.7 61.7 0 0 1 7.94-4.02l1.78-.8 1.78-.8c6.82-3.13 10.91-5.87 14.24-10.14 3-3.87 7-5.64 13.46-6.82.83-.15 1.21-.21 3.04-.51 6.1-1 8.6-1.78 10.58-3.77 2.36-2.36 3.21-3.34 3.72-4.26.15-.27.29-.56.44-.94.06-.15.75-2.06 1.09-2.9.64-1.6 1.45-3.4 2.57-5.64 5.24-10.49 5.8-16.8.07-24.98-2.4-3.44-4.37-3.48-7.24-.89-1.11 1-1.73 1.7-4.22 4.65-3.24 3.85-5.04 5.59-7.32 6.59-4.82 2.1-13.62 6.53-15.03 7.01-2.44.84-4.79 1.07-10.37 1.07zm-12.7 8.6c5.47 3.9 10.34 3.72 18.23.88 5.39-1.94 5.92-2.1 7.7-2.1 2.5-.01 4.21 1.36 5.24 4.46 1.66 4.98-2.32 8.52-12.3 12.68-2.7 1.13-16.25 6.18-20 7.73-7.86 3.24-13.93 6.42-18.87 10.15-13.02 9.84-18.36 11.93-23.71 9.68a24.67 24.67 0 0 1-3.62-1.98l-1.99-1.28a90.4 90.4 0 0 0-2.24-1.4c-3.33-2-2.82-4.28.85-7.34 1.35-1.13 10.66-7.61 13.53-9.91 7.1-5.69 11.91-11.47 14.41-18.34 3.07-8.45 4.89-12.1 6.8-13.39 1.73-1.16 3.36-.53 6.18 1.9.63.56 3.4 3.08 4.11 3.7 1.93 1.7 3.71 3.15 5.67 4.55zm-.6.8c-1.98-1.42-3.79-2.88-5.74-4.6-.73-.64-3.48-3.16-4.1-3.7-2.5-2.16-3.75-2.65-4.97-1.83-1.66 1.11-3.44 4.7-6.42 12.9-2.57 7.07-7.5 12.99-14.72 18.78-2.91 2.33-12.21 8.8-13.52 9.9-3.22 2.68-3.56 4.17-.97 5.72l2.26 1.4 1.99 1.28c1.47.93 2.48 1.5 3.47 1.91 4.9 2.07 9.96.07 22.72-9.56 5.02-3.79 11.15-7 19.1-10.28 3.76-1.55 17.3-6.6 20-7.72 9.5-3.97 13.14-7.2 11.73-11.44-.9-2.71-2.25-3.8-4.3-3.79-1.6 0-2.15.17-7.36 2.05-8.17 2.94-13.34 3.14-19.16-1.01z'%3E%3C/path%3E%3C/svg%3E"); } a { color: #333; diff --git a/webroot/js/background-image.js b/webroot/js/background-image.js new file mode 100644 index 0000000000..1eae2aeaf0 --- /dev/null +++ b/webroot/js/background-image.js @@ -0,0 +1,30 @@ +/** + * FoodCoopShop - The open source software for your foodcoop + * + * Licensed under the GNU Affero General Public License version 3 + * For full copyright and license information, please see LICENSE + * Redistributions of files must retain the above copyright notice. + * + * @since FoodCoopShop 3.6.0 + * @license https://opensource.org/licenses/AGPL-3.0 + * @author Mario Rothauer + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ +foodcoopshop.BackgroundImage = { + + getBackgroundImage: function(theme) { + + var opacity = 0.33; + + if (theme == 'dark') { + opacity = 0.03; + } + + var backgroundImage = "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='600' height='600' viewBox='0 0 600 600'%3E%3Cpath fill='%23cccccc' fill-opacity='" + opacity + "' d='M600 325.1v-1.17c-6.5 3.83-13.06 7.64-14.68 8.64-10.6 6.56-18.57 12.56-24.68 19.09-5.58 5.95-12.44 10.06-22.42 14.15-1.45.6-2.96 1.2-4.83 1.9l-4.75 1.82c-9.78 3.75-14.8 6.27-18.98 10.1-4.23 3.88-9.65 6.6-16.77 8.84-1.95.6-3.99 1.17-6.47 1.8l-6.14 1.53c-5.29 1.35-8.3 2.37-10.54 3.78-3.08 1.92-6.63 3.26-12.74 5.03a384.1 384.1 0 0 1-4.82 1.36c-2.04.58-3.6 1.04-5.17 1.52a110.03 110.03 0 0 0-11.2 4.05c-2.7 1.15-5.5 3.93-8.78 8.4a157.68 157.68 0 0 0-6.15 9.2c-5.75 9.07-7.58 11.74-10.24 14.51a50.97 50.97 0 0 1-4.6 4.22c-2.33 1.9-10.39 7.54-11.81 8.74a14.68 14.68 0 0 0-3.67 4.15c-1.24 2.3-1.9 4.57-2.78 8.87-2.17 10.61-3.52 14.81-8.2 22.1-4.07 6.33-6.8 9.88-9.83 12.99-.47.48-.95.96-1.5 1.48l-3.75 3.56c-1.67 1.6-3.18 3.12-4.86 4.9a42.44 42.44 0 0 0-9.89 16.94c-2.5 8.13-2.72 15.47-1.76 27.22.47 5.82.51 6.36.51 8.18 0 10.51.12 17.53.63 25.78.24 4.05.56 7.8.97 11.22h.9c-1.13-9.58-1.5-21.83-1.5-37 0-1.86-.04-2.4-.52-8.26-.94-11.63-.72-18.87 1.73-26.85a41.44 41.44 0 0 1 9.65-16.55c1.67-1.76 3.18-3.27 4.83-4.85.63-.6 3.13-2.96 3.75-3.57a71.6 71.6 0 0 0 1.52-1.5c3.09-3.16 5.86-6.76 9.96-13.15 4.77-7.42 6.15-11.71 8.34-22.44.86-4.21 1.5-6.4 2.68-8.6.68-1.25 1.79-2.48 3.43-3.86 1.38-1.15 9.43-6.8 11.8-8.72 1.71-1.4 3.26-2.81 4.7-4.3 2.72-2.85 4.56-5.54 10.36-14.67a156.9 156.9 0 0 1 6.1-9.15c3.2-4.33 5.9-7.01 8.37-8.07 3.5-1.5 7.06-2.77 11.1-4.02a233.84 233.84 0 0 1 7.6-2.2l2.38-.67c6.19-1.79 9.81-3.16 12.98-5.15 2.14-1.33 5.08-2.33 10.27-3.65l6.14-1.53c2.5-.63 4.55-1.2 6.52-1.82 7.24-2.27 12.79-5.06 17.15-9.05 4.05-3.72 9-6.2 18.66-9.9l4.75-1.82c1.87-.72 3.39-1.31 4.85-1.91 10.1-4.15 17.07-8.32 22.76-14.4 6.05-6.45 13.95-12.4 24.49-18.92 1.56-.96 7.82-4.6 14.15-8.33v-64.58c-4 8.15-8.52 14.85-12.7 17.9-2.51 1.82-5.38 4.02-9.04 6.92a1063.87 1063.87 0 0 0-6.23 4.98l-1.27 1.02a2309.25 2309.25 0 0 1-4.87 3.9c-7.55 6-12.9 10.05-17.61 13.19-3.1 2.06-3.86 2.78-8.06 7.13-5.84 6.07-11.72 8.62-29.15 10.95-11.3 1.5-20.04 4.91-30.75 11.07-1.65.94-7.27 4.27-6.97 4.1-2.7 1.58-4.69 2.69-6.64 3.66-5.63 2.8-10.47 4.17-15.71 4.17-17.13 0-41.44 11.51-51.63 22.83-12.05 13.4-31.42 27.7-45.25 31.16-7.4 1.85-11.85 7.05-14.04 14.69-1.26 4.4-1.58 8.28-1.58 13.82 0 .82.01.98.24 3.63.45 5.18.35 8.72-.77 13.26-1.53 6.2-4.89 12.6-10.59 19.43-13.87 16.65-22.88 46.58-22.88 71.68 0 2.39.02 4.26.06 8.75.12 10.8.1 15.8-.22 21.95-.56 11.18-2.09 20.73-5 29.3h-1.05c2.94-8.56 4.49-18.12 5.05-29.35.31-6.13.34-11.1.22-21.9-.04-4.48-.06-6.36-.06-8.75 0-25.32 9.07-55.47 23.12-72.32 5.6-6.72 8.88-12.99 10.38-19.03 1.09-4.4 1.18-7.85.74-12.93-.23-2.7-.24-2.86-.24-3.72 0-5.62.32-9.57 1.62-14.1 2.28-7.95 6.97-13.44 14.76-15.39 13.6-3.4 32.82-17.59 44.75-30.84C409 360.14 433.58 348.5 451 348.5c5.07 0 9.77-1.33 15.26-4.07 1.93-.96 3.9-2.05 6.58-3.62-.3.18 5.33-3.16 6.98-4.11 10.82-6.21 19.66-9.67 31.11-11.2 17.23-2.3 22.9-4.75 28.57-10.64 4.25-4.41 5.04-5.16 8.22-7.28 4.68-3.11 10.01-7.14 17.55-13.14a1113.33 1113.33 0 0 0 4.86-3.89l1.28-1.02a4668.54 4668.54 0 0 1 6.23-4.98c3.67-2.9 6.55-5.12 9.07-6.95 4.37-3.19 9.16-10.56 13.29-19.4v66.9zm0-116.23c-.62.01-1.27.06-1.95.13-6.13.63-13.83 3.45-21.83 7.45-3.64 1.82-8.46 2.67-14.17 2.71-4.7.04-9.72-.47-14.73-1.33-1.7-.3-3.26-.61-4.67-.93a31.55 31.55 0 0 0-3.55-.57 273.4 273.4 0 0 0-16.66-.88c-10.42-.16-17.2.74-17.97 2.73-.38.97.6 2.55 3.03 4.87 1.01.97 2.22 2.03 4.04 3.55a1746.07 1746.07 0 0 0 4.79 4.02c1.39 1.2 3.1 1.92 5.5 2.5.7.16.86.2 2.64.54 3.53.7 5.03 1.25 6.15 2.63 1.41 1.76 1.4 4.54-.15 8.88-2.44 6.83-5.72 10.05-10.19 10.33-3.63.23-7.6-1.29-14.52-5.06-4.53-2.47-6.82-7.3-8.32-15.26-.17-.87-.32-1.78-.5-2.86l-.43-2.76c-1.05-6.58-1.9-9.2-3.73-10.11-.81-.4-1.59-.74-2.36-1-2.27-.77-4.6-1.02-8.1-.92-2.29.07-14.7 1-13.77.93-20.55 1.37-28.8 5.05-37.09 14.99a133.07 133.07 0 0 0-4.25 5.44l-2.3 3.09-2.51 3.32c-4.1 5.36-7.06 8.48-10.39 11.12-.65.52-1.33 1.04-2.13 1.62l-4.11 2.94a106.8 106.8 0 0 0-5.16 3.99c-4.55 3.74-9.74 8.6-16.25 15.38-8.25 8.58-11.78 13.54-11.7 15.95.07 1.65 1.64 2.11 6.79 2.38 1.61.09 2.15.12 2.98.2 2.95.24 5.09.73 6.81 1.68 7.48 4.15 11.63 7.26 13.95 11.58 3.3 6.15.8 12.88-8.89 20.26-8.28 6.3-11.1 10.37-11.31 14.96-.06 1.17 0 1.93.26 4.43.69 6.47.25 10.65-2.8 17.42a44.23 44.23 0 0 1-4.16 7.53c-2.82 3.97-5.47 5.74-10.6 7.69-.43.16-3.34 1.23-4.27 1.59-1.8.68-3.38 1.36-5.01 2.14-4.18 2-8.4 4.6-13.1 8.24-8.44 6.51-13.23 14.56-15.98 25.06-1.1 4.2-1.55 6.81-2.8 15.21-1.26 8.6-2.17 12.64-4.08 16.55-2.1 4.28-11.93 26.59-12.97 28.88a382.7 382.7 0 0 1-6.37 13.41c-4.07 8.11-7.61 14.07-10.73 17.81-5.38 6.46-8.98 14.37-13.77 28.42a810.14 810.14 0 0 0-1.89 5.6c-1.8 5.35-2.96 8.6-4.26 11.85-6.13 15.32-25.43 26.31-46.46 26.31-11.2 0-20.58-2.74-31.02-8.55-5.6-3.13-4.55-2.42-22.26-14.54-14.33-9.8-17.7-10.73-20.47-6.9-.37.5-1.81 2.74-1.83 2.77a52.24 52.24 0 0 1-4.94 5.9c-.73.79-5.52 5.87-6.97 7.45-2.38 2.6-4.3 4.81-5.98 6.93a45.6 45.6 0 0 0-5.08 7.66c-1.29 2.57-1.9 5.25-2.66 10.6a997.6 997.6 0 0 1-.46 3.18h-1l.47-3.32c.77-5.45 1.4-8.2 2.75-10.9a46.54 46.54 0 0 1 5.2-7.84c1.7-2.14 3.63-4.38 6.03-6.98 1.45-1.59 6.24-6.68 6.96-7.46a51.58 51.58 0 0 0 4.84-5.78s1.47-2.26 1.86-2.8c3.25-4.5 7.08-3.44 21.84 6.67 17.67 12.08 16.62 11.38 22.19 14.48 10.3 5.73 19.5 8.43 30.53 8.43 20.65 0 39.57-10.77 45.54-25.69a219.7 219.7 0 0 0 4.24-11.8 6752.32 6752.32 0 0 0 1.88-5.6c4.83-14.16 8.47-22.14 13.96-28.73 3.05-3.66 6.56-9.57 10.6-17.61 1.97-3.93 4.04-8.31 6.35-13.38 1.03-2.28 10.88-24.61 12.98-28.91 1.85-3.79 2.75-7.76 4-16.25 1.24-8.44 1.7-11.07 2.81-15.32 2.8-10.7 7.71-18.94 16.33-25.6a73.18 73.18 0 0 1 13.29-8.35c1.66-.8 3.27-1.48 5.08-2.18.94-.36 3.86-1.43 4.28-1.59 4.95-1.88 7.44-3.55 10.14-7.33 1.35-1.9 2.68-4.3 4.06-7.37 2.97-6.58 3.39-10.59 2.72-16.9a27.13 27.13 0 0 1-.27-4.58c.22-4.94 3.21-9.24 11.7-15.7 9.33-7.11 11.66-13.34 8.62-19-2.2-4.09-6.25-7.12-13.55-11.17-1.57-.88-3.6-1.33-6.42-1.57-.8-.07-1.34-.1-2.95-.19-5.77-.3-7.63-.85-7.72-3.34-.1-2.81 3.5-7.87 11.97-16.69 6.53-6.8 11.75-11.69 16.33-15.45 1.79-1.47 3.42-2.72 5.2-4.03l4.12-2.94c.79-.58 1.46-1.08 2.1-1.59 3.26-2.6 6.16-5.65 10.21-10.94a383.2 383.2 0 0 0 2.5-3.32l2.31-3.09c1.8-2.39 3.04-4 4.29-5.48 8.47-10.17 16.98-13.96 37.27-15.3-.44.02 12-.9 14.32-.98 3.62-.1 6.05.16 8.46.98.8.27 1.62.62 2.47 1.04 2.27 1.14 3.17 3.87 4.27 10.85l.44 2.76c.17 1.07.33 1.97.5 2.83 1.44 7.69 3.62 12.29 7.8 14.57 6.76 3.68 10.6 5.15 13.99 4.94 4-.25 6.99-3.17 9.3-9.67 1.45-4.04 1.46-6.49.32-7.92-.9-1.12-2.28-1.62-5.57-2.27a55.8 55.8 0 0 1-2.67-.55c-2.54-.6-4.39-1.4-5.93-2.71a252.63 252.63 0 0 0-4.78-4.01 84.35 84.35 0 0 1-4.08-3.6c-2.73-2.6-3.86-4.43-3.28-5.95 1.02-2.64 7.82-3.54 18.93-3.37a230.56 230.56 0 0 1 16.73.88c2.76.39 3.2.49 3.68.6 1.4.3 2.95.62 4.62.91a82.9 82.9 0 0 0 14.56 1.32c5.56-.04 10.24-.86 13.73-2.6 8.1-4.05 15.89-6.9 22.17-7.56.7-.07 1.4-.11 2.05-.13v1zm0-100.94v1.5c-8.62 16.05-17.27 29.55-23.65 35.92-3.19 3.2-7.62 4.9-13.54 5.56-4.45.48-8.28.4-19.18-.2-9.91-.55-15.32-.44-20.52.78a84.05 84.05 0 0 1-15 2.11l-2.25.14c-12.49.75-19.37 1.78-32.72 5.74-4.5 1.33-9.27 2.49-14.3 3.48a246.27 246.27 0 0 1-32.6 3.97c-7.56.45-13.21.57-20.24.57-5.4 0-11.9 1.61-18 5.18-8.3 4.87-15.06 12.87-19.53 24.5a68.57 68.57 0 0 1-4.56 9.8c-3.6 6.2-6.92 8.99-13.38 12.18l-4.03 1.96a64.48 64.48 0 0 0-15.16 10.25c-8.2 7.33-13.72 16.63-22.54 35.6l-2.08 4.49c-7.3 15.7-11.5 23.3-17.35 29.87-7.7 8.66-20.25 14.42-40.31 20.08-4.37 1.23-19.04 5.08-19.24 5.13-6.92 1.87-11.68 3.34-15.63 4.92-10.55 4.22-18.71 10.52-36.38 26.52l-1.7 1.54c-8.58 7.76-13.41 11.9-18.81 15.88-3.95 2.9-8 5.67-12.97 8.91-2.06 1.34-10.3 6.6-12.33 7.94-11.52 7.5-18.53 13.04-24.62 20.08a62.01 62.01 0 0 0-6.44 8.85c-4.13 6.91-6.27 13.15-9.2 25.11l-1.54 6.26c-.6 2.45-1.15 4.54-1.72 6.58-2.97 10.7-6.9 17.36-14.78 26.91L69.6 491a148.51 148.51 0 0 0-4.19 5.3 23.9 23.9 0 0 0-3.44 6.28c-1.16 3.23-1.52 5.9-1.87 11.94-.58 10.05-1.42 15.04-4.63 22.67-1.57 3.72-5.66 14.02-6.41 15.8a73.46 73.46 0 0 1-3.57 7.4c-2.88 5.14-6.71 10.12-13.12 16.95-5.96 6.36-8.87 10.9-10.61 16a56.88 56.88 0 0 0-1.38 4.82l-.46 1.84h-1.03l.52-2.08c.52-2.09.92-3.49 1.4-4.9 1.8-5.25 4.78-9.9 10.84-16.36 6.35-6.78 10.13-11.7 12.97-16.77a72.5 72.5 0 0 0 3.52-7.29c.75-1.76 4.84-12.06 6.4-15.8 3.17-7.5 3.99-12.4 4.56-22.33.35-6.14.72-8.88 1.93-12.23a24.9 24.9 0 0 1 3.58-6.54c1.27-1.7 2.6-3.37 4.22-5.34l4.11-4.95c7.8-9.46 11.66-16 14.59-26.54.56-2.04 1.1-4.12 1.71-6.56l1.53-6.26c2.96-12.04 5.13-18.36 9.32-25.39 1.84-3.08 4-6.05 6.54-8.99 6.17-7.12 13.24-12.7 24.83-20.26 2.05-1.33 10.28-6.6 12.33-7.94 4.96-3.22 9-5.98 12.92-8.87 5.37-3.95 10.19-8.08 18.74-15.82l1.7-1.54c17.76-16.09 25.98-22.43 36.67-26.7 4-1.6 8.8-3.09 15.75-4.96.21-.06 14.87-3.9 19.22-5.13 19.9-5.61 32.32-11.31 39.85-19.78 5.76-6.48 9.93-14.02 17.18-29.64l2.09-4.5c8.87-19.07 14.44-28.46 22.77-35.9a65.48 65.48 0 0 1 15.38-10.4l4.04-1.97c6.3-3.1 9.47-5.77 12.96-11.77a67.6 67.6 0 0 0 4.48-9.67c4.56-11.84 11.47-20.02 19.97-25 6.25-3.66 12.93-5.32 18.5-5.32 7.01 0 12.65-.12 20.17-.57a245.3 245.3 0 0 0 32.47-3.96c5-.98 9.75-2.13 14.22-3.45 13.43-3.98 20.38-5.02 32.94-5.78l2.24-.14c5.76-.37 9.8-.9 14.85-2.09 5.31-1.25 10.79-1.35 22.6-.7 9.04.5 12.84.58 17.21.1 5.71-.62 9.94-2.26 12.95-5.26 6.44-6.45 15.3-20.37 24.35-36.72zm0 450.21c-1.28-4.6-2.2-10.55-3.33-20.25l-.24-2.04-.23-2.03c-1.82-15.7-3.07-21.98-5.55-24.47-2.46-2.46-3.04-5.03-2.52-8.64.1-.6.18-1.1.39-2.15.69-3.54.77-5.04.08-6.84-.91-2.38-3.31-4.41-7.79-6.26-5.08-2.09-6.52-4.84-4.89-8.44.66-1.45 1.79-3.02 3.52-5.01 1.04-1.2 5.48-5.96 5.08-5.53 6.15-6.7 8.98-11.34 8.98-16.48a15.2 15.2 0 0 1 6.5-12.89v1.26a14.17 14.17 0 0 0-5.5 11.63c0 5.47-2.93 10.29-9.24 17.16.38-.42-4.04 4.33-5.07 5.5-1.67 1.93-2.75 3.43-3.36 4.77-1.37 3.04-.23 5.22 4.36 7.1 4.71 1.95 7.32 4.16 8.34 6.83.78 2.04.7 3.67-.03 7.4-.2 1.03-.3 1.51-.38 2.09-.48 3.33.03 5.59 2.23 7.8 2.74 2.74 3.98 8.96 5.84 25.06l.24 2.03.23 2.04c.82 7.01 1.53 12.06 2.34 16.03v4.33zm0-62.16c-1.4-3.13-4.43-9.9-4.95-11.17-1.02-2.53-1.25-3.8-.91-5.18.2-.84 2.05-4.68 2.32-5.33a70.79 70.79 0 0 0 3.54-11.2v3.99a62.82 62.82 0 0 1-2.62 7.6c-.31.75-2.09 4.46-2.27 5.18-.28 1.12-.08 2.22.87 4.57.41 1.02 2.5 5.7 4.02 9.09v2.45zm0-85.09c-1.65 1.66-3.66 2.9-6.4 4.13-.25.1-13.97 5.47-20.4 8.43-9.35 4.32-16.7 5.9-23.03 5.25-5.08-.53-9.02-2.25-14.77-5.92l-3.2-2.07a77.4 77.4 0 0 0-5.44-3.27c-4.05-2.18-3.25-5.8 1.47-10.47 3.71-3.68 9.6-7.93 18.73-13.8l4.46-2.82c17.95-11.33 18.22-11.5 22.27-14.74 11.25-9 19.69-14.02 26.31-15.1v1.02c-6.37 1.1-14.62 6-25.69 14.86-4.1 3.28-4.34 3.44-22.36 14.8a652.4 652.4 0 0 0-4.45 2.83c-9.07 5.83-14.92 10.05-18.57 13.66-4.31 4.28-4.95 7.13-1.7 8.88 1.7.91 3.29 1.88 5.5 3.3l3.2 2.08c5.64 3.59 9.45 5.25 14.34 5.76 6.13.64 13.32-.9 22.52-5.15 6.46-2.98 20.18-8.35 20.4-8.44 3.04-1.37 5.1-2.71 6.81-4.69v1.47zm0-41.37v1c-6.56.26-12.11 3.13-19.71 9.08l-4.63 3.68a51.87 51.87 0 0 1-4.4 3.14c-.82.52-5.51 3.33-6.22 3.76-3.31 2-6.15 3.8-8.87 5.6a112.61 112.61 0 0 0-8.16 5.92c-4.61 3.72-7.4 6.9-7.97 9.35-.63 2.67 1.48 4.53 7.05 5.46 10.7 1.78 20.92-.05 30.45-4.65a61.96 61.96 0 0 0 17.1-12.2 41.8 41.8 0 0 0 5.36-7.42v1.92a38.94 38.94 0 0 1-4.64 6.19 62.95 62.95 0 0 1-17.39 12.41c-9.7 4.68-20.13 6.55-31.05 4.73-6.06-1-8.65-3.29-7.85-6.67.64-2.74 3.53-6.05 8.31-9.9 2.35-1.9 5.1-3.88 8.24-5.97 2.73-1.82 5.58-3.61 8.9-5.62.72-.44 5.4-3.24 6.22-3.75 1.26-.8 2.6-1.76 4.3-3.09.8-.62 3.9-3.1 4.63-3.67 7.77-6.1 13.49-9.04 20.33-9.3zm0-154.6v1c-1.75-.24-4.3.23-7.82 1.55-10.01 3.75-13.8 5.07-19.15 6.76-1.78.56-2.63.83-3.87 1.24-1.48.5-3.16.76-6.74 1.16a1550.34 1550.34 0 0 0-2.64.3c-7.8.94-11.28 2.47-11.28 6.07 0 4.45 2.89 13.18 7.96 25.81a57.34 57.34 0 0 1 2.33 7.6 258.32 258.32 0 0 1 .84 3.46c1.86 7.62 3.17 10.71 5.56 11.67 2.21.88 4.7.6 7.47-.72 3.48-1.69 7.22-4.94 11.2-9.47 1.52-1.7 2.97-3.49 4.59-5.57l3.16-4.1c2.59-3.23 6.07-12.21 8.39-20.23v3.45c-2.29 7.2-5.27 14.5-7.61 17.41-.44.55-2.67 3.46-3.15 4.09-1.63 2.1-3.1 3.9-4.62 5.62-4.08 4.61-7.9 7.94-11.53 9.7-2.99 1.44-5.77 1.75-8.28.74-2.84-1.13-4.2-4.34-6.15-12.35a2097.48 2097.48 0 0 1-.84-3.46c-.8-3.2-1.47-5.45-2.28-7.46-5.14-12.8-8.04-21.55-8.04-26.19 0-4.37 3.84-6.06 12.16-7.07a160.9 160.9 0 0 1 2.65-.3c3.5-.39 5.15-.64 6.53-1.1 1.26-.42 2.1-.7 3.88-1.26 5.34-1.68 9.11-3 19.1-6.74 3.53-1.32 6.22-1.84 8.18-1.61zM0 292c10.13-11.31 18.13-23.2 23.07-35.39 3.3-8.14 6.09-16.12 10.81-30.55l1.59-4.84c6.53-19.94 10.11-29.82 14.77-39.56 6.07-12.72 12.55-21.18 20.27-25.54 6.66-3.76 10.2-7.86 12.22-13.15a46.6 46.6 0 0 0 1.86-6.58c1.23-5.2 2.05-7.59 3.93-10.36 2.45-3.62 6.27-6.53 12.1-8.96 15.78-6.58 16.73-7.04 18.05-9.01.65-.98.83-2.15.74-4.51-.03-.73-.23-3.82-.24-4A93.8 93.8 0 0 1 119 94c0-10.04.18-11.37 2.37-13.15.52-.42 1.13-.8 2.07-1.3.27-.14 2.18-1.12 2.84-1.48a68.4 68.4 0 0 0 9.12-5.87c2.06-1.54 2.64-2.14 8.01-7.93 3.78-4.09 6.21-6.36 8.96-8.12 3.64-2.33 7.2-3.12 10.9-2.11 4.4 1.2 10.81 2 18.78 2.46 6.9.4 12.9.5 21.95.5 4.87 0 8.97.47 15.4 1.57 7.77 1.33 9.3 1.54 12.38 1.54 4.05 0 7.43-.88 10.68-2.95 5.06-3.22 8.11-4.67 11.2-5.2 3.62-.64 4.77-.46 16.55 2.06 17.26 3.7 30.85 1.36 41.06-9.7 5.1-5.53 5.48-8.9 3.48-14.8-.83-2.42-1.03-3.1-1.17-4.3-.29-2.52.5-4.71 2.71-6.93 2.65-2.65 4.72-9.17 6.22-18.29h2.03c-1.56 9.71-3.77 16.65-6.83 19.7-1.79 1.8-2.36 3.39-2.14 5.28.11 1 .3 1.63 1.07 3.9 2.22 6.53 1.76 10.66-3.9 16.8-10.77 11.66-25.07 14.13-42.95 10.3-11.42-2.45-12.55-2.62-15.78-2.06-2.77.48-5.62 1.84-10.47 4.92a20.93 20.93 0 0 1-11.76 3.27c-3.25 0-4.81-.22-12.73-1.57C212.74 59.46 208.73 59 204 59c-9.1 0-15.11-.1-22.07-.5-8.09-.47-14.62-1.29-19.2-2.54-5.62-1.53-10.17 1.38-17.85 9.66-5.5 5.94-6.08 6.53-8.28 8.18a70.38 70.38 0 0 1-9.38 6.03c-.68.37-2.58 1.35-2.84 1.49-.84.44-1.35.76-1.75 1.08C121.16 83.6 121 84.8 121 94c0 1.85.06 3.54.17 5.44 0 .17.2 3.28.24 4.03.1 2.75-.13 4.29-1.08 5.71-1.67 2.5-2.27 2.8-18.95 9.74-5.48 2.29-8.99 4.96-11.2 8.24-1.71 2.51-2.47 4.73-3.64 9.7-.83 3.5-1.21 4.92-1.94 6.83-2.18 5.73-6.05 10.19-13.1 14.18-7.3 4.12-13.55 12.28-19.46 24.66-4.6 9.64-8.17 19.46-14.67 39.32l-1.58 4.84c-4.75 14.47-7.54 22.48-10.86 30.69-5.28 13.01-13.95 25.65-24.93 37.6v-2.97zm0 78v-.5l1-.01c6.32 0 7.47 5.2 4.6 13.36a60.36 60.36 0 0 1-5.6 11.3v-1.92a57.76 57.76 0 0 0 4.65-9.72c2.69-7.6 1.71-12.02-3.65-12.02-.34 0-.67 0-1 .02v-46.59a340.96 340.96 0 0 0 13.71-8.34c13.66-9.46 29.79-37.6 29.79-53.59 0-18.1 21.57-72.64 32.23-79.42 12.71-8.09 32.24-27.96 35.8-37.75 1.93-5.3 5.5-7.27 14.42-9.37 6.15-1.44 8.64-2.42 10.67-4.79 1.5-1.74 2.72-4.79 4.33-10.3.23-.78 1.9-6.68 2.43-8.46 3.62-12.08 7.3-18.49 13.47-20.39 2.5-.76 3.03-.98 9.74-3.7 7.49-3.03 11.97-4.43 17.12-4.92 6.75-.65 13.13.75 19.55 4.67 5.43 3.32 12.19 4.72 20.17 4.56 6.03-.12 12.2-1.07 19.83-2.8 1.82-.4 7.38-1.74 8.26-1.94 2.69-.6 4.34-.89 5.48-.89 4.97 0 8.93-.05 14.2-.27 7.9-.32 15.56-.92 22.75-1.88 8.5-1.14 15.9-2.73 21.88-4.82 18.9-6.62 32.64-18.3 33.67-27.59.29-2.56.4-2.96 2.79-11.11 2.33-7.95 3.21-12.93 2.72-18.23-.2-2.24-.69-4.38-1.48-6.42-1.5-3.92-2.63-9.4-3.43-16.18h.9c.77 6.47 1.89 11.72 3.47 15.82a24.93 24.93 0 0 1 1.54 6.69c.5 5.46-.4 10.54-2.77 18.6-2.36 8.06-2.47 8.47-2.74 10.95-1.09 9.75-15.1 21.68-34.33 28.41-6.06 2.12-13.52 3.72-22.09 4.87-7.22.96-14.92 1.57-22.83 1.89-5.3.21-9.27.27-14.25.27-1.04 0-2.64.27-5.26.87-.87.2-6.43 1.53-8.26 1.94-7.68 1.73-13.92 2.7-20.03 2.82-8.15.17-15.1-1.27-20.71-4.7-6.23-3.81-12.4-5.16-18.93-4.54-5.04.48-9.44 1.86-16.84 4.86-6.75 2.74-7.29 2.95-9.82 3.73-5.73 1.76-9.28 7.96-12.81 19.72-.53 1.77-2.2 7.66-2.43 8.46-1.66 5.65-2.91 8.78-4.53 10.67-2.22 2.58-4.84 3.62-12.01 5.3-7.8 1.83-11.13 3.66-12.9 8.54-3.65 10.04-23.32 30.06-36.2 38.25C65.94 190 44.5 244.2 44.5 262c0 16.34-16.3 44.78-30.22 54.41-2.14 1.48-8.24 5.12-14.28 8.68v-1.16 46.09zm0-173.7v-1.11c7.42-3.82 14.55-10.23 21.84-18.98 3.8-4.56 14.21-18.78 15.79-20.55 1.8-2.04 4.06-3.96 7.42-6.45 1.08-.8 4.92-3.57 5.49-3.99 9.36-6.85 14-11.96 15.98-19.36.8-2.98 1.54-6.78 2.46-12.3.23-1.44 2-12.46 2.56-15.79 2.87-16.77 5.73-26.79 10.07-32.1C92.46 52.43 101.5 38.13 101.5 33c0-2.54.34-3.35 6.05-15.71.68-1.49 1.25-2.74 1.77-3.93 2.5-5.75 3.9-10.04 4.14-13.36h1c-.23 3.48-1.66 7.87-4.23 13.76-.52 1.2-1.09 2.45-1.78 3.95-5.54 12.01-5.95 12.99-5.95 15.29 0 5.47-9.09 19.84-20.11 33.31-4.2 5.12-7.03 15.06-9.86 31.64-.57 3.33-2.33 14.33-2.57 15.78-.92 5.56-1.67 9.38-2.48 12.4-2.05 7.68-6.82 12.93-16.35 19.91l-5.49 3.98c-3.3 2.45-5.51 4.34-7.27 6.31-1.53 1.73-11.94 15.93-15.76 20.53-7.52 9.02-14.88 15.6-22.61 19.46zm0 361.83v-4.33c.48 2.36 1 4.35 1.6 6.15 2 6.03 4.6 8.26 8.19 6.59C28.76 557.69 43.5 542.4 43.5 527c0-16.2 6.37-31.99 17.1-46.3 1.88-2.5 3.66-4.4 5.53-6 .73-.62 1.45-1.18 2.3-1.8l2-1.43c3.68-2.68 5.32-5.28 7.08-12.59.75-3.07 1.38-5.02 4.2-13.26l.63-1.88c3.24-9.58 4.56-14.97 4.17-18.65-.48-4.43-3.8-5.23-11.3-1.64a81.12 81.12 0 0 1-9.15 3.7c-13.89 4.67-26.96 5.8-42.66 5.42l-1.95-.05-1.45-.02a39.8 39.8 0 0 0-15.05 2.96A21.81 21.81 0 0 0 0 438.37v-1.26a23.55 23.55 0 0 1 4.55-2.57 40.77 40.77 0 0 1 16.92-3.02l1.95.05c15.6.38 28.57-.75 42.32-5.37a80.12 80.12 0 0 0 9.04-3.65c8.04-3.84 12.16-2.85 12.72 2.43.42 3.89-.92 9.34-4.21 19.08l-.64 1.88c-2.8 8.2-3.43 10.15-4.16 13.18-1.82 7.52-3.59 10.34-7.47 13.16l-2 1.43c-.84.6-1.54 1.15-2.25 1.75a35.45 35.45 0 0 0-5.37 5.84c-10.61 14.15-16.9 29.74-16.9 45.7 0 15.88-15 31.45-34.29 40.45-4.3 2.01-7.39-.66-9.56-7.18-.23-.68-.44-1.39-.65-2.13zm0-62.16v-2.45l1.46 3.27c2.1 4.8 3.46 10.33 4.26 16.77.66 5.3.84 9.3 1.04 18.5.2 9.32.5 12.75 1.63 15.05 1.28 2.6 3.67 2.35 8.29-1.5 17.14-14.3 21.82-22.9 21.82-38.62 0-7.17 1.1-12.39 3.7-17.68 2.27-4.67 3.65-6.62 13.4-19.62a69.8 69.8 0 0 1 7.6-8.79 44.76 44.76 0 0 1 3.54-3.06c.38-.3.64-.52.89-.74a10.47 10.47 0 0 0 2.63-3.32 35.78 35.78 0 0 0 2.26-5.94l.37-1.2.36-1.15c.29-.91.48-1.55.66-2.16.45-1.53.74-2.68.91-3.66.38-2.2.12-3.49-.85-4.15-2.35-1.61-9.28-.24-23.8 4.94-9.54 3.4-16.12 4.17-27.85 4.26-7.71.06-10.43.4-13.25 2.12-3.48 2.12-5.84 6.4-7.58 14.26-.5 2.2-.99 4.19-1.49 5.98v-3.98l.51-2.22c1.8-8.1 4.28-12.6 8.04-14.9 3.04-1.85 5.86-2.2 13.77-2.26 11.61-.09 18.1-.84 27.51-4.2 14.93-5.32 21.95-6.71 24.7-4.83 1.38.94 1.71 2.6 1.28 5.15a33.69 33.69 0 0 1-.94 3.78l-.66 2.17-.36 1.15-.37 1.2a36.64 36.64 0 0 1-2.33 6.1c-.8 1.53-1.61 2.52-2.86 3.61l-.92.77-1.02.83c-.9.74-1.65 1.4-2.47 2.18a68.84 68.84 0 0 0-7.48 8.66c-9.7 12.93-11.07 14.87-13.31 19.46-2.52 5.15-3.59 10.22-3.59 17.24 0 16.04-4.82 24.91-22.18 39.38-5.04 4.2-8.18 4.55-9.83 1.18-1.22-2.5-1.52-5.94-1.73-15.47-.2-9.16-.38-13.15-1.03-18.4-.79-6.34-2.12-11.8-4.19-16.49L0 495.98zM379.27 0h1.04l1.5 5.26c3.28 11.56 4.89 19.33 5.26 27.8.49 11.01-1.52 21.26-6.63 31.17-7.8 15.13-20.47 26.5-36.22 34.1-12.38 5.96-26.12 9.17-36.22 9.17-6.84 0-17.24 1.38-37.27 4.62l-2.27.37c-24.5 3.99-31.65 5-37.46 5-3.49 0-4.08-.08-19.54-2.8-3.56-.64-6.32-1.1-9-1.5-20.23-2.96-31-1.2-31.96 7.86-.1.85-.18 1.72-.29 2.81l-.27 2.73c-1.1 10.9-2.02 15.73-4.31 19.96-2.9 5.34-7.77 7.95-15.63 7.95-10.2 0-12.92.6-15.5 3.17.52-.51-5.03 5.85-8.16 8.7-2.75 2.5-14.32 12.55-15.77 13.83a341.27 341.27 0 0 0-6.54 5.92c-6.97 6.49-11.81 11.76-14.6 16.15-5.92 9.3-10.48 18.04-11.69 24.08-1.66 8.3 3.67 9.54 19.02 1.21a626.23 626.23 0 0 1 44.54-21.9c3.5-1.56 14.04-6.2 15.68-6.95 5.05-2.25 8.3-3.8 10.78-5.15l1.95-1.07 2.18-1.18c1.76-.94 3.38-1.76 5-2.55 18.1-8.72 34.48-10.46 50.33-1.2 22.89 13.34 38.28 37.02 38.28 56.44 0 19.12-.73 25.13-5.18 33.2a45.32 45.32 0 0 1-4.94 7.12c-6.47 7.77-11.81 16.2-12.76 21.27-1.2 6.34 4.69 7.03 20.17-.05 13.31-6.08 22.4-14.95 28.5-26.32a80.51 80.51 0 0 0 6.1-15.13c.9-2.98 3.17-11.65 3.41-12.48a29.02 29.02 0 0 1 1.75-4.83c7.47-14.93 21.09-30.5 36.25-37.24 7.61-3.38 13-9.65 19.4-20.79.84-1.48 4.26-7.64 5.14-9.17 3.52-6.1 6.22-9.7 9.37-11.98 10.15-7.4 28.7-11.1 50.29-11.1 7.52 0 16.54-1.24 27.51-3.58a420.1 420.1 0 0 0 14.96-3.52c-1.3.33 15.54-3.98 19.42-4.89 14.15-3.33 41.07-5.01 64.11-5.01 17.36 0 27.82-9.23 38.53-38.67 6.62-18.21 6.62-26.37 2.69-34.35l-1.18-2.37A13.36 13.36 0 0 1 587.5 58c0-4.03 0-4.01 2.5-24.56.46-3.73.8-6.74 1.12-9.64.9-8.45 1.38-15.2 1.38-20.8 0-.94-.02-1.94-.04-3h1c.03 1.06.04 2.06.04 3 0 5.65-.48 12.43-1.39 20.9-.3 2.91-.66 5.93-1.11 9.66-2.5 20.45-2.5 20.47-2.5 24.44 0 1.97.45 3.57 1.45 5.68.24.51 1.16 2.35 1.17 2.36 4.06 8.24 4.06 16.68-2.65 35.13-10.84 29.8-21.63 39.33-39.47 39.33-22.96 0-49.83 1.68-63.89 4.99-3.86.9-20.69 5.2-19.4 4.88a421.05 421.05 0 0 1-14.99 3.53c-11.04 2.35-20.11 3.6-27.72 3.6-21.4 0-39.76 3.67-49.7 10.9-3 2.19-5.64 5.7-9.1 11.68-.87 1.52-4.29 7.68-5.14 9.17-6.49 11.3-12 17.71-19.86 21.2-14.9 6.63-28.38 22.03-35.75 36.77a28.17 28.17 0 0 0-1.69 4.67c-.23.8-2.5 9.49-3.4 12.5a81.48 81.48 0 0 1-6.19 15.3c-6.2 11.56-15.44 20.58-28.96 26.76-16.1 7.36-23 6.55-21.58-1.04 1-5.29 6.4-13.83 12.99-21.73a44.33 44.33 0 0 0 4.82-6.96c4.35-7.88 5.06-13.77 5.06-32.72 0-19.04-15.19-42.4-37.72-55.55-15.57-9.08-31.62-7.38-49.45 1.21a132.9 132.9 0 0 0-7.14 3.71l-1.95 1.07a158.83 158.83 0 0 1-10.85 5.19c-1.65.74-12.18 5.38-15.69 6.95a625.25 625.25 0 0 0-44.46 21.86c-15.95 8.66-22.37 7.16-20.48-2.29 1.24-6.2 5.83-15.02 11.82-24.42 2.85-4.48 7.74-9.8 14.77-16.34 1.98-1.85 4.12-3.79 6.56-5.94 1.46-1.29 13.02-11.33 15.75-13.82 3.09-2.8 8.6-9.14 8.14-8.67 2.82-2.82 5.75-3.46 16.2-3.46 7.5 0 12.04-2.43 14.75-7.42 2.2-4.07 3.11-8.84 4.2-19.59l.26-2.73.3-2.81c.56-5.42 4.47-8.5 11.23-9.6 5.44-.88 12.51-.51 21.86.86 2.7.4 5.47.86 9.04 1.49 15.33 2.7 15.96 2.8 19.36 2.8 5.73 0 12.9-1.03 37.3-5l2.27-.36c20.1-3.26 30.52-4.64 37.43-4.64 9.95 0 23.54-3.18 35.78-9.08 15.57-7.5 28.09-18.73 35.78-33.65 5.02-9.75 7-19.82 6.51-30.67-.37-8.37-1.96-16.08-5.23-27.57L379.27 0zm13.68 0h1.02c.78 3.9 1.92 8.7 3.51 14.88 3.63 14.05 3.06 27.03-.75 38.77a61 61 0 0 1-11.35 20.68 138.36 138.36 0 0 1-19.32 18.77c-11.32 9.02-23.36 15.49-35.95 18.39a258.63 258.63 0 0 1-22.57 4.07c-3.17.44-6.36.85-10.3 1.32l-9.39 1.12c-11.53 1.41-17.45 2.55-21.64 4.46-9.28 4.21-28.35 6.04-49.21 6.04-1.37 0-2.8-.12-4.3-.35-2.62-.41-5-1.03-9.14-2.29-7.34-2.21-9.63-2.75-12.63-2.56-3.9.23-6.63 2.29-8.47 6.89-1.86 4.66-2.42 7.53-3.34 14.98-1.1 8.98-2.87 12.12-9.97 14.3a40.12 40.12 0 0 0-6.8 2.66c-.63.33-1.16.64-1.76 1.02l-1.34.86c-1.9 1.14-3.86 1.49-9.25 1.49-3.2 0-8.83-.55-9.51-.39-1.22.28-.75-.14-7.14 6.24-1.5 1.5-3.49 3.18-6.32 5.37-1.52 1.18-7.16 5.43-7.94 6.03-4.96 3.78-8.33 6.6-11.06 9.38-4.88 4.98-6.85 9.15-5.56 12.7 1.34 3.67 4.07 4.42 8.9 2.82a55.72 55.72 0 0 0 7.77-3.48c1.5-.77 7.78-4.13 9.37-4.96a116.8 116.8 0 0 1 12.31-5.68 162.2 162.2 0 0 0 11.04-4.84c2.04-.97 10.74-5.16 13-6.22 4.41-2.1 8.1-3.78 11.65-5.29 17.14-7.3 29.32-9.9 37.67-6.65l5.43 2.1c2.3.88 4.17 1.62 6.02 2.38a150.9 150.9 0 0 1 13.07 6c18.34 9.63 30.35 22.13 34.79 39.87 6.96 27.85 3.6 45.53-8.08 62.4-3.97 5.75-3.52 9.2.06 8.97 4.14-.28 10.21-4.95 15.11-12.52 3.1-4.8 5.1-10.45 8.05-21.53l1.69-6.35c.66-2.47 1.24-4.52 1.83-6.5 4.93-16.56 11-27.28 21.56-34.76 7.15-5.06 23.73-15.5 25.48-16.75 6.74-4.81 10.53-9.44 14.34-18 7.74-17.44 21.09-24.34 44.47-24.34 9.36 0 17.91-1.13 29.53-3.49a624.86 624.86 0 0 0 6.2-1.28c2.4-.5 4.07-.84 5.66-1.13 4.03-.74 7.04-1.1 9.61-1.1 4.44 0 9.39-1 31.39-5.99l2.95-.66c16.34-3.67 25.64-5.35 31.66-5.35 1.54 0 2.4.01 6.4.1 7.8.15 12.27.13 17.33-.2 16.41-1.06 26.73-5.36 29.8-14.56a87.1 87.1 0 0 1 3.55-8.83c-.15.31 2.29-4.96 2.9-6.38 5.38-12.3 5.57-21.92-1.44-39.44a86.4 86.4 0 0 1-5.26-20.72c-1.61-11.98-1.38-23.14.1-40.35l.2-2.12h1l-.2 2.2c-1.48 17.15-1.7 28.24-.11 40.14a85.4 85.4 0 0 0 5.2 20.47c7.1 17.78 6.91 27.67 1.43 40.22-.62 1.43-3.06 6.72-2.91 6.4a86.17 86.17 0 0 0-3.52 8.73c-3.23 9.72-13.9 14.15-30.68 15.24-5.1.33-9.58.35-17.42.2-3.98-.09-4.84-.1-6.37-.1-5.91 0-15.18 1.67-31.44 5.32l-2.95.67c-22.16 5.02-27.05 6.01-31.61 6.01-2.5 0-5.45.36-9.43 1.09-1.58.29-3.25.62-5.64 1.11a4894.21 4894.21 0 0 0-6.2 1.29c-11.68 2.37-20.3 3.51-29.73 3.51-23.02 0-36 6.71-43.53 23.66-3.9 8.8-7.82 13.58-14.7 18.5-1.78 1.27-18.36 11.7-25.48 16.75-10.34 7.32-16.3 17.87-21.19 34.23-.58 1.96-1.15 4-1.82 6.47l-1.69 6.35c-2.98 11.18-5 16.9-8.17 21.81-5.05 7.81-11.37 12.68-15.89 12.98-4.7.31-5.3-4.23-.94-10.53 11.52-16.64 14.82-34.03 7.92-61.6-4.35-17.42-16.16-29.72-34.27-39.22-4-2.1-8.2-4-12.99-5.97-1.84-.75-3.7-1.49-6-2.38l-5.43-2.08c-8.03-3.12-20.02-.58-36.92 6.63-3.52 1.5-7.21 3.19-11.61 5.27l-13 6.22c-4.71 2.22-8.16 3.75-11.11 4.88a115.87 115.87 0 0 0-12.21 5.63c-1.58.83-7.86 4.18-9.37 4.96a56.55 56.55 0 0 1-7.9 3.54c-5.3 1.75-8.62.85-10.17-3.43-1.46-4.02.66-8.5 5.8-13.74 2.75-2.82 6.16-5.66 11.15-9.48.79-.6 6.43-4.85 7.94-6.02a66.96 66.96 0 0 0 6.23-5.28c6.74-6.74 6.1-6.16 7.61-6.51.87-.2 6.69.36 9.74.36 5.22 0 7.03-.32 8.74-1.35l1.31-.84c.62-.4 1.18-.72 1.84-1.07a41.07 41.07 0 0 1 6.96-2.72c6.64-2.04 8.22-4.84 9.28-13.47.93-7.53 1.5-10.47 3.4-15.24 1.99-4.95 5.04-7.26 9.34-7.51 3.17-.2 5.5.35 12.97 2.6a63.54 63.54 0 0 0 9.02 2.26c1.45.22 2.83.34 4.14.34 20.71 0 39.7-1.82 48.8-5.96 4.32-1.96 10.29-3.1 21.93-4.53l9.4-1.12c3.92-.48 7.11-.88 10.27-1.32 8.16-1.14 15.4-2.43 22.49-4.06 12.42-2.86 24.33-9.26 35.55-18.2a137.4 137.4 0 0 0 19.18-18.64 60.02 60.02 0 0 0 11.15-20.32c3.76-11.57 4.32-24.36.75-38.23A284.86 284.86 0 0 1 392.95 0zM506.7 0h1.26c-.5.66-.9 1.18-1.17 1.51-3.95 4.96-6.9 7.92-9.82 9.57A10.02 10.02 0 0 1 492 12.5c-2.38 0-4.24.67-6.71 2.21l-2.65 1.71c-4.38 2.8-8.01 4.08-13.64 4.08-5.6 0-9.99-1.26-16.08-4.05a202.63 202.63 0 0 1-2.3-1.06l-2.18-.98c-1.6-.7-2.92-1.17-4.17-1.48a13.42 13.42 0 0 0-3.27-.43c-2.3 0-4.3-.68-11-3.37l-1.56-.62c-5-1.97-8.1-2.82-10.52-2.66-2.93.2-4.42 2.03-4.42 6.15 0 20.76-5.21 50.42-12.15 57.35-7.58 7.59-26.55 23.7-34.06 29.06-13.16 9.4-31.17 20.2-44.11 25.06a106.87 106.87 0 0 1-13.32 4.03c-3.28.78-6.6 1.43-11.25 2.24-.53.1-8.8 1.5-11.5 1.99-4.86.87-9.3 1.74-14 2.76-20.62 4.48-25.07 5.01-38.11 5.01-2.49 0-2.9-.07-14.05-2-2.42-.42-4.31-.73-6.15-1-8.11-1.19-13.83-1.36-17.64-.2-4.54 1.4-5.93 4.65-3.7 10.52 2.02 5.28 4.84 8.61 8.84 10.74 3.26 1.74 6.75 2.6 13.82 3.71 9.42 1.48 10.94 1.75 15.5 2.92a78.2 78.2 0 0 1 18.62 7.37c8.3 4.58 14.58 11.5 19.98 20.89 2.73 4.73 9.46 19.33 10.54 21.19 3.4 5.85 6.26 6.63 10.89 2 4.95-4.94 10.35-8.37 21.13-14.06.47-.25 2.06-1.1 2.12-1.12 7.98-4.21 11.92-6.51 15.87-9.54 5.11-3.9 8.66-8.1 10.77-13.11 8.52-20.24 20.75-33.31 32.46-33.31l5.5.03c10.53.08 17.35.02 24.9-.31 13.66-.62 23.78-2.09 29.39-4.67 5.85-2.7 13.42-5.49 24.18-9.02 3.46-1.14 6.29-2.05 12.7-4.1 7.7-2.45 11.08-3.54 15.17-4.9a1059.43 1059.43 0 0 1 11.33-3.72c3.67-1.2 5.96-2 8.03-2.78a59.88 59.88 0 0 0 6.66-2.94c1.87-.98 3.76-2.1 5.86-3.5 3.48-2.33 6.15-3.13 12.04-4.13l1.15-.2c5.71-1.01 9-2.3 12.76-5.63 7.82-6.96 8.58-23.18 3.84-44.52-1.7-7.67-2.1-19.28-1.57-35.47A837.22 837.22 0 0 1 546.76 0h1l-.15 3.06c-.32 6.42-.53 11.02-.68 15.62-.51 16.1-.12 27.65 1.56 35.21 4.82 21.68 4.04 38.2-4.16 45.48-3.91 3.48-7.37 4.84-13.24 5.87l-1.16.2c-5.76.99-8.32 1.75-11.65 3.98a63.73 63.73 0 0 1-5.96 3.56 60.86 60.86 0 0 1-6.77 2.99c-2.09.79-4.39 1.58-8.07 2.79a5398.31 5398.31 0 0 1-11.32 3.71c-4.1 1.37-7.48 2.46-15.18 4.92-6.42 2.04-9.24 2.95-12.7 4.08-10.73 3.53-18.27 6.3-24.07 8.98-5.76 2.66-15.97 4.14-29.77 4.77-7.56.33-14.4.39-24.95.31l-5.49-.03c-11.19 0-23.16 12.79-31.54 32.7-2.19 5.19-5.84 9.52-11.08 13.52-4.02 3.07-7.99 5.39-16.01 9.62l-2.12 1.12c-10.7 5.65-16.04 9.04-20.9 13.9-5.14 5.14-8.75 4.15-12.45-2.22-1.12-1.92-7.85-16.5-10.54-21.2-5.33-9.24-11.48-16.02-19.6-20.5a77.2 77.2 0 0 0-18.4-7.28c-4.5-1.17-6.02-1.43-15.4-2.9-7.17-1.12-10.74-2-14.13-3.81-4.22-2.25-7.2-5.77-9.3-11.27-2.43-6.39-.78-10.26 4.34-11.83 4-1.22 9.82-1.05 18.08.17 1.84.27 3.74.58 6.17 1 11.02 1.9 11.48 1.98 13.88 1.98 12.96 0 17.35-.52 37.9-4.99 4.71-1.02 9.16-1.9 14.03-2.77 2.71-.48 10.98-1.9 11.5-1.98 4.64-.81 7.95-1.46 11.2-2.23 4.55-1.07 8.76-2.34 13.2-4 12.83-4.81 30.79-15.59 43.88-24.94 7.47-5.33 26.4-21.4 33.94-28.94C407.3 61.98 412.5 32.49 412.5 12c0-4.61 1.86-6.9 5.35-7.15 2.63-.18 5.8.7 10.96 2.73l1.56.62c6.53 2.62 8.53 3.3 10.63 3.3 1.14 0 2.3.16 3.5.46 1.32.33 2.68.82 4.34 1.53a90.97 90.97 0 0 1 3.34 1.52l1.15.54c5.98 2.73 10.23 3.95 15.67 3.95 5.41 0 8.87-1.21 13.1-3.92.2-.13 2.1-1.38 2.66-1.72 2.62-1.63 4.64-2.36 7.24-2.36 1.47 0 2.94-.43 4.47-1.3 2.78-1.56 5.67-4.45 9.54-9.31l.7-.89zM324.54 600h-2.03c.49-2.96.91-6.2 1.28-9.66.44-4.1.76-8.25.98-12.21.08-1.39.14-2.65-.35-7.29-.47-1.94-.93-4.14-1.36-6.54-2.01-11.26-2.66-22.9-1.14-33.78a60.76 60.76 0 0 1 5.18-17.95 70.78 70.78 0 0 1 12.6-18.22c3.38-3.6 5.53-5.5 11.83-10.79 4.5-3.78 6.35-5.56 7.52-7.5.64-1.07.95-2.06.95-3.06 0-1.75 0-1.74-.75-9.23-.36-3.7-.57-6.3-.68-8.96-.5-12.1 1.62-19.6 8.11-21.76 15.9-5.3 25.89-12.1 33.45-25.54C409.6 390.65 425.85 376 436 376c12.36 0 20-1.96 29.41-8.8 6.76-4.92 9.5-6.6 12.47-7.46 2.22-.64 3.8-.74 9.12-.74 1.86 0 3.53-.83 5.57-2.62 1.08-.96 5.11-5.12 5.6-5.6 6.04-5.85 11.98-8.78 20.83-8.78 2.45 0 4.54.04 7.32.12 7.51.23 8.87.17 11.27-.7 3.03-1.1 5.53-3.03 14.75-11.17 8-7.06 10.72-8.92 22.87-16.47 1.44-.9 2.59-1.63 3.69-2.37a69.45 69.45 0 0 0 9.46-7.5c4.12-3.88 8.02-7.85 11.64-11.9v2.98a201.58 201.58 0 0 1-10.27 10.38c-3.18 3-6.2 5.35-9.72 7.7-1.12.76-2.28 1.5-3.75 2.4-12.05 7.5-14.71 9.32-22.6 16.28-9.46 8.35-12.01 10.32-15.39 11.55-2.74 1-4.19 1.06-12.01.82-2.76-.08-4.83-.12-7.26-.12-8.27 0-13.75 2.7-19.43 8.22-.44.43-4.52 4.64-5.68 5.66-2.37 2.09-4.46 3.12-6.89 3.12-5.1 0-6.6.1-8.56.66-2.67.78-5.29 2.37-11.85 7.15-9.8 7.13-17.85 9.19-30.59 9.19-9.22 0-24.96 14.2-34.13 30.49-7.84 13.94-18.24 21.02-34.55 26.46-5.31 1.77-7.21 8.51-6.75 19.78.1 2.6.31 5.19.68 8.84.75 7.62.75 7.58.75 9.43 0 1.38-.42 2.73-1.24 4.09-1.33 2.2-3.26 4.07-7.94 8-6.25 5.24-8.36 7.12-11.67 10.63a68.8 68.8 0 0 0-12.25 17.71 58.8 58.8 0 0 0-5 17.36c-1.49 10.66-.85 22.09 1.13 33.15.43 2.37.88 4.53 1.33 6.44.16.66.3 1.25.6 4.06a249.3 249.3 0 0 1-1.17 16.12c-.37 3.37-.78 6.53-1.25 9.44zm-13.4 0h-1.05l.12-.28c3.07-7.16 4.29-11.83 4.29-18.72 0-3.57-.07-4.93-.76-15.65-.77-12.04-1-19.64-.55-28.3.58-11.5 2.4-22.1 5.81-32.16 1.3-3.8 2.8-7.5 4.55-11.1 3.46-7.14 6.83-12.39 10.42-16.6a59.02 59.02 0 0 1 4.35-4.56c.43-.4 3-2.8 3.67-3.45 5.72-5.6 7.51-11.52 7.51-29.18 0-18.84 2.9-23.77 15.82-28.24 1.09-.37 1.92-.67 2.77-.98a51.3 51.3 0 0 0 6.1-2.7c4.95-2.6 9.64-6.22 14.44-11.42 25.5-27.63 37.15-35.16 56.37-35.16 8.28 0 14.54-1.95 22-6.3 1.78-1.03 13.82-8.82 18.16-11.27 2.83-1.59 5.66-3.03 8.63-4.39 7.92-3.6 13.97-4.45 26.6-4.8 7.53-.2 10.7-.49 14.26-1.58 4.55-1.4 8.06-4 10.93-8.43 2.2-3.41 6.85-7.08 14.66-12.06 1.61-1.03 3.27-2.05 5.65-3.5 9.53-5.85 11.56-7.13 14.81-9.57 5.34-4 9.3-8.37 13.68-14.77a204.2 204.2 0 0 0 5.62-8.75v1.9c-1.97 3.17-3.4 5.38-4.8 7.42-4.42 6.48-8.46 10.92-13.9 15-3.29 2.46-5.32 3.75-14.89 9.61a375.06 375.06 0 0 0-5.63 3.5c-7.7 4.9-12.26 8.52-14.36 11.76-3 4.63-6.7 7.39-11.48 8.85-3.68 1.12-6.9 1.42-14.53 1.63-12.5.34-18.44 1.18-26.2 4.7a111.08 111.08 0 0 0-8.56 4.35c-4.3 2.43-16.34 10.22-18.15 11.27-7.6 4.43-14.03 6.43-22.5 6.43-18.87 0-30.3 7.4-55.63 34.84-4.88 5.28-9.67 8.97-14.7 11.62-2 1.05-4 1.92-6.23 2.75-.86.32-1.7.62-5.37 1.87-5.08 1.76-7.44 3.25-9.28 6.37-2.23 3.78-3.29 9.94-3.29 20.05 0 17.9-1.87 24.07-7.8 29.89-.69.67-3.27 3.06-3.69 3.46a58.04 58.04 0 0 0-4.28 4.49c-3.53 4.14-6.86 9.32-10.28 16.38a95.19 95.19 0 0 0-4.5 10.99c-3.38 9.97-5.18 20.48-5.76 31.9-.44 8.6-.22 16.17.55 28.17.69 10.76.76 12.12.76 15.72 0 6.35-1.02 10.87-4.35 19zm25.08 0h-1c-.04-4.73.06-9.39.28-15.02.26-6.41-.4-11.79-2.53-24.37l-.31-1.86c-2.12-12.55-2.76-19.35-1.97-26.47 1.03-9.25 4.75-16.68 12-22.67 22.04-18.2 29.81-30.18 29.81-44.61 0-2.6-.3-4.81-.98-8.17-.97-4.79-1.1-5.68-.97-7.57.2-2.56 1.27-4.7 3.56-6.72 2.67-2.35 7.05-4.6 13.72-7.01 9.72-3.5 15.52-9.18 24.3-21.57l1.78-2.5c4.48-6.33 7.1-9.63 10.43-12.78 4.31-4.07 8.98-6.77 14.54-8.17 13.3-3.32 20.37-5.47 25.34-7.64a49.5 49.5 0 0 0 5.28-2.7c1.1-.65 1.75-1.04 4.24-2.6 2.7-1.68 5.22-2.08 11.38-2.28 5.44-.18 7.9-.43 10.97-1.41a21.47 21.47 0 0 0 9.54-6.22c4.87-5.3 10.03-7.61 17.79-8.9 1.07-.18 1.88-.3 3.86-.58 6.9-.97 9.94-1.69 13.48-3.62 4.5-2.45 6.79-4.44 23.46-19.68l3.14-2.85c9.65-8.71 16.12-13.83 21.42-16.48 4.25-2.12 7.6-4.69 11.22-8.6v1.45c-3.42 3.57-6.69 6-10.78 8.05-5.18 2.59-11.61 7.67-21.2 16.32l-3.12 2.85c-16.8 15.35-19.05 17.3-23.66 19.82-3.68 2-6.8 2.75-13.82 3.73-1.97.28-2.78.4-3.84.57-7.56 1.26-12.52 3.48-17.21 8.6a22.47 22.47 0 0 1-9.97 6.5c-3.2 1-5.72 1.27-11.25 1.45-5.98.2-8.39.57-10.89 2.13a144 144 0 0 1-4.25 2.61 50.48 50.48 0 0 1-5.39 2.75c-5.04 2.2-12.15 4.37-25.5 7.7-9.74 2.44-15.26 7.65-24.4 20.56l-1.77 2.5c-8.9 12.54-14.82 18.34-24.78 21.93-6.57 2.36-10.85 4.57-13.4 6.82-2.1 1.86-3.05 3.74-3.22 6.04-.13 1.76 0 2.63.95 7.3.7 3.42 1 5.7 1 8.37 0 14.79-7.93 27-30.18 45.39-7.03 5.8-10.64 13-11.64 22-.78 7-.14 13.73 1.96 26.2l.32 1.85c2.15 12.65 2.8 18.07 2.54 24.58-.22 5.57-.32 10.2-.28 14.98zM95.9 600h-2.04c.68-3.82 1.14-8.8 1.61-15.98.2-3.11.27-4.06.39-5.6 1.3-17.54 4.04-27.14 11.5-33.2 4.65-3.77 7.22-8.92 8.67-16 .51-2.52.7-3.87 1.33-9.17.66-5.5 1.16-8.06 2.24-10.36 1.45-3.09 3.82-4.69 7.39-4.69 14.28 0 38.48 9.12 53.6 20.2 8.66 6.35 21.26 13.32 31.74 17.11 13.03 4.71 21.89 4.41 24.75-1.73 1.7-3.64 1.92-4.11 2.65-5.77 2.93-6.67 4.69-12.2 5.25-17.5.23-2.17.24-4.23.02-6.2-.32-2.75-1.42-4.55-4.08-7.35l-1.32-1.37a30.59 30.59 0 0 1-2.41-2.79 30.37 30.37 0 0 1-2.5-4.07l-1.13-2.14c-1.62-3.1-2.68-4.6-4.12-5.56-5.26-3.5-14.8-5.5-28.55-6.83a272.42 272.42 0 0 0-9.04-.71l-2.18-.17c-9.57-.73-15.12-1.56-19.06-3.2C156.57 471.07 136 450.5 136 440c0-5.34 1.74-9.53 5.47-14.13 1.98-2.44 11.12-11.71 12.79-13.54 4.52-4.97 10.16-9.54 17.68-14.66 2.8-1.9 14.78-9.6 17.49-11.49a50.54 50.54 0 0 0 6.34-5.43c1.53-1.5 6.96-7.13 7.12-7.3 7.18-7.3 12.7-11.56 19.74-14.38 3.36-1.34 8.13-2.79 17.45-5.38a9577.18 9577.18 0 0 1 11.78-3.28 602.6 602.6 0 0 0 12.67-3.7c20.4-6.24 34-12.08 40.79-18.44 8.74-8.2 11.78-13.84 15.73-26.02 2.02-6.22 3.09-9.04 5.07-12.72 9.54-17.71 28.71-39.37 43.5-45.45C383.77 238.25 389 232.34 389 226c0-2.89 2.73-8.4 6.83-13.73 4.76-6.2 10.65-11.36 16.75-14.18 12.5-5.77 33.5-10.09 47.42-10.09 5.32 0 9.83-1.5 16.42-4.89 9.2-4.71 10.1-5.11 13.58-5.11 10.42 0 32.06-2.55 45.76-5.97l3.88-.98 3.47-.89c2.6-.66 4.33-1.08 5.93-1.43 3.9-.86 6.76-1.23 9.58-1.17 2.74.06 5.47.52 8.67 1.48 4.56 1.37 13.71-.9 22.87-5.68a68.07 68.07 0 0 0 9.84-6.2v2.4c-11.09 8.14-25.76 13.66-33.29 11.4a29.72 29.72 0 0 0-8.13-1.4c-2.63-.05-5.36.3-9.11 1.12a238 238 0 0 0-9.33 2.3l-3.9.99C522.38 177.43 500.58 180 490 180c-2.99 0-3.91.4-12.67 4.89-6.85 3.51-11.61 5.11-17.33 5.11-13.65 0-34.35 4.26-46.58 9.9-5.78 2.67-11.42 7.62-16 13.58-3.85 5.02-6.42 10.2-6.42 12.52 0 7.27-5.8 13.82-20.62 19.92-14.27 5.88-33.16 27.21-42.5 44.55-1.9 3.55-2.95 6.28-4.93 12.4-4.05 12.47-7.23 18.39-16.27 26.86-7.08 6.64-20.87 12.57-41.57 18.89a604.52 604.52 0 0 1-12.7 3.71 1495.1 1495.1 0 0 1-11.8 3.28c-9.24 2.58-13.97 4.01-17.24 5.32-6.73 2.69-12.05 6.8-19.05 13.92-.15.15-5.6 5.8-7.15 7.32a52.4 52.4 0 0 1-6.6 5.65c-2.74 1.92-14.75 9.63-17.5 11.5-7.4 5.04-12.94 9.52-17.33 14.35-1.72 1.9-10.8 11.11-12.71 13.46-3.47 4.26-5.03 8.03-5.03 12.87 0 9.5 20 29.5 33.38 35.08 3.67 1.53 9.1 2.34 18.45 3.05a586.23 586.23 0 0 0 4.34.32c3.24.23 5.07.37 6.93.55 14.08 1.37 23.82 3.4 29.45 7.17 1.82 1.2 3.02 2.91 4.8 6.29l1.11 2.13a28.55 28.55 0 0 0 2.34 3.81c.62.83 1.3 1.6 2.26 2.61.23.24 1.1 1.16 1.32 1.37 2.93 3.09 4.24 5.23 4.61 8.5.24 2.12.23 4.33-.01 6.64-.59 5.55-2.4 11.25-5.41 18.1-.74 1.67-.96 2.15-2.66 5.8-3.49 7.47-13.33 7.8-27.25 2.77-10.67-3.86-23.43-10.92-32.25-17.38C164.62 515.96 140.82 507 127 507c-5 0-6.4 3.02-7.64 13.29a99.03 99.03 0 0 1-1.36 9.33c-1.53 7.5-4.3 13.04-9.37 17.16-6.87 5.58-9.5 14.78-10.77 31.8-.11 1.52-.18 2.47-.38 5.57-.46 7.01-.91 11.99-1.57 15.85zm8.05 0h-1.02c.29-1.41.58-2.94.9-4.59l1.05-5.62c2.5-13.3 4.2-19.92 6.68-24.05 1.7-2.84 3.68-5.5 8.05-11.03 8.21-10.36 10.88-14.55 10.88-18.71l-.02-1.69c-.02-1.78-.02-2.7.02-3.77.21-5.05 1.47-8.2 4.64-9.4 3.92-1.5 10.39.44 20.12 6.43 9.56 5.88 17.53 10.7 25.91 15.66 1.31.78 14.27 8.41 17.67 10.45a714.21 714.21 0 0 1 6.42 3.9c13.82 8.5 38.94 5.05 46.3-7.83 3.6-6.28 4.54-8.52 7.78-17.32a82.3 82.3 0 0 1 1.18-3.07 42.27 42.27 0 0 1 4.06-7.64c9.33-13.98 14.92-26.1 14.92-36.72 0-3.66.75-6.62 3.36-14.85.52-1.64.83-2.66 1.15-3.73 3.64-12.23 3.04-19.12-4.29-24a23.1 23.1 0 0 0-9.98-3.78c-7.2-.93-14.49 1.17-23.91 5.88-1.55.78-6.64 3.44-7.6 3.93a62.6 62.6 0 0 0-4.14 2.3l-4.4 2.66c-11.62 6.92-20.4 9.18-32.81 6.08-3.32-.84-6.24-1.4-13.1-2.64-13.25-2.39-18.7-3.75-23.33-6.46-6.23-3.67-7.46-9.02-2.88-16.65A93.1 93.1 0 0 1 172 415.42a157 157 0 0 1 8.32-7.66c-.07.05 6.16-5.3 7.82-6.77a85.12 85.12 0 0 0 6.5-6.33c7.7-8.46 12.78-13.36 20.08-18.57 9.94-7.1 21.4-12.36 35.18-15.58 37.03-8.64 51-12.7 58.83-17.93 8.6-5.73 21.3-24.77 36.84-54.81 5.22-10.1 12.27-18.4 21.13-25.71 5.13-4.24 9.56-7.25 17.55-12.23 7.42-4.62 9.62-6.14 11.38-8.16a21.15 21.15 0 0 0 2.95-4.87c.61-1.3 2.87-6.47 3-6.77 1.36-3 2.56-5.4 3.95-7.73 6.53-10.97 16.03-18 31.4-20.8 12.73-2.3 19.85-2.7 29.68-2.3 3.25.13 4.13.16 5.6.14 5.15-.07 9.71-1.04 16.61-3.8 20.74-8.3 38.75-12.04 59.19-12.04 3.05 0 6.03.15 10.48.48l2.09.16c12.45.96 18.08.96 25.34-.63a49.65 49.65 0 0 0 14.09-5.45v1.15a50.52 50.52 0 0 1-13.88 5.28c-7.38 1.61-13.08 1.61-25.63.65l-2.08-.16c-4.43-.33-7.39-.48-10.41-.48-20.3 0-38.2 3.72-58.81 11.96-7.01 2.8-11.7 3.8-16.97 3.88-1.5.02-2.39-.01-5.66-.14-9.76-.4-16.8-.01-29.47 2.3-15.06 2.73-24.32 9.58-30.71 20.31a72.8 72.8 0 0 0-3.9 7.63c-.12.28-2.39 5.47-3.01 6.79a22 22 0 0 1-3.1 5.1c-1.86 2.13-4.07 3.66-11.6 8.35-7.95 4.96-12.35 7.95-17.44 12.15-8.76 7.23-15.73 15.43-20.89 25.4-15.61 30.2-28.36 49.32-37.16 55.19-7.98 5.32-21.97 9.39-59.17 18.07-13.65 3.18-24.98 8.39-34.82 15.42-7.22 5.16-12.27 10.01-19.92 18.43a86.07 86.07 0 0 1-6.57 6.4c-1.67 1.48-7.91 6.83-7.84 6.77-3.27 2.84-5.8 5.16-8.26 7.62a92.1 92.1 0 0 0-14.27 18.13c-4.3 7.16-3.22 11.89 2.53 15.26 4.47 2.63 9.88 3.99 23.24 6.39a185.7 185.7 0 0 1 12.92 2.6c12.11 3.03 20.64.84 32.06-5.96l4.4-2.65c1.66-1 2.96-1.73 4.2-2.35.95-.48 6.04-3.14 7.6-3.92 9.59-4.8 17.04-6.94 24.49-5.98a24.1 24.1 0 0 1 10.4 3.93c7.82 5.21 8.45 12.52 4.7 25.13-.32 1.07-.64 2.1-1.16 3.74-2.57 8.12-3.31 11.04-3.31 14.55 0 10.88-5.66 23.14-15.08 37.28a41.28 41.28 0 0 0-3.97 7.46c-.37.9-.73 1.82-1.18 3.04-3.25 8.85-4.21 11.13-7.84 17.47-7.67 13.42-33.43 16.95-47.7 8.18a578.4 578.4 0 0 0-6.4-3.89c-3.4-2.04-16.36-9.67-17.67-10.45-8.38-4.97-16.36-9.78-25.92-15.66-9.5-5.85-15.7-7.7-19.24-6.36-2.68 1.02-3.8 3.82-4 8.51a61.12 61.12 0 0 0-.02 3.72l.02 1.7c0 4.5-2.69 8.73-11.52 19.87-3.92 4.95-5.87 7.59-7.55 10.39-2.39 3.97-4.08 10.56-6.56 23.72l-1.05 5.62-.86 4.4zm10.5 0h-1c.03-.34.04-.68.04-1 0-12.39 8.48-33.57 19.16-43.37a26.18 26.18 0 0 0 3.67-4.17 35.8 35.8 0 0 0 2.88-4.9c.36-.72 1.75-3.66 2.1-4.36 3.22-6.29 6.84-6.54 16.97.39 1.34.9 6.07 4.16 6.4 4.38 2.62 1.8 4.67 3.2 6.7 4.56 5.03 3.39 9.37 6.2 13.51 8.7 14.33 8.67 25.49 13.27 34.11 13.27 16.86 0 32.71-5.95 39.6-14.8 1.59-2.04 3.2-5.17 5.06-9.63.8-1.92 1.64-4.06 2.67-6.8l2.74-7.33c4.66-12.44 7.76-19.06 11.56-23.27 7.9-8.79 14.87-36 14.87-52.67 0-1.9.17-3.11 1.02-8.27.37-2.2.58-3.6.74-5.07.63-5.51.21-9.46-1.68-12.39-4.6-7.1-19.7-9.23-38.46-4.78a100.57 100.57 0 0 0-18.94 6.3c-5.17 2.37-17.11 9.74-16.5 9.4-6.72 3.64-12.97 4.15-24.8 1.3-29.55-7.14-30.43-8.62-15.26-26.81 17.44-20.93 47.12-46.18 56.38-46.18 9.92 0 53.84-11.98 65.78-17.95 9.46-4.73 24.32-21.18 36.82-37.85.71-.95 13.5-21.6 19.2-29.6 9.35-13.13 18.22-22.55 26.95-27.53 7.29-4.17 13.16-10.28 18.8-18.73 1.93-2.9 10.52-17.65 12.73-20.41 1.54-1.93 3-3.21 4.52-3.89 14.07-6.25 24.22-9.04 39.2-9.04h29c4.05 0 7.36-.4 22.93-2.5l4.3-.57c9.92-1.3 16.57-1.93 21.77-1.93 1.66 0 2.95.01 6.03.04 18.61.19 28.55-.48 44.86-4.03 3.1-.67 6.13-1.78 9.11-3.31v1.12a37.96 37.96 0 0 1-8.9 3.17c-16.4 3.56-26.4 4.24-45.08 4.05-3.08-.03-4.36-.04-6.02-.04-5.15 0-11.76.63-21.64 1.92l-4.3.58c-15.64 2.11-18.94 2.5-23.06 2.5h-29c-14.81 0-24.84 2.75-38.8 8.96-1.34.6-2.69 1.78-4.14 3.6-2.16 2.68-10.72 17.39-12.68 20.33-5.72 8.57-11.7 14.8-19.13 19.04-8.57 4.9-17.36 14.23-26.63 27.24-5.68 7.97-18.47 28.64-19.22 29.63-12.6 16.8-27.52 33.32-37.18 38.15-12.06 6.03-56.14 18.05-66.22 18.05-8.82 0-38.39 25.15-55.62 45.82-14.6 17.52-14.19 18.21 14.74 25.2 11.6 2.8 17.6 2.3 24.09-1.2-.67.35 11.31-7.03 16.56-9.44 5.41-2.48 11.6-4.59 19.11-6.37 19.13-4.53 34.65-2.35 39.54 5.22 2.05 3.17 2.48 7.32 1.84 13.04a96.34 96.34 0 0 1-.75 5.13c-.84 5.08-1.01 6.29-1.01 8.1 0 16.9-7.03 44.33-15.13 53.33-3.68 4.09-6.76 10.65-11.37 22.96-.35.93-2.2 5.94-2.73 7.33-1.04 2.76-1.88 4.9-2.68 6.84-1.9 4.53-3.55 7.73-5.2 9.85-7.1 9.13-23.25 15.19-40.39 15.19-8.86 0-20.15-4.65-34.63-13.42-4.15-2.51-8.5-5.32-13.55-8.72a861.54 861.54 0 0 1-6.71-4.56l-6.4-4.39c-9.68-6.63-12.61-6.42-15.5-.75-.35.68-1.74 3.62-2.1 4.35a36.77 36.77 0 0 1-2.96 5.03c-1.12 1.57-2.37 3-3.81 4.33-10.47 9.6-18.84 30.51-18.84 42.63l-.03 1zm-29.65 0h-1.1c1.17-2.52 1.79-5.2 1.79-8 0-20 4.83-42.04 12.15-49.35 5.17-5.18 7.77-8.38 9.9-12.74 2.64-5.41 3.95-12 3.95-20.91 0-6.82 1.14-11.59 3.37-15.07 1.74-2.7 3.6-4.21 8.91-7.52a31.64 31.64 0 0 0 3.9-2.79c4.61-3.96 6.58-6.2 7.72-9.41 1.43-4.02.93-9.04-1.86-16.02a68.98 68.98 0 0 0-3.99-8.07l-.93-1.7a75.47 75.47 0 0 1-2.64-5c-5.16-10.71-3.77-18.9 7.68-29.78a204 204 0 0 1 26.81-21.55c3.96-2.69 16.8-10.8 19.24-12.5 1.99-1.4 4.33-3.3 7.77-6.3-.02 0 7.23-6.39 9.47-8.3 4.97-4.26 9.09-7.5 13.05-10.15 4.72-3.15 8.97-5.28 12.87-6.32 12.78-3.41 15.6-4.18 21.77-5.97 12.55-3.64 21.96-6.9 28.14-10a45.47 45.47 0 0 1 7.47-2.79c8.66-2.66 12.02-4.1 16.97-8.1 6.78-5.46 13.07-14.25 19.33-27.87 15.97-34.77 19.08-39.39 32.15-49.19 3.14-2.36 6.37-4.1 11.43-6.4l2.33-1.04c11.93-5.35 16.87-8.93 21.1-17.38 1.88-3.77 2.48-6.29 3.37-12.27.78-5.19 1.48-7.56 3.53-10.25 2.57-3.4 7.03-6.27 14.36-9.01 3.37-1.26 7.36-2.5 12.05-3.73 16.33-4.3 25.28-5.36 39.6-5.81 6.9-.22 9.5-.56 12.66-2 1.19-.54 2.36-1.23 3.58-2.11 3.7-2.7 8.14-4.54 13.24-5.67 5.71-1.27 10.69-1.54 18.7-1.45l2.35.02c2.82 0 6.8-1 19.7-4.69 10.83-3.08 15.95-4.31 19.3-4.31.82 0 1.9.13 3.55.41l5.01.9c9.82 1.68 17.44 1.89 25.15-.21 7.98-2.18 14.8-6.77 20.29-14.24V147c-5.47 7.04-12.21 11.42-20.03 13.55-7.88 2.15-15.63 1.94-25.58.23l-5-.9c-1.6-.26-2.64-.39-3.39-.39-3.2 0-8.32 1.22-19.74 4.48-12.35 3.53-16.3 4.52-19.26 4.52l-2.36-.02c-7.94-.1-12.85.17-18.47 1.42-4.97 1.11-9.3 2.9-12.88 5.5a21.4 21.4 0 0 1-3.75 2.22c-3.32 1.5-6 1.87-13.04 2.09-14.25.44-23.13 1.5-39.37 5.77a125.56 125.56 0 0 0-11.95 3.7c-7.17 2.7-11.49 5.46-13.93 8.68-1.9 2.52-2.58 4.76-3.33 9.8-.9 6.08-1.53 8.68-3.47 12.56a30.6 30.6 0 0 1-9.66 11.45c-3.12 2.26-5.95 3.73-11.93 6.4l-2.31 1.04c-5.01 2.27-8.18 3.99-11.25 6.29-12.9 9.68-15.93 14.17-31.85 48.8-6.31 13.76-12.7 22.68-19.6 28.25-5.08 4.1-8.53 5.57-17.3 8.27a44.64 44.64 0 0 0-7.33 2.73c-6.24 3.12-15.7 6.4-28.3 10.06a867.4 867.4 0 0 1-21.8 5.97c-3.77 1.01-7.93 3.1-12.56 6.19a137.35 137.35 0 0 0-12.95 10.07c-2.24 1.92-9.48 8.3-9.48 8.3a98.2 98.2 0 0 1-7.84 6.37c-2.46 1.72-15.32 9.83-19.26 12.5a203 203 0 0 0-26.69 21.45c-11.13 10.58-12.43 18.3-7.47 28.63a74.52 74.52 0 0 0 2.62 4.95l.94 1.7a69.84 69.84 0 0 1 4.03 8.17c2.88 7.2 3.4 12.46 1.89 16.73-1.22 3.43-3.28 5.77-8.02 9.84-1.14.97-2.32 1.8-5.3 3.67-3.92 2.45-5.69 3.89-7.31 6.42-2.13 3.3-3.22 7.89-3.22 14.53 0 9.05-1.34 15.79-4.05 21.34-2.19 4.49-4.85 7.77-10.1 13.01-7.07 7.07-11.85 28.9-11.85 48.65 0 2.8-.58 5.48-1.7 8zm282.54 0h-1.01l-1.1-5.8c-3.08-16.26-4.05-26.2-2.74-37.26.7-5.8.77-9.68.55-15.3-.18-4.45-.17-5.68.19-7.63.78-4.3 3.44-8.53 10.39-16.34 9.07-10.2 12.26-15.41 19.8-30.15 1.35-2.64 2.33-4.47 3.38-6.3.9-1.58 1.82-3.06 2.77-4.5 3.14-4.7 7.03-8.42 16.84-16.81 11.22-9.6 15.5-13.86 18.13-19.13.7-1.4 1.3-2.8 1.93-4.4a206 206 0 0 0 1.49-4.05c3.63-9.94 8.01-13.93 22.9-17.81 4.99-1.3 20.55-5.13 21.38-5.34 16.19-4.1 25.33-7.36 33.48-12.6 5.86-3.77 5.84-3.76 27.66-16.53l2.6-1.52c10.23-6 17.1-10.2 22.73-13.95a149.3 149.3 0 0 0 8.8-6.3 723.7 723.7 0 0 0 6.37-5.08A87.74 87.74 0 0 1 600 342.95v1.12a85.76 85.76 0 0 0-15.49 9.9c.18-.14-4.76 3.84-6.38 5.1a150.3 150.3 0 0 1-8.85 6.35c-5.65 3.76-12.53 7.96-22.78 13.97l-2.6 1.53c-21.8 12.75-21.78 12.74-27.63 16.5-8.27 5.32-17.49 8.61-33.78 12.73-.83.21-16.39 4.04-21.36 5.33-8.03 2.1-13.15 4.5-16.45 7.5-2.66 2.42-4 4.86-5.77 9.7l-1.5 4.07a51.12 51.12 0 0 1-1.96 4.47c-2.72 5.45-7.04 9.75-18.38 19.45-9.73 8.32-13.6 12.02-16.65 16.6a77.18 77.18 0 0 0-2.74 4.45c-1.05 1.81-2.01 3.63-3.35 6.25-7.58 14.81-10.82 20.08-19.96 30.36-6.83 7.7-9.4 11.78-10.15 15.86-.34 1.85-.34 3.04-.17 7.4.22 5.68.14 9.6-.55 15.47-1.3 10.92-.34 20.79 2.73 36.95l1.12 5.99zm-76.59 0h-2.1l1.39-4.3c1.04-3.3 1.93-6.78 2.68-10.4 2.65-12.73 3.27-23.63 3.27-41.3 0-5.71-1.86-9.75-4.13-9.75-2.94 0-6.96 5.61-10.93 17.08C271.14 579.68 258.3 593 238 593c-22.42 0-29.26-1.35-48.42-10.09a87.69 87.69 0 0 1-9.42-5.04c-2.95-1.8-12.78-8.57-14.84-9.72-4.2-2.36-7-2.71-9.72-.99-.63.4-1.26.91-1.9 1.55a57.69 57.69 0 0 1-4.31 3.86 147.88 147.88 0 0 1-3.06 2.44l-1 .8C137.01 582.43 134 587.18 134 597c0 1.02-.02 2.01-.07 3h-2c.05-.99.07-1.98.07-3 0-10.52 3.33-15.78 12.09-22.76a265.61 265.61 0 0 1 2-1.6c.83-.64 1.43-1.13 2.03-1.61a55.76 55.76 0 0 0 4.17-3.74c.74-.73 1.48-1.34 2.24-1.82 3.47-2.2 7-1.75 11.77.93 2.15 1.21 12.03 8 14.9 9.76a85.7 85.7 0 0 0 9.22 4.93C209.29 589.7 215.85 591 238 591c19.25 0 31.49-12.7 41.06-40.33 4.24-12.25 8.66-18.42 12.81-18.42 3.8 0 6.13 5.06 6.13 11.75 0 17.8-.63 28.8-3.3 41.7-.77 3.7-1.68 7.23-2.75 10.6-.4 1.3-.8 2.53-1.19 3.7zm-149.25 0l.5-.94a160.1 160.1 0 0 0 6.53-13.26c2.73-6.29 5.78-9.64 9.24-10.52 3.74-.95 7.15.74 12.56 5.13 5.43 4.4 6.07 4.86 7.73 5.1 1.6.22 4.28 1.14 8.86 2.95 1.3.5 10.78 4.35 13.85 5.55 3.07 1.2 5.85 2.25 8.49 3.18 3.1 1.1 5.98 2.04 8.65 2.81h-3.45c-1.76-.56-3.6-1.18-5.54-1.87a281.2 281.2 0 0 1-8.51-3.19c-3.08-1.2-12.57-5.04-13.86-5.55-4.5-1.78-7.15-2.68-8.63-2.9-1.94-.27-2.53-.7-8.22-5.3-5.17-4.2-8.36-5.78-11.69-4.94-3.1.78-5.94 3.92-8.56 9.95a161 161 0 0 1-6.82 13.8h-1.13zm112.89 0a30.34 30.34 0 0 0 11.27-6.27c1.55-1.36 3.32-3.46 5.34-6.29 1.05-1.46 2.15-3.1 3.41-5.04a349.73 349.73 0 0 0 2.5-3.9l.47-.75.93-1.47a89.17 89.17 0 0 1 3.25-4.86c1.05-1.43 1.82-2.23 2.44-2.46 1.02-.37 1.49.48 1.49 2.04l.01 2.11c.05 6.91-.08 11.32-.7 16.33a48.4 48.4 0 0 1-2.38 10.56h-1.07a46.47 46.47 0 0 0 2.45-10.68c.62-4.96.75-9.33.7-16.2l-.01-2.12c0-.97-.08-1.12-.15-1.1-.36.14-1.05.85-1.97 2.1a88.44 88.44 0 0 0-3.22 4.82l-.92 1.46-.48.75a1268.1 1268.1 0 0 1-2.5 3.92c-1.26 1.95-2.38 3.6-3.44 5.08-2.06 2.88-3.87 5.04-5.5 6.45a30.87 30.87 0 0 1-8.94 5.52h-2.98zm-183.72 0H69.3c3.37-3.43 5.19-8.33 5.19-15 0-18.6-.04-17.35 1.02-20.77.6-1.93 1.5-3.74 3.27-6.63.42-.7 4.92-7.8 6.78-10.86 3.04-4.97 11.04-16.5 12.21-18.56 3.48-6.08 4.72-12.06 4.72-24.18 0-7.85 2.5-14.2 8.1-23.44l2.84-4.63a72.67 72.67 0 0 0 2.49-4.4c1.62-3.15 2.48-5.78 2.62-8.28.2-3.78-1.3-7.29-4.9-10.9-5.13-5.12-8.6-5.43-11.2-1.85-2.12 2.92-3.48 7.74-5.06 16.47-.2 1.03-.82 4.6-.82 4.57-.83 4.67-1.4 7.33-2.1 9.6-1.35 4.42-3.7 7.61-8.36 12.26l-3.26 3.2c-6.38 6.39-9.68 11.51-11.36 19.5l-1.16 5.52c-.87 4.1-1.56 7.04-2.33 9.94-3.67 13.74-9.65 25.97-22.59 44.72-7.68 11.14-11.05 18.87-10.92 23.72h-1c-.12-5.16 3.35-13.05 11.1-24.28 12.87-18.67 18.8-30.8 22.44-44.42.77-2.88 1.45-5.8 2.32-9.89l1.16-5.51c1.73-8.22 5.13-13.5 11.64-20 .63-.64 2.84-2.8 3.25-3.21 4.57-4.54 6.82-7.62 8.12-11.84a81.58 81.58 0 0 0 2.07-9.48l.81-4.57c1.62-8.9 3-13.8 5.24-16.89 3-4.15 7.2-3.78 12.71 1.74 3.8 3.8 5.42 7.58 5.2 11.66-.15 2.66-1.05 5.41-2.73 8.68a73.6 73.6 0 0 1-2.52 4.46l-2.84 4.63c-5.52 9.1-7.96 15.3-7.96 22.92 0 12.28-1.28 18.43-4.85 24.68-1.2 2.1-9.21 13.65-12.22 18.58-1.87 3.06-6.37 10.18-6.78 10.86-1.73 2.82-2.6 4.57-3.17 6.4-1.02 3.28-.98 2.1-.98 20.48 0 6.52-1.7 11.44-4.82 15zM310.09 0h1.06c-.37.9-.77 1.83-1.2 2.82-3.9 9.06-5.45 15.15-5.45 25.18 0 7.64-2.1 11.6-6.64 13.05-3.46 1.1-5.72.98-17.57-.43-11.55-1.36-19.17-1.58-28.16-.14-6.24 2.49-25.91 7.02-32.13 7.02-11.15 0-36.76-2.88-54.12-7.01a22.08 22.08 0 0 0-16.95 2.48c-4.05 2.33-7.09 5.03-13.9 11.97-6.28 6.39-9.53 9.23-13.8 11.5-7.09 3.79-11.22 7.65-13.4 12.27-1.82 3.85-2.33 7.84-2.33 15.29 0 4.4-2.65 6.69-9.45 9.74.1-.05-2.97 1.31-3.84 1.71-8.78 4.06-12.71 8.29-12.71 16.55 0 12.52-4.86 19.22-17.34 27.96l-4.56 3.14c-1.9 1.3-3.3 2.3-4.67 3.3-.92.68-1.79 1.34-2.62 2-7.16 5.62-11 14.54-15.56 33.28-.63 2.57-3.3 14-4.07 17.14a350.44 350.44 0 0 1-5.2 19.33c-1.37 4.5-4.5 15.07-4.96 16.53-1.05 3.4-1.64 4.94-2.46 6.32-.82 1.4-6.85 9.08-12.64 18.27L0 277.98v-1.9l4.58-7.35a270.8 270.8 0 0 1 12.61-18.23c-.3.5 1.35-2.8 2.38-6.12.45-1.44 3.58-12.01 4.95-16.53 1.83-6.03 3.44-12.09 5.19-19.27.76-3.13 3.44-14.56 4.06-17.14 4.62-18.95 8.52-28.02 15.92-33.83.84-.67 1.72-1.33 2.65-2.01 1.38-1.02 2.8-2.01 4.7-3.32l4.54-3.14C73.83 140.57 78.5 134.13 78.5 122c0-8.74 4.2-13.26 13.29-17.45.88-.41 3.96-1.77 3.85-1.73 6.46-2.9 8.86-4.97 8.86-8.82 0-7.6.53-11.7 2.42-15.71 2.29-4.84 6.57-8.85 13.84-12.73 4.15-2.21 7.35-5 14.15-11.93 6.28-6.4 9.36-9.13 13.52-11.53a23.07 23.07 0 0 1 17.69-2.59c17.27 4.12 42.8 6.99 53.88 6.99 6.1 0 25.73-4.53 31.92-7 9.12-1.46 16.83-1.25 28.49.13 11.63 1.38 13.9 1.5 17.15.47 4.06-1.3 5.94-4.85 5.94-12.1 0-10.1 1.56-16.3 6.6-28zm25.12 0h1c.05 5.62.26 11.48.65 19.4.47 9.7.64 14.57.64 21.6 0 9.81-4.68 17.46-13.1 23.16-6.53 4.43-14.94 7.46-24.33 9.33-3.74.54-9.42.56-22.68.23-6.74-.17-9.35-.22-12.39-.22-2.77 0-4.97.43-7.63 1.36-.88.3-4.55 1.74-5.58 2.11-6.55 2.35-13.59 3.53-24.79 3.53-8.1 0-13.58-1.38-22.46-4.9l-3.18-1.25c-12.55-4.87-21.27-5.15-37.18 1.12-11.15 4.39-18.13 9.2-22.28 14.81-3.15 4.26-4.33 7.8-5.94 15.8-1.22 6.09-1.93 8.74-3.5 12.13-1.65 3.53-3.97 5.81-7.07 7.22-2.33 1.07-4.35 1.5-9.32 2.19-9.04 1.27-12.77 3.09-15.61 9.58-3.71 8.48-7.72 13.87-14.22 19.76-2.4 2.18-13.14 11.02-15.91 13.42-8.2 7.1-13.85 17.37-18.7 31.97a258.81 258.81 0 0 0-3.27 10.7c-.01.05-2.26 7.97-2.88 10.1-8.49 28.85-17.88 52.95-26.13 61.2-2.8 2.8-5.06 5.64-10.4 12.96-3.4 4.68-6.23 8.25-8.95 11.1v-1.55c2.74-2.98 5.73-6.82 9.48-11.97 4.03-5.52 6.32-8.4 9.17-11.24 8.07-8.08 17.44-32.14 25.87-60.8.62-2.1 2.86-10.03 2.88-10.08 1.21-4.24 2.21-7.53 3.28-10.74 4.9-14.75 10.63-25.16 19-32.4 2.78-2.42 13.5-11.25 15.89-13.4 6.4-5.8 10.32-11.09 13.97-19.43 1.68-3.83 4.05-6.31 7.2-7.86 2.4-1.17 4.64-1.67 9.53-2.36 4.54-.63 6.5-1.05 8.7-2.06 2.89-1.31 5.03-3.42 6.58-6.73 1.53-3.3 2.23-5.9 3.43-11.9 1.64-8.14 2.85-11.79 6.11-16.2 4.28-5.79 11.41-10.7 22.73-15.16 16.15-6.36 25.13-6.07 37.9-1.11l3.19 1.26c8.77 3.47 14.13 4.82 22.09 4.82 11.09 0 18.02-1.16 24.46-3.47 1-.36 4.68-1.8 5.58-2.11A22.5 22.5 0 0 1 265 72.5c3.05 0 5.67.05 14.07.26 11.53.29 17.2.27 20.83-.25 9.25-1.85 17.54-4.83 23.94-9.17C332 57.8 336.5 50.46 336.5 41c0-7-.17-11.86-.7-22.7-.35-7.26-.55-12.83-.59-18.3zM93.87 0h2.04c-.7 4-1.61 6.82-3.03 9.47-2.33 4.38-2.85 5.75-5.26 13.03a40.46 40.46 0 0 1-1.94 5.03c-2.24 4.66-5.92 8.8-13.07 14.26-8.01 6.13-14.27 16.55-20.03 31.55-2.4 6.23-8.75 25.63-9.64 28.01-2.69 7.16-6.56 12.7-15.63 23.68l-2.68 3.24c-6.02 7.34-9.35 12.07-11.72 17.15-2.3 4.94-7.12 9.9-12.91 14.15v-2.4c5.14-3.94 9.1-8.3 11.1-12.6 2.46-5.27 5.87-10.1 11.98-17.56l2.68-3.26c8.94-10.8 12.72-16.22 15.3-23.1.88-2.33 7.24-21.74 9.65-28.03 5.89-15.31 12.3-26 20.68-32.41 6.92-5.3 10.4-9.2 12.48-13.55.65-1.35 1.16-2.7 1.85-4.79 2.45-7.4 3-8.83 5.4-13.34A27.68 27.68 0 0 0 93.87 0zm9.07 0h1.02c-1.66 8.3-2.91 12.67-4.54 15.26a59.14 59.14 0 0 0-4.1 8.21c-1.27 3-2.44 6.2-3.5 9.4-.38 1.12-.7 2.16-2.41 5.39a251.48 251.48 0 0 0-12.81 13.3c-3.48 3.96-5.95 7.27-7.15 9.66-.95 1.9-2.06 5.99-3.61 12.97-.64 2.9-3.65 17.15-4.51 21.07-3.63 16.45-6.63 26.69-9.9 32-7.66 12.45-10.64 15.71-37.08 41.1A69.78 69.78 0 0 1 0 179.21v-1.15a69.39 69.39 0 0 0 13.65-10.42c26.4-25.33 29.32-28.55 36.92-40.9 3.2-5.18 6.18-15.37 9.78-31.7.86-3.91 3.87-18.16 4.51-21.06 1.57-7.09 2.7-11.2 3.7-13.2 1.24-2.5 3.76-5.86 7.29-9.89.9-1.03 1.86-2.1 2.86-3.18 2.4-2.6 4.96-5.22 7.53-7.76.9-.88 1.73-1.7 3.37-3.4a129.02 129.02 0 0 1 4.78-13.46 60.07 60.07 0 0 1 4.19-8.35c1.52-2.44 2.74-6.71 4.36-14.74zM83.71 0h1.1c-2.09 4.74-6.03 8.92-11.42 12.3-7.2 4.52-16.5 7.2-24.39 7.2-8.9 0-11.8 7-11.74 21.52 0 1.7.04 3.17.12 5.99.1 3.3.12 4.45.12 5.99 0 5.73-.76 11.3-2.01 16.5a66.67 66.67 0 0 1-2.15 6.97 2597.76 2597.76 0 0 1-7 15.86A4270.8 4270.8 0 0 1 6.44 136.2 54.64 54.64 0 0 1 0 147v-1.65a54.87 54.87 0 0 0 5.55-9.57A4269.82 4269.82 0 0 0 30.7 79.97c.53-1.2.99-2.23 2.44-5.9A69.23 69.23 0 0 0 36.5 53c0-1.52-.03-2.66-.12-5.95-.08-2.83-.12-4.31-.12-6.01-.03-6.79.53-11.62 2.07-15.34 1.94-4.68 5.39-7.19 10.67-7.19 7.7 0 16.81-2.63 23.86-7.05C77.93 8.27 81.66 4.38 83.7 0zm282.63 0h1.01c1.86 10.02 2.18 12.67 2.32 18.3a123.43 123.43 0 0 1 .37 27.83c-.96 8.78-3.1 16.01-6.63 21.15-11.34 16.5-39.8 29.22-66.41 29.22-5.09 0-10.47.28-16.31.83a413.8 413.8 0 0 0-24.37 3.16c-21.56 3.26-27.66 4.01-36.32 4.01-6.92 0-12.2-1.05-21.69-3.9l-2.78-.83c-1.39-.41-2.54-.74-3.65-1.02-8-2.05-14.22-2.04-21.7.72a16.32 16.32 0 0 0-9.17 8.18c-1.6 3.05-2.5 6.06-4.02 12.83-1.5 6.64-2.34 9.52-3.99 12.64a16.16 16.16 0 0 1-9.85 8.36 104.8 104.8 0 0 0-9.5 3.42c-6.55 2.8-10.1 5.57-13.8 10.47-1.33 1.75-1.03 1.3-5.43 7.9-1.98 2.97-4.66 5.8-8.48 9.14-2.01 1.76-10.71 8.83-12.88 10.7-7.37 6.35-12.58 12.14-16.63 19.14-4.22 7.3-7.8 18.3-11.28 33.26-.87 3.73-1.72 7.64-2.64 12.14l-1.18 5.8-1.09 5.45c-1.8 8.96-2.77 13.28-3.77 16.26-6.8 20.44-17.26 42.16-27.13 51.2-5.11 4.7-8.1 7.07-11.1 8.86-.9.54-1.84 1.04-2.92 1.57-.44.22-9.6 4.4-14.1 6.66l-1.22.62v-1.13l.78-.39c4.52-2.26 13.67-6.44 14.1-6.65a41.19 41.19 0 0 0 2.84-1.54c2.94-1.75 5.88-4.09 10.94-8.73 9.71-8.9 20.1-30.51 26.87-50.79.97-2.92 1.94-7.22 3.73-16.13l1.1-5.46a490.5 490.5 0 0 1 3.82-17.96c3.5-15.06 7.1-26.14 11.39-33.54 4.11-7.11 9.4-12.98 16.83-19.4 2.19-1.88 10.88-8.95 12.88-10.7 3.77-3.28 6.39-6.05 8.3-8.93 4.43-6.64 4.12-6.18 5.47-7.96 3.8-5.03 7.5-7.91 14.21-10.78 2.61-1.12 5.74-2.24 9.59-3.46a15.17 15.17 0 0 0 9.27-7.86c1.59-3.02 2.42-5.85 4.03-12.99 1.41-6.27 2.32-9.33 3.98-12.48a17.31 17.31 0 0 1 9.7-8.66c7.7-2.83 14.1-2.84 22.3-.75 1.12.29 2.28.61 3.68 1.03l3.73 1.11c8.47 2.54 13.66 3.58 20.46 3.58 8.59 0 14.67-.75 36.18-4a414.64 414.64 0 0 1 24.41-3.17c5.88-.54 11.29-.83 16.41-.83 26.3 0 54.45-12.58 65.59-28.78 3.42-4.98 5.5-12.06 6.46-20.7.84-7.74.73-16.02.02-23.9a136.2 136.2 0 0 0-.57-5.12c0-4.47-.3-6.94-2.16-17zM18.88 0h1.03C18 7.57 17.15 10.18 14.46 16.2c-1.95 4.37-2.67 9.19-2.42 14.89.2 4.33.71 7.7 2.28 16.13 1.09 5.88 1.57 8.77 1.94 12.2.96 8.9.24 16.08-2.8 22.79A463.4 463.4 0 0 1 0 109.43v-2.12a465 465 0 0 0 12.54-25.52c2.97-6.52 3.67-13.53 2.72-22.27-.36-3.4-.84-6.26-1.93-12.12-1.57-8.47-2.1-11.88-2.29-16.27-.26-5.84.48-10.81 2.5-15.33 2.64-5.9 3.48-8.47 5.34-15.8zm280.47 0a70.78 70.78 0 0 1-4.91 11.24c-2.56 4.7-4.01 8.45-4.86 11.98l-.4 1.8-.28 1.45a5.28 5.28 0 0 1-.74 2.07c-.74 1.03-1.93 1.28-5.13 1.25.92 0-9.85-.29-15.03-.29-10.2 0-18.45.82-29.46 2.56-16.87 2.66-17.73 2.77-23.66 2.52a42.57 42.57 0 0 1-8-1.09c-17.7-4.16-46.18-5.86-54.72-3.01-2.72.9-5.88 2.8-9.52 5.59a112.37 112.37 0 0 0-6.54 5.48c-1.4 1.25-9.17 8.5-10.78 9.84-1.45 1.2-8.18 7.42-8.85 8.02a114.65 114.65 0 0 1-4.55 3.9c-4.99 4.03-8.9 6.2-11.92 6.2-3.52.05-4.32 0-5.14-.4-1.13-.56-1.5-1.72-1.13-3.57.74-3.63 4.47-10.84 12.84-24.8 5.69-9.48 9.42-18 11.78-26.2 1.45-5.04 1.94-7.4 2.97-14.54h1.01c-1.05 7.3-1.54 9.7-3.01 14.82-2.39 8.28-6.16 16.89-11.9 26.44-8.3 13.84-12 21.01-12.7 24.48-.3 1.45-.08 2.14.59 2.47.6.3 1.35.35 3.48.3 3.92 0 7.69-2.1 12.5-5.98 1.4-1.13 2.87-2.39 4.51-3.86.66-.59 7.41-6.83 8.88-8.05 1.59-1.33 9.34-8.55 10.75-9.82 2.4-2.15 4.55-3.96 6.6-5.53 3.72-2.85 6.97-4.8 9.81-5.74 8.76-2.92 37.41-1.22 55.27 2.99 2.57.6 5.14.95 7.81 1.06 5.84.25 6.7.14 23.47-2.51 11.05-1.75 19.36-2.57 29.6-2.57 5.2 0 15.99.3 15.05.29 2.87.03 3.84-.17 4.3-.83.23-.32.4-.8.58-1.7l.28-1.43.4-1.85c.88-3.6 2.36-7.44 4.96-12.22 1.87-3.43 3.44-7 4.73-10.76h1.06zm-8.59 0c-5.91 17.94-9.55 22-19.76 22-4.5 0-10.22.32-28.69 1.5l-1.53.1c-15.6.99-23.47 1.4-28.78 1.4-5.35 0-13.24-.96-28.86-3.28l-1.54-.23C163.18 18.75 157.47 18 153 18c-4.45 0-7.3 1.01-10.96 3.34-.1.06-1.8 1.17-2.3 1.47-2.43 1.5-4.32 2.19-6.74 2.19-2.8 0-4.11-1.46-4.11-4.22 0-1.04.16-2.29.5-4.1.16-.82.9-4.4 1.07-5.32.8-4.11 1.3-7.68 1.47-11.36h2c-.17 3.82-.68 7.5-1.5 11.75-.19.94-.92 4.5-1.07 5.31a21.04 21.04 0 0 0-.47 3.72c0 1.7.46 2.22 2.11 2.22 1.99 0 3.55-.57 5.7-1.9.47-.28 2.15-1.37 2.26-1.44C144.92 17.14 148.12 16 153 16c4.62 0 10.3.74 28.9 3.51l1.53.23C198.93 22.04 206.8 23 212 23c5.25 0 13.11-.41 28.65-1.4l1.54-.1C260.73 20.32 266.43 20 271 20c8.95 0 12.15-3.4 17.66-20h2.1zM141.51 0h1.13c-2.06 3.86-2.63 5.1-2.77 6.19-.15 1.12.42 1.64 2.32 1.96 1.8.3 3.85.35 10.81.35 6.02 0 13 .56 21.35 1.62 3.95.5 8.03 1.1 13.13 1.89 24 3.7 22.5 3.49 26.83 3.49 24.02 0 51.83-2.24 60.45-6.94 2.88-1.57 5.05-4.49 6.6-8.56h1.07c-1.64 4.47-3.98 7.69-7.2 9.44-8.83 4.82-36.67 7.06-60.92 7.06-4.41 0-2.84.22-26.98-3.5-5.1-.8-9.17-1.38-13.1-1.88-8.31-1.06-15.26-1.62-21.23-1.62-7.04 0-9.1-.05-10.97-.37-2.38-.4-3.38-1.32-3.15-3.07.16-1.22.69-2.41 2.63-6.06zm76.4 0c5.69 1.64 10.37 2.5 14.09 2.5 9.59 0 16.7-.71 22.4-2.5h2.98C251.12 2.53 243.2 3.5 232 3.5c-4.5 0-10.32-1.21-17.53-3.5h3.45zM70.69 0c-2.87 3.27-6.95 5.39-12.02 6.53-3.98.89-7.5 1.08-12.92 1A97.24 97.24 0 0 0 44 7.5c-5.37 0-8.86-1.24-10.1-4.97A8.6 8.6 0 0 1 33.5 0h.99c.02.82.14 1.56.36 2.22C35.91 5.39 39.02 6.5 44 6.5l1.76.02c5.35.09 8.8-.1 12.69-.97C62.95 4.54 66.63 2.74 69.3 0h1.37zM0 207.87c7.31-.16 11.5 3.33 11.5 11.13 0 11.41-5.05 28.35-11.5 41.5v-2.3c5.93-12.72 10.5-28.47 10.5-39.2 0-7.18-3.7-10.3-10.5-10.13v-1zm0 7.05c1.23.14 2.18.58 2.87 1.31 1.4 1.48 1.6 3.72 1.16 7.58l-.16 1.3A28.93 28.93 0 0 0 3.5 229c0 3.2-1.48 9.52-3.5 15.9v-3.45c1.49-5.13 2.5-9.87 2.5-12.45 0-.98.08-1.75.37-4.02l.16-1.29c.42-3.56.24-5.59-.88-6.77-.5-.53-1.21-.87-2.15-1v-1zM0 410.9v-1.47a21.67 21.67 0 0 0 2.97-4.7c1.32-2.7 2.68-6.28 4.56-11.89 7.85-23.55 7.83-26.6.25-30.4-2.25-1.12-4.8-1.43-7.78-.91v-1.02a13.1 13.1 0 0 1 8.22 1.04c8.24 4.12 8.26 7.6.25 31.6-1.88 5.66-3.25 9.27-4.6 12.02A20.82 20.82 0 0 1 0 410.9zM33.64 452c1.68 0 3.04-.23 8.34-1.31l2.38-.47c8.26-1.57 12.72-1.3 14.53 2.33 1.38 2.75-.47 5.86-4.75 9.68a75.6 75.6 0 0 1-5.08 4.07c-.94.7-4.89 3.59-5.79 4.27-1.86 1.4-2.97 2.37-3.47 3.03a19.08 19.08 0 0 0-2.89 5.5c.07-.2-4.02 13.65-6.96 22.22-2.7 7.85-5.56 10.72-8.82 8.59-2.11-1.4-3.66-4.24-6.6-11.03-1.98-4.62-2.5-5.76-3.4-7.4-4.55-8.18-3.9-23.9-.05-32.87a9.6 9.6 0 0 1 6.98-5.96c2.59-.66 4.86-.75 11.78-.67l3.8.02zm0 2c-1.13 0-2.09 0-3.82-.02-12.07-.13-14.83.57-16.9 5.41-3.63 8.47-4.26 23.55-.05 31.12.96 1.73 1.48 2.88 3.5 7.58 2.72 6.3 4.24 9.08 5.86 10.14 1.64 1.08 3.5-.8 5.82-7.55a682.9 682.9 0 0 0 6.97-22.24 21.03 21.03 0 0 1 3.18-6.04c.65-.87 1.85-1.9 3.86-3.43.92-.7 4.87-3.57 5.8-4.27 2.02-1.5 3.6-2.77 4.95-3.97 3.63-3.23 5.09-5.7 4.3-7.28-1.21-2.42-5.07-2.65-12.38-1.27l-2.35.47c-5.49 1.11-6.86 1.35-8.74 1.35zm345.63 146c-3.45-12.26-3.77-14.13-3.77-19 0-3.33-.13-6.27-.43-11.34-.63-10.33-.65-13.5.26-17.07 1.21-4.74 4.21-7.1 9.67-7.1h26c4.08 0 5.19 1.85 5.93 7.11.1.79.13.97.19 1.32.84 5.35 2.8 7.58 8.88 7.58 3.64 0 5.54.4 6.43 1.37.76.83.76 1.44.36 3.93-.85 5.26.5 8.85 7.5 13.8 6.32 4.45 11.63 5.36 16.55 3.37 3.8-1.54 6.73-4.16 11.92-10l1.1-1.23 1.09-1.23a75.6 75.6 0 0 1 2.7-2.86 35.81 35.81 0 0 1 9.57-6.73c1.52-.76 1.72-.86 5.66-2.63 6.1-2.73 9.01-4.5 11.74-7.62 2.63-3 4.67-4.85 6.7-6.04 3.18-1.85 5.46-2.13 13.68-2.13 5.98 0 10.56-4.32 18-14.99l2.82-4.03c1.06-1.5 1.94-2.7 2.79-3.79 7.87-10.12 19.38-10.4 30.74.96 5.54 5.53 10.17 19.43 13.64 38.51 2.5 13.75 4.18 29.46 4.47 39.84h-1c-.3-10.32-1.96-25.97-4.45-39.66-3.43-18.87-8.02-32.65-13.36-37.99-10.95-10.95-21.76-10.68-29.26-1.04-.83 1.07-1.7 2.26-2.75 3.75l-2.81 4.02c-7.65 10.95-12.38 15.42-18.83 15.42-8.04 0-10.21.26-13.17 2-1.92 1.12-3.9 2.9-6.45 5.83-2.86 3.26-5.87 5.09-12.09 7.88a103.35 103.35 0 0 0-5.62 2.6 34.84 34.84 0 0 0-9.32 6.54 74.67 74.67 0 0 0-3.75 4.05l-1.1 1.24c-5.28 5.95-8.29 8.64-12.28 10.25-5.26 2.13-10.92 1.17-17.5-3.48-7.33-5.17-8.82-9.15-7.92-14.77.34-2.12.34-2.6-.1-3.1-.64-.69-2.34-1.04-5.7-1.04-6.63 0-8.96-2.63-9.87-8.42l-.2-1.34c-.67-4.82-1.53-6.24-4.93-6.24h-26c-5 0-7.6 2.04-8.7 6.34-.88 3.43-.85 6.57-.23 16.76a177 177 0 0 1 .43 11.4c0 4.78.32 6.63 3.81 19h-1.04zm13.68 0c-1.31-6.58-1.61-10.71-1.36-14.84.04-.7.1-1.44.18-2.38l.23-2.56c.34-3.81.5-6.97.5-11.22 0-4.94 1.46-7.76 4.21-8.42 2.38-.58 5.56.54 9.2 3 6.64 4.52 13.99 13.07 16.55 19.23 4.77 11.44 14.12 15.69 33.54 15.69 8.6 0 14.32-2.35 20.67-7.88 1.45-1.26 15.06-15 21-20 7.21-6.07 11.77-7.59 20.62-8.32 5.52-.45 7.98-.9 11.44-2.36 4.58-1.95 9.36-5.48 14.9-11.29 7.43-7.76 13.25-8.92 17.47-4.3 3.32 3.63 5.46 10.58 6.82 20.24.73 5.17.94 7.74 1.58 17.38.25 3.75.17 5.32-.92 18.03h-1c1.09-12.7 1.17-14.28.92-17.97-.64-9.6-.85-12.16-1.57-17.3-1.33-9.47-3.43-16.27-6.56-19.7-3.76-4.11-8.93-3.08-16 4.32-5.65 5.9-10.54 9.5-15.25 11.5-3.58 1.53-6.13 1.99-11.6 2.44-8.8.72-13.17 2.18-20.2 8.1-5.9 4.96-19.5 18.7-21 19.99-6.52 5.68-12.47 8.12-21.32 8.12-19.78 0-29.5-4.42-34.46-16.3-2.49-5.97-9.71-14.38-16.2-18.79-3.42-2.32-6.36-3.35-8.4-2.86-2.2.53-3.44 2.92-3.44 7.45 0 4.28-.16 7.47-.5 11.31l-.23 2.56c-.09.93-.14 1.65-.19 2.35-.24 4.08.06 8.18 1.39 14.78h-1.02zm113.75 0c2.52-3.26 8.93-11.79 10.9-14.3 5.48-6.98 13.05-12.38 19.4-13.94 7.01-1.71 11.5 1.45 11.5 9.24 0 4.02-.04 5.16-.74 19h-1c.7-13.85.74-15 .74-19 0-7.12-3.86-9.83-10.26-8.26-6.11 1.5-13.5 6.77-18.85 13.57-1.86 2.36-7.65 10.07-10.43 13.69h-1.26zm-9.86-338.96c3.44 2.71 7 5.1 11.44 7.75 1.06.64 8.42 4.9 10.35 6.1 11.27 7 15 13.35 12.35 25.33-1.45 6.52-4.53 11.1-9.39 14.44-3.83 2.63-8.07 4.26-16.08 6.56-11.97 3.45-13.68 3.99-18.82 6.28a60.18 60.18 0 0 0-7.81 4.18c-11.11 7.07-19.1 7.7-27.96 3.28-3.56-1.77-17.2-11-17.2-11.01a101.77 101.77 0 0 0-5.2-3.07c-16.04-8.83-34.27-24.16-34.52-31.85-.11-3.46 1.99-6.57 6.28-10.26 1.03-.9 2.18-1.81 3.68-2.95.72-.55 3.38-2.56 3.94-3 4.47-3.4 7.18-5.79 9.32-8.45 11.12-13.82 26.55-28.68 34.36-32.28 12.06-5.54 19.84-5.77 27.37.12 3.25 2.54 5.65 6.54 8.58 13.35.29.65 2.3 5.45 2.88 6.74 1.62 3.65 2.9 5.8 4.24 6.94.72.6 1.45 1.2 2.2 1.8zm-3.49-.28c-1.63-1.39-3.03-3.74-4.77-7.65-.58-1.3-2.6-6.12-2.88-6.76-2.81-6.5-5.08-10.3-7.98-12.56-6.83-5.35-13.85-5.15-25.3.12-7.45 3.42-22.7 18.12-33.64 31.72-2.27 2.82-5.08 5.3-9.67 8.79l-3.94 2.98a79.98 79.98 0 0 0-3.59 2.88c-3.87 3.33-5.67 6-5.58 8.69.21 6.64 18.14 21.72 33.48 30.15 1.76.97 3.5 2 5.3 3.13.12.08 13.61 9.22 17.03 10.92 8.22 4.1 15.46 3.52 26-3.18a62.17 62.17 0 0 1 8.07-4.31c5.25-2.35 7-2.9 19.08-6.38 7.8-2.24 11.9-3.82 15.5-6.3 4.44-3.04 7.23-7.18 8.56-13.22 2.44-11.02-.83-16.6-11.45-23.2-1.9-1.18-9.23-5.42-10.32-6.08-4.5-2.69-8.13-5.12-11.64-7.9-.77-.6-1.52-1.21-2.26-1.84zM87.72 241.6c4.3-2.98 7.88-5 12.14-6.95.84-.4 1.73-.78 2.78-1.24l4.37-1.88a164.3 164.3 0 0 0 17.74-8.96 320.67 320.67 0 0 1 27.87-14.5c4.22-1.95 21.89-9.84 21.17-9.52 19.17-8.62 28.1-6.93 49.5 8.05 7.91 5.54 13.24 13.25 16.45 22.66 3.02 8.83 3.76 16.51 3.76 27.75 0 8.32-.66 12.95-3.68 18.97-4.18 8.36-12.3 16.14-25.58 23.47-24.45 13.49-38.83 27.55-52.83 47.84-8.83 12.8-47.76 44.21-65.16 54.15C75.04 413.55 48.89 423.5 31 423.5c-10.05 0-14.67-4.78-14.76-13.37-.07-6.32 2.06-13.73 6.3-24.32 2.95-7.37 2.02-12.9-2.16-22.29-3.19-7.17-3.88-9.14-3.88-12.52 0-3.35 1.87-6.9 5.52-11.07 2.61-3 3.5-3.83 11.9-11.5 5.09-4.66 8.08-7.6 10.7-10.75 9.46-11.36 12.62-19.47 17.9-44.78 3.12-15.05 6.63-20.28 15.12-25.25.8-.47 3.95-2.25 4.7-2.68a76.66 76.66 0 0 0 5.38-3.38zm.56.82a77.63 77.63 0 0 1-5.44 3.43l-4.7 2.67c-8.23 4.82-11.57 9.81-14.65 24.6-5.3 25.45-8.51 33.7-18.1 45.21-2.66 3.19-5.68 6.16-10.8 10.84-8.36 7.64-9.24 8.48-11.82 11.42-3.5 4.01-5.27 7.36-5.27 10.42 0 3.18.68 5.1 3.8 12.12 4.27 9.6 5.24 15.37 2.16 23.07-4.18 10.47-6.29 17.78-6.22 23.93.08 8.06 4.26 12.38 13.76 12.38 17.67 0 43.68-9.9 64.75-21.93 17.28-9.88 56.1-41.2 64.84-53.85 14.08-20.42 28.57-34.59 53.17-48.16 13.12-7.23 21.09-14.87 25.17-23.03 2.92-5.86 3.57-10.35 3.57-18.53 0-11.13-.74-18.73-3.7-27.43-3.15-9.22-8.36-16.75-16.09-22.16-21.13-14.8-29.7-16.42-48.5-7.95.7-.32-16.96 7.56-21.17 9.5-1.7.8-3.3 1.55-4.86 2.3a319.68 319.68 0 0 0-22.93 12.17 165.3 165.3 0 0 1-17.85 9.01l-4.37 1.88c-1.04.45-1.92.84-2.76 1.23a74.56 74.56 0 0 0-11.99 6.86zm-7.6 12.2c7.7-6.25 12.3-8.17 23.68-11.27 6.12-1.67 9.12-2.95 12.31-5.72 3.8-3.3 7.47-4.52 15.86-6.1 2.75-.52 3.67-.7 5.06-1.02 5.48-1.24 9.48-2.93 13.1-5.89 10.42-8.53 25.4-14.11 36.31-14.11 5.33 0 16.77 7.58 25.74 17.16 10.73 11.46 15.96 23.27 12.73 32.5-3.18 9.1-11.39 18.57-23.03 27.86-8.44 6.73-18.36 13-25.22 16.43-3.72 1.86-6.59 4.88-9.77 9.99-.69 1.1-11.1 20.25-16.03 27.83-5.62 8.65-15.4 17.36-30.23 27.96a552.58 552.58 0 0 1-9.2 6.42c-.13.09-6.81 4.65-8.6 5.89-6.47 4.46-10.35 7.35-13.05 9.83-11.64 10.67-37.14 15.54-43.7 8.98-1.96-1.96-2.2-4.06-1.95-10.52.37-9.42-.5-14.5-4.95-20.51a34.09 34.09 0 0 0-7.04-6.92c-3.93-2.95-6.07-6.11-6.56-9.49-.97-6.61 3.87-13.06 14.17-21.69 1.58-1.32 6.67-5.44 7.09-5.78a48.03 48.03 0 0 0 5.23-4.77c4.1-4.63 5.85-9.55 7.8-20.07a501.52 501.52 0 0 0 .8-4.37c.33-1.87.6-3.3.88-4.73.74-3.78 1.5-7.18 2.4-10.63 1-3.78 1.38-5.5 2.36-10.37.6-3.02.93-4.21 1.56-5.47 1.22-2.45 1.27-2.5 12.25-11.42zm.64.78c-10.77 8.74-10.88 8.84-12 11.08-.58 1.16-.88 2.3-1.47 5.22-.98 4.89-1.36 6.63-2.37 10.44-.9 3.43-1.65 6.8-2.39 10.56a339.79 339.79 0 0 0-1.29 6.95l-.39 2.15c-1.98 10.68-3.77 15.74-8.04 20.54a48.77 48.77 0 0 1-5.34 4.88c-.42.34-5.5 4.47-7.07 5.78-10.04 8.4-14.72 14.65-13.83 20.78.45 3.1 2.44 6.03 6.17 8.83 3 2.25 5.39 4.62 7.24 7.12 4.63 6.24 5.52 11.52 5.15 21.15-.25 6.14-.01 8.1 1.66 9.78 6.1 6.1 31.02 1.33 42.31-9.02 2.75-2.52 6.66-5.43 13.16-9.92l8.6-5.89c3.63-2.48 6.45-4.44 9.19-6.4 14.73-10.54 24.44-19.18 29.97-27.7 4.9-7.54 15.31-26.68 16.02-27.8 3.27-5.26 6.26-8.41 10.18-10.37 6.79-3.4 16.65-9.63 25.03-16.32 11.52-9.18 19.61-18.53 22.72-27.4 3.07-8.78-2.02-20.27-12.52-31.49-8.8-9.4-20.04-16.84-25.01-16.84-10.67 0-25.43 5.5-35.68 13.89-3.76 3.07-7.9 4.81-13.5 6.09-1.41.32-2.35.5-5.11 1.02-8.21 1.55-11.76 2.73-15.38 5.88-3.34 2.9-6.45 4.22-12.7 5.92-11.26 3.07-15.75 4.94-23.31 11.09zM212 251.85c0 7.56-.6 10.92-2.6 14.3-1.1 1.84-7.66 10.05-8.6 11.3-5.96 7.94-9.33 10.28-17.26 13.76-1.34.58-2.2 1-3.03 1.5-.55.33-1.2.66-2 1.02-.71.33-4.46 1.9-5.52 2.39-6.05 2.78-8.99 5.8-8.99 10.73 0 10.97-18.95 36.12-34.51 44.87-8.18 4.6-21.3 9.36-32.78 11.86-13.33 2.9-22.49 2.48-24.62-2.32-1.32-2.97-4.4-4.26-11.98-5.81l-.6-.12c-4.84-.99-6.94-1.55-9.03-2.64-2.92-1.5-4.48-3.7-4.48-6.84 0-2.74 1.08-5.77 3.25-9.67.85-1.53 1.82-3.13 3.23-5.35-.16.25 2.83-4.4 3.67-5.76 6.69-10.7 9.85-18.5 9.85-27.22 0-18.41 11.22-33.37 27.5-42.86 5.22-3.05 9.23-3.31 15.2-2.12 5.04 1 6.05.9 7.43-1.52 4.5-7.85 7.04-9.5 15.87-9.5 3.93 0 6.97-.98 10.47-3.16 1.56-.97 8.67-6.17 10.99-7.68 9.2-5.98 11.34-7 25.2-11.95 6.95-2.48 15.18 1.28 22.33 9.12 6.55 7.19 11.01 16.61 11.01 23.67zm-2 0c0-6.5-4.25-15.48-10.49-22.32-6.67-7.32-14.16-10.74-20.17-8.59-13.73 4.9-15.73 5.85-24.8 11.75-2.24 1.46-9.37 6.68-11.01 7.7-3.8 2.36-7.2 3.46-11.53 3.46-8.08 0-9.98 1.23-14.13 8.5-1.1 1.91-2.51 2.88-4.35 3.09-1.3.14-1.9.05-5.22-.61-5.53-1.1-9.07-.88-13.8 1.88-15.72 9.17-26.5 23.55-26.5 41.14 0 9.2-3.28 17.29-10.15 28.28l-3.68 5.77c-1.39 2.19-2.35 3.77-3.17 5.25-2.02 3.63-3 6.38-3 8.7 0 4.19 2.87 5.67 11.9 7.52l.61.12c8.27 1.7 11.7 3.13 13.4 6.95 3.17 7.14 36 0 54.6-10.46 14.98-8.43 33.49-32.99 33.49-43.13 0-5.9 3.47-9.48 10.16-12.55 1.1-.5 4.85-2.08 5.52-2.38.74-.34 1.32-.64 1.8-.93.92-.55 1.85-1 3.25-1.62 7.65-3.35 10.75-5.5 16.47-13.12 1.02-1.36 7.47-9.42 8.47-11.11 1.79-3.01 2.33-6.06 2.33-13.3zm-37.18-22.4c.15-.1 2.4-1.51 2.95-1.84.96-.57 1.7-.94 2.43-1.17 2.57-.83 5.06-.1 11.04 3.12 14.86 8 19.43 22.87 9.18 38.71-4.04 6.24-9.37 9-18.72 11.11-.85.2-1.2.27-3.13.68-6.04 1.29-8.78 2.08-11.6 3.65-3.63 2.02-6.09 4.98-7.5 9.44-7.87 24.93-19.72 43.34-36.28 50.31-16.45 6.93-21.13 8.53-27.98 8.89-4.94.25-9.8-.65-15.4-2.89a44.45 44.45 0 0 1-5.64-2.6c-4.02-2.33-5.14-4.74-4.5-9.31.3-2.13 3.77-15.53 4.84-20.65.63-3.05 1.19-6.14 1.75-9.69a464.04 464.04 0 0 0 1.35-8.9c1.42-9.41 2.5-14.27 4.49-18.65 2.46-5.43 6.13-9.03 11.72-11.13 6.59-2.47 10.54-3.1 18.03-3.53 4.75-.27 6.68-.64 9-2.05.61-.37 1.22-.81 1.82-1.33a30.61 30.61 0 0 0 3.37-3.4c.59-.69 2.38-2.9 2.63-3.19 3.36-4 6.3-5.53 12.33-5.53 3.94 0 5.9-.92 8.18-3.36-.17.18 2.75-3.14 3.85-4.22a30.95 30.95 0 0 1 6.79-5c1.5-.83 3.15-1.62 4.99-2.38a64.92 64.92 0 0 0 10.01-5.1zm-14.52 8.34a29.95 29.95 0 0 0-6.57 4.84 116.68 116.68 0 0 0-3.82 4.2c-2.46 2.63-4.68 3.67-8.91 3.67-5.72 0-8.39 1.39-11.57 5.17-.23.28-2.03 2.5-2.63 3.2a31.6 31.6 0 0 1-3.47 3.51c-.65.55-1.3 1.03-1.96 1.43-2.5 1.51-4.55 1.9-9.47 2.19-7.39.42-11.25 1.04-17.72 3.47-5.34 2-8.82 5.4-11.17 10.6-1.93 4.27-3 9.07-4.41 18.39l-.65 4.34-.7 4.57c-.57 3.56-1.12 6.67-1.76 9.73-1.08 5.18-4.54 18.53-4.83 20.59-.59 4.17.35 6.18 4.01 8.3 1.35.77 3.1 1.58 5.52 2.55 5.46 2.18 10.18 3.05 14.97 2.8 6.69-.34 11.32-1.93 27.65-8.8 16.21-6.83 27.92-25.01 35.71-49.7 1.49-4.7 4.12-7.86 7.97-10 2.93-1.63 5.74-2.45 11.87-3.76 1.92-.4 2.28-.49 3.12-.68 9.12-2.06 14.24-4.7 18.1-10.67 9.92-15.34 5.55-29.55-8.82-37.29-5.75-3.1-8.03-3.76-10.25-3.05-.65.2-1.33.54-2.23 1.08-.55.32-2.77 1.72-2.93 1.82a65.91 65.91 0 0 1-10.16 5.17c-1.8.75-3.42 1.52-4.89 2.33zm-42.39 32.72c16.15-2.87 26.36-.97 32.47 6.16 5.08 5.93 1.13 21.42-5.93 35.55-4.79 9.58-10.6 16.21-23.16 25.19-14.15 10.1-35.5 12.2-40.71 3.85-1.86-2.97-2.1-8.14-1.06-15.73.78-5.68 1.86-10.71 4.73-22.98l.12-.51c1.59-6.8 2.37-10.31 3.14-14.14 1.45-7.25 3.74-11.47 7.26-13.74 2.81-1.8 5.53-2.28 12.33-2.62 5.33-.27 7.56-.46 10.81-1.03zm.18.98c-3.3.59-5.56.78-10.94 1.05-6.62.33-9.23.78-11.84 2.46-3.25 2.1-5.42 6.09-6.82 13.1-.77 3.84-1.56 7.35-3.15 14.17l-.12.5c-2.86 12.24-3.93 17.26-4.7 22.9-1.03 7.36-.79 12.36.9 15.07 4.82 7.7 25.54 5.67 39.29-4.15 12.43-8.88 18.13-15.39 22.84-24.81 6.86-13.72 10.75-29 6.07-34.45-5.84-6.81-15.7-8.65-31.53-5.84zM132 276.5c7.12 0 10.66 3.08 11.25 8.7.42 4.02-.43 8.14-2.77 15.94-2.56 8.52-18.36 25.38-27.2 31.28-7.01 4.67-20.02 5.67-26.57.99-3.99-2.85-3.53-12.08.02-26.46.68-2.75 1.47-5.65 2.37-8.76a412.6 412.6 0 0 1 3.05-10.14l.37-1.2c1.48-4.8 5.1-7.75 10.73-9.27 4.4-1.2 9.54-1.5 17.48-1.33l3.89.1c3.87.11 5.42.15 7.38.15zm0 1c-1.97 0-3.53-.04-7.41-.15l-3.88-.1c-7.85-.17-12.92.13-17.2 1.3-5.32 1.43-8.67 4.16-10.03 8.6a1277.83 1277.83 0 0 1-1.6 5.21c-.68 2.2-1.27 4.17-1.82 6.1-.9 3.1-1.68 5.99-2.36 8.73-3.43 13.88-3.87 22.93-.4 25.4 6.17 4.42 18.73 3.45 25.42-1 8.66-5.78 24.33-22.49 26.8-30.73 2.3-7.67 3.14-11.71 2.73-15.56-.53-5.1-3.64-7.8-10.25-7.8zm-17.79 7a31.3 31.3 0 0 1 8.57 1.4c5.42 1.78 8.72 5.03 8.72 10.1 0 9.59-9.51 17.2-22.34 21.47-9.82 3.28-13.62-1.79-11.66-16.54.84-6.28 3.82-10.67 8.24-13.46a20.38 20.38 0 0 1 8.47-2.97zm-.6 1.08a19.39 19.39 0 0 0-7.34 2.73c-4.18 2.64-6.98 6.78-7.77 12.76-1.89 14.11 1.36 18.45 10.34 15.46C121.3 312.37 130.5 305 130.5 296c0-4.56-2.98-7.5-8.03-9.15a28.05 28.05 0 0 0-8.2-1.35c-.13 0-.35.03-.66.08zm80.87-23.45c-2.72 9.8-14.93 9.86-26.72 3.3-10.17-5.64-13.8-17.98-5-22.87a66.53 66.53 0 0 0 4.48-2.7l2.03-1.3a50.15 50.15 0 0 1 3.92-2.3c4.73-2.43 8.82-2.8 14-.72 9.16 3.66 10.98 13.33 7.3 26.6zm-20.83-24.98a49.26 49.26 0 0 0-3.84 2.25l-2.03 1.3c-.84.53-1.5.95-2.16 1.35-.82.5-1.6.96-2.38 1.39-7.94 4.4-4.59 15.8 5 21.12 11.31 6.29 22.8 6.23 25.28-2.7 3.57-12.83 1.85-21.97-6.7-25.4-4.9-1.95-8.69-1.62-13.17.7zm17.85 12.15c0 5.7-2.44 9-6.64 9.96-3.3.76-7.56-.05-11.08-1.81l-1.89-.94c-.67-.34-1.18-.62-1.63-.88-4.07-2.38-4.13-4.97.34-10.93 6.8-9.06 20.9-7.16 20.9 4.6zm-1 0c0-5.3-2.87-8.55-7.32-9.16-4.23-.57-8.99 1.44-11.78 5.16-4.15 5.54-4.1 7.44-.64 9.47.44.25.93.51 1.59.85l1.87.93c3.34 1.67 7.36 2.44 10.42 1.74 3.73-.86 5.86-3.74 5.86-9zM387 530.3c0-12.8 2.44-16.74 18.48-29.77a56.8 56.8 0 0 1 7.61-5.2c2.6-1.5 5.33-2.82 8.5-4.18 1.24-.53 2.48-1.05 4.1-1.7l3.92-1.57c9.4-3.83 13.74-6.7 16.62-12.05 1.2-2.22 2.21-4.4 3.23-6.83a148.57 148.57 0 0 0 1.54-3.84l.3-.74.56-1.44c3.2-8.02 6.05-12.08 12.7-16.5a35.26 35.26 0 0 0 4.96-4 46.36 46.36 0 0 0 3.88-4.29c.27-.34 2.55-3.2 3.2-3.98 3.48-4.15 6.51-5.9 11.51-5.9 3.08 0 5.62-.63 9.57-2.1 5.42-2.02 6.53-2.34 8.96-2.2 2.53.13 4.85 1.26 7.18 3.59 1.3 1.3 5.55 5.83 6.52 6.78 5.06 5 9.44 6.92 17.77 6.92a197.5 197.5 0 0 1 12.08.45c15.93.87 21.94.57 25.28-2.21 6.91-5.77 11.64-2.73 11.64 7.76 0 10.73-8.6 20-19 20-4.8 0-8.32 1.43-9.34 3.67-1.12 2.48.68 6.15 5.98 10.57 13.6 11.33 11.24 20.76-7.64 20.76a21.91 21.91 0 0 0-14.6 5.24c-3.28 2.71-5.8 5.86-9.85 11.82l-1.52 2.25c-3.1 4.57-5.01 7.1-7.32 9.4-6.21 6.21-9.3 7.64-13.05 6.89l-1-.23a10.82 10.82 0 0 0-2.66-.37c-1.6 0-2.41.67-8.18 6.22-4.85 4.67-8.07 6.78-11.82 6.78-1.33 0-3.46 1.15-6.45 3.45-1.27.98-2.68 2.14-4.5 3.7l-4.92 4.29a181.11 181.11 0 0 1-4.54 3.82c-9.33 7.56-15.63 10.2-20.21 6.52-2.7-2.15-4.14-4.51-4.63-7.26-.37-2.04-.26-3.63.29-7.3.87-5.85.65-8.42-1.83-11.6-2.32-2.98-2.96-3.22-3.77-2.39-.25.26-1.35 1.63-1.61 1.94-2.21 2.5-4.85 3.57-9 2.82-4.6-.84-5.57-4.11-4.72-10.09l.24-1.56c.6-3.66.68-4.93.25-5.8-.44-.86-1.9-.94-5.23.4l-.74.29c-13.78 5.54-15.26 6.09-19.43 6.67-6.03.84-9.31-1.6-9.31-7.9zm2 0c0 5 2.14 6.6 7.04 5.92 3.91-.55 5.43-1.1 18.95-6.55l.75-.3c4.17-1.66 6.7-1.54 7.76.58.71 1.43.62 2.76-.06 7l-.24 1.53c-.72 5.04-.06 7.27 3.09 7.84 3.43.62 5.38-.17 7.15-2.18.2-.23 1.34-1.66 1.68-2 1.9-1.96 3.82-1.25 6.78 2.55 2.9 3.74 3.17 6.77 2.22 13.12-1 6.75-.52 9.4 3.62 12.71 3.49 2.8 9.1.45 17.7-6.51 1.35-1.1 2.75-2.28 4.49-3.78l4.93-4.3c1.84-1.58 3.27-2.76 4.58-3.77 3.34-2.56 5.74-3.86 7.67-3.86 3.04 0 5.95-1.9 10.43-6.22l2.46-2.39c.94-.89 1.67-1.56 2.37-2.13 1.81-1.49 3.3-2.26 4.74-2.26 1.03 0 1.81.13 3.1.42.7.16.71.17.96.21 2.96.6 5.45-.55 11.23-6.33 2.2-2.2 4.06-4.65 7.09-9.11l1.52-2.25c4.15-6.11 6.76-9.37 10.22-12.24a23.9 23.9 0 0 1 15.88-5.7c16.87 0 18.62-7.01 6.36-17.23-5.9-4.92-8.12-9.41-6.52-12.93 1.42-3.12 5.67-4.84 11.16-4.84 9.25 0 17-8.34 17-18 0-8.94-2.88-10.79-8.36-6.23-3.94 3.28-9.98 3.59-26.67 2.68l-1.02-.06c-5.09-.27-7.99-.39-10.95-.39-8.88 0-13.76-2.14-19.18-7.5-1-.98-5.26-5.53-6.53-6.79-1.99-1.99-3.86-2.9-5.87-3-2.03-.12-3.06.18-8.15 2.07-4.15 1.55-6.9 2.22-10.27 2.22-4.33 0-6.84 1.46-9.98 5.2-.63.74-2.89 3.6-3.18 3.95a48.29 48.29 0 0 1-4.04 4.46 37.26 37.26 0 0 1-5.24 4.23c-6.26 4.17-8.9 7.91-11.95 15.58l-.57 1.43-.28.74a531.5 531.5 0 0 1-1.56 3.88 77.49 77.49 0 0 1-3.32 7c-3.16 5.88-7.82 8.97-17.63 12.96l-3.92 1.58c-1.6.64-2.84 1.15-4.05 1.67a79.2 79.2 0 0 0-8.3 4.08 54.8 54.8 0 0 0-7.35 5.02C391.12 514.78 389 518.21 389 530.31zm133.22-79.76c3.06 1.53 6.54 2.02 10.68 1.7 2.53-.2 4.91-.62 8.8-1.49 5.36-1.19 6.33-1.38 8.33-1.54 2.78-.23 4.82.17 6.29 1.4 1.58 1.31 1.96 2.72 1.26 4.22-.66 1.38-1.05 1.74-5.05 5.07-3.53 2.93-5.03 4.83-5.03 7.09 0 7.3 1.29 10.02 7.83 15.62 3.86 3.3 5.93 6.84 5.28 9.62-.75 3.25-4.96 5.02-12.61 5.02-7.18 0-12.7 4.61-20.03 14.68-.5.7-3.96 5.57-4.94 6.87a38.89 38.89 0 0 1-4.72 5.5c-1.06.98-2.09 1.7-3.1 2.15-2.85 1.26-5.05 1.57-9.83 1.74-7.66.27-10.87 1.45-14.98 7.1-1.58 2.17-3.11 4-4.68 5.6a42.87 42.87 0 0 1-8.65 6.69c-.15.08-10.69 6.19-14.8 8.83-3.76 2.42-6.45 2.04-8.22-.77-1.28-2.03-1.9-4.54-2.87-10.35-.84-5.08-1.27-7.08-2.06-8.93-.97-2.3-2.21-3.24-4.02-2.88-6.2 1.24-8.95 1.39-10.98.2-2.37-1.4-3.13-4.62-2.62-10.73.16-1.96-1.04-2.87-3.76-3.04-2.24-.13-4.9.2-9.94 1.12l-.69.12c-7.97 1.45-10.72 1.72-12.72.73-2.91-1.43-1.6-5.27 4.23-12.21 5.48-6.53 10.6-10.81 15.76-13.53 3.74-1.97 5.94-2.65 12.16-4.1 7.29-1.72 10.4-3.51 14.04-9.31 2.96-4.75 10.74-18.62 12.14-20.84 3.59-5.67 6.8-9.1 11.05-11.34 2.6-1.38 4.72-2.82 9.17-6.07l1.38-1.01c7.85-5.72 12.3-7.98 17.68-7.98 4.22 0 6.49 1.36 9.13 4.77.34.43 1.67 2.22 2 2.67.85 1.09 1.6 1.98 2.45 2.83a24.29 24.29 0 0 0 6.64 4.78zm-.44.9c-2.8-1.4-5-3.03-6.92-4.97-.87-.9-1.65-1.81-2.51-2.93-.35-.46-1.68-2.25-2.01-2.67-2.47-3.18-4.46-4.38-8.34-4.38-5.09 0-9.4 2.2-17.09 7.78l-1.38 1.01c-4.49 3.29-6.63 4.74-9.3 6.15-4.06 2.15-7.16 5.45-10.66 11-1.39 2.19-9.16 16.05-12.15 20.82-3.79 6.07-7.13 7.98-14.66 9.75-6.13 1.45-8.27 2.1-11.92 4.02-5.04 2.66-10.05 6.86-15.46 13.3-5.43 6.46-6.53 9.69-4.55 10.66 1.7.84 4.48.57 12.1-.81l.7-.13c5.12-.93 7.82-1.27 10.17-1.12 3.21.2 4.92 1.48 4.7 4.11-.48 5.76.2 8.64 2.13 9.78 1.73 1.02 4.34.88 10.27-.31 2.35-.47 4 .78 5.14 3.47.83 1.95 1.27 4 2.07 8.8l.06.36c.94 5.65 1.55 8.11 2.72 9.98 1.46 2.3 3.52 2.6 6.84.46 4.14-2.66 14.69-8.77 14.81-8.85a41.9 41.9 0 0 0 8.46-6.54 47.89 47.89 0 0 0 4.6-5.48c4.32-5.95 7.81-7.23 15.74-7.5 4.66-.17 6.76-.47 9.46-1.67.9-.4 1.85-1.06 2.84-1.96a38.03 38.03 0 0 0 4.6-5.36c.96-1.3 4.4-6.16 4.93-6.87 7.5-10.31 13.22-15.09 20.83-15.09 7.24 0 11.02-1.6 11.64-4.24.54-2.32-1.36-5.55-4.97-8.64-6.75-5.79-8.17-8.79-8.17-16.38 0-2.67 1.64-4.74 5.39-7.86 3.8-3.17 4.23-3.56 4.78-4.73.5-1.06.25-1.99-.99-3.03-2.23-1.85-4.72-1.65-13.76.36-3.93.87-6.35 1.3-8.94 1.5-4.3.34-7.97-.18-11.2-1.8zm-28-3.9c5.65-2.82 8.96-2.2 12.9 1.37.56.5 2.6 2.47 3.02 2.87 4.2 3.89 8.07 5.71 14.3 5.71 11.37 0 14 1.41 16.1 8.09.26.83 1.35 4.6 1.66 5.62.8 2.63 1.64 5.03 2.7 7.6 2.13 5.17 2.64 8.32 1.72 10.24-.77 1.61-2.1 2.18-5.37 2.79-2.32.43-2.8.53-3.85.85-1.85.58-3.35 1.4-4.6 2.66-1 1-2.02 2.13-3.31 3.66-.6.71-2.91 3.5-3.46 4.14-7.2 8.54-12.43 12.35-19.59 12.35-3.76 0-6.95 1.28-10.59 4-1.84 1.37-11.62 10.31-15.22 13.06a73.09 73.09 0 0 1-8.95 5.88c-4.58 2.54-7.35 3.22-8.98 2.23-1.32-.8-1.65-2.07-1.94-5.5a52.53 52.53 0 0 0-.16-1.81c-.54-4.73-2.24-6.86-7.16-6.86-7.11 0-8.85-1.23-9.73-5.41-.96-4.61-2.1-6.7-6.55-9.67-3.97-2.65-4.31-5.42-1.52-8.22 2-2 4.63-3.5 11.35-6.87 6.61-3.3 9.2-4.8 11.1-6.68a39.09 39.09 0 0 0 5.3-6.48c.98-1.5 1.83-3.04 2.88-5.13l2.12-4.3c.91-1.83 1.72-3.37 2.61-4.98 5.74-10.32 10.37-14.78 23.22-21.2zm-22.34 21.7c-.89 1.59-1.69 3.12-2.6 4.94l-2.11 4.3a52.9 52.9 0 0 1-2.94 5.23 40.08 40.08 0 0 1-5.44 6.63c-2 2-4.62 3.51-11.35 6.87-6.6 3.3-9.2 4.8-11.1 6.69-2.33 2.34-2.08 4.37 1.38 6.67 4.7 3.14 5.96 5.46 6.97 10.3.78 3.7 2.09 4.62 8.75 4.62 5.5 0 7.57 2.57 8.15 7.75.06.5.09.82.17 1.84.25 3.06.55 4.17 1.46 4.72 1.2.74 3.69.13 7.98-2.25a72.09 72.09 0 0 0 8.82-5.8c3.55-2.7 13.34-11.65 15.24-13.07 3.79-2.83 7.18-4.19 11.18-4.19 6.77 0 11.8-3.67 18.83-12l3.45-4.13a60.07 60.07 0 0 1 3.37-3.72 11.72 11.72 0 0 1 5.01-2.91c1.1-.34 1.6-.45 3.97-.89 2.95-.55 4.07-1.02 4.65-2.23.76-1.59.28-4.5-1.74-9.43a84.46 84.46 0 0 1-2.74-7.69c-.31-1.03-1.4-4.8-1.66-5.61-1.95-6.2-4.16-7.39-15.14-7.39-6.5 0-10.61-1.93-14.98-5.98-.44-.4-2.46-2.37-3.01-2.86-3.65-3.3-6.52-3.85-11.79-1.21-12.67 6.33-17.15 10.65-22.78 20.8zm55.86 11.93c-2.98 6.45-16.78 15.26-26.74 15.26-5.33 0-7.56-2.98-7.11-7.86.32-3.48 2.1-7.91 3.93-10.61l1.52-2.32a44.95 44.95 0 0 1 1.88-2.7c3.66-4.8 7.85-7.45 13.62-7.45 9.06 0 15.75 9.52 12.9 15.68zm-.9-.42c2.52-5.47-3.65-14.26-12-14.26-5.4 0-9.33 2.48-12.82 7.06-.6.8-1.17 1.6-1.85 2.64 0 0-1.2 1.87-1.52 2.33-1.74 2.57-3.46 6.85-3.77 10.14-.4 4.33 1.43 6.77 6.12 6.77 9.57 0 23.02-8.58 25.83-14.68zm-69.67 20.74c2.08.18 4.44.81 5.88 1.8 2.12 1.47 2.2 3.6-.26 6.05-5.14 5.15-12.85 4.34-12.85-1.35 0-4.66 3.14-6.84 7.23-6.5zm-.09 1c-3.56-.3-6.14 1.5-6.14 5.5 0 4.58 6.53 5.26 11.15.65 2.03-2.04 1.98-3.43.4-4.52-1.27-.88-3.48-1.47-5.4-1.63zm29.59-225.95c4.64 2.35 17.27 8.24 19.39 9.43a24.14 24.14 0 0 1 7.05 5.64 45.03 45.03 0 0 1 3.75 5.2c2.4 3.78.04 7.66-6.2 11.63-4.97 3.16-12.18 6.3-21.95 9.82-4.84 1.74-19.63 6.68-21.1 7.2-6.59 2.33-14.85.1-25.14-5.86-3.93-2.27-8-5-12.94-8.54-2.23-1.61-9.5-6.99-10.7-7.85a81.21 81.21 0 0 0-8.63-5.7c-4.82-2.6-4.45-6.64.17-12.13 3.27-3.88 4.17-4.67 18.1-16.33a230.2 230.2 0 0 0 8.89-7.74 95.2 95.2 0 0 0 4.72-4.66c5.08-5.43 9.8-6.49 14.97-3.92 2.24 1.1 4.53 2.85 7.43 5.52 1.48 1.37 6.94 6.72 7.98 7.7 5.2 4.91 9.46 8.2 14.2 10.6zm-.46.9c-4.85-2.45-9.18-5.79-14.44-10.76-1.05-1-6.5-6.34-7.97-7.69-2.83-2.61-5.06-4.3-7.2-5.37-4.75-2.36-9-1.4-13.8 3.71a96.18 96.18 0 0 1-4.76 4.71c-2.48 2.3-5.16 4.62-8.92 7.77-13.86 11.6-14.77 12.4-17.98 16.21-4.28 5.08-4.58 8.4-.46 10.61 2.23 1.2 4.9 2.99 8.74 5.77 1.2.87 8.47 6.24 10.7 7.85a154.8 154.8 0 0 0 12.85 8.49c10.06 5.82 18.07 7.98 24.3 5.78 1.48-.52 16.27-5.47 21.1-7.2 9.7-3.5 16.86-6.61 21.75-9.72 5.84-3.71 7.9-7.1 5.9-10.26a44.09 44.09 0 0 0-3.67-5.08 23.16 23.16 0 0 0-6.78-5.42c-2.08-1.16-14.68-7.05-19.36-9.4zm-38.83 8.05c3.11-.37 5.7-.13 8.4.7 2.15.66 2.74.93 8.64 3.77 4.75 2.29 8.39 3.86 13.19 5.56 8.38 2.97 11.32 6.23 8.83 9.76-2.08 2.94-8.04 5.92-17.84 9.18-8.45 2.82-15.48 2.35-21.43-.9-4.65-2.55-8.33-6.5-12.15-12.3-2.9-4.41-2.73-8.2.16-11.06 2.48-2.45 6.87-4.07 12.2-4.7zm.12 1c-5.13.6-9.33 2.16-11.62 4.42-2.53 2.5-2.68 5.77-.02 9.8 3.73 5.68 7.3 9.51 11.8 11.97 5.7 3.11 12.43 3.57 20.62.84 9.59-3.2 15.44-6.12 17.34-8.82 1.94-2.75-.5-5.45-8.35-8.24-4.84-1.72-8.5-3.3-13.28-5.6-5.84-2.81-6.42-3.07-8.5-3.71a18.42 18.42 0 0 0-8-.66zM202.5 500.38c0 4.78-1.45 7.56-4.43 8.93-2.29 1.05-4.55 1.23-10.79 1.2l-1.78-.01c-9.19 0-17-7.65-17-15.5 0-7.59 10.6-10.51 19.74-5.44 2.78 1.55 4.21 1.94 8.57 2.75 4.44.83 5.69 2.27 5.69 8.07zm-1 0c0-5.3-.9-6.34-4.88-7.08-4.45-.83-5.96-1.25-8.86-2.86-8.57-4.76-18.26-2.1-18.26 4.56 0 7.3 7.36 14.5 16 14.5h1.79c6.06.04 8.26-.14 10.36-1.1 2.6-1.2 3.85-3.6 3.85-8.02zm33.33-117.85c3.71-1.31 8.7-2.7 16.1-4.55 2.58-.65 16.53-4.04 20.56-5.05 19.59-4.93 31.55-8.9 38.23-13.35 14.93-9.95 36.87-33.88 43.83-47.8 2.25-4.5 4.65-6.38 7.68-6.25 1.26.06 2.61.45 4.32 1.2a50.81 50.81 0 0 1 3.54 1.7l1.26.63c4.78 2.34 8.38 3.44 12.65 3.44 7.2 0 10.01 3.07 8.35 7.91-1.4 4.06-5.92 8.91-11.1 12.02-8.3 4.98-11.75 17.3-11.75 33.57 0 3.59-1.37 6.28-3.98 8.36-1.98 1.58-4.2 2.6-8.47 4.16l-1.02.37c-4.85 1.75-6.98 2.77-8.68 4.46-5.09 5.1-12.54 7.15-20.35 7.15-1.38 0-2.47.92-3.99 3.1-.29.41-1.32 1.95-1.47 2.18-2.68 3.92-4.93 5.72-8.54 5.72-7.84 0-10.74.93-21.76 6.94-5.18 2.82-8.8 3.58-14.66 3.68-.26 0-.47 0-.92.02-4.82.06-7.12.3-10.51 1.34a73.43 73.43 0 0 0-8.89 3.56c-2.17 1-10.53 5.01-10.23 4.87-7.79 3.7-13.32 5.98-18.9 7.57-12.41 3.55-18.58 2.24-27.42-4.07-2.58-1.85-2.72-4.43-.83-7.62 1.45-2.45 3.9-5.09 8.08-8.97l1.78-1.64c3.92-3.6 4.48-4.11 5.9-5.53 2.32-2.32 3.12-3.5 5.48-7.63 1.93-3.36 3.37-5.11 6.27-7.06 2.3-1.54 5.34-2.98 9.44-4.43zm.34.94c-4.03 1.42-7 2.83-9.22 4.32-2.75 1.85-4.1 3.49-5.96 6.73-2.4 4.2-3.24 5.44-5.64 7.83-1.43 1.44-2 1.96-5.94 5.57l-1.77 1.63c-4.1 3.82-6.52 6.41-7.9 8.75-1.65 2.79-1.54 4.8.55 6.3 8.6 6.14 14.46 7.38 26.57 3.92 5.5-1.57 11-3.84 18.74-7.51-.3.14 8.06-3.88 10.24-4.88a74.3 74.3 0 0 1 9.01-3.6c3.51-1.09 5.89-1.33 10.8-1.4h.91c5.72-.1 9.18-.83 14.2-3.57 11.16-6.08 14.2-7.06 22.24-7.06 3.19 0 5.2-1.6 7.71-5.28l1.48-2.2c1.7-2.43 3-3.52 4.81-3.52 7.57 0 14.78-2 19.65-6.85 1.83-1.84 4.04-2.9 9.04-4.7l1.02-.37c8.6-3.13 11.79-5.67 11.79-11.58 0-16.6 3.53-29.2 12.24-34.43 5-3 9.35-7.67 10.66-11.48 1.42-4.13-.83-6.59-7.4-6.59-4.45 0-8.19-1.14-13.09-3.54-7.52-3.67-6.78-3.34-8.72-3.43-2.58-.1-4.65 1.52-6.74 5.7-7.04 14.07-29.1 38.14-44.17 48.19-6.81 4.54-18.84 8.52-38.55 13.48-4.03 1.02-17.98 4.4-20.56 5.05-7.37 1.84-12.33 3.23-16 4.52zM252 387.5c2.08 0 4-.2 7.25-.69 5.22-.77 6.64-.9 8.46-.5 2.52.56 3.79 2.35 3.79 5.69 0 4.05-2.27 7.29-6.62 10.11-3.24 2.1-6.53 3.53-14.15 6.4l-.27.1-2.28.86c-3.04 1.16-5.27 2.52-9.33 5.43l-.8.57c-8.19 5.88-13.35 8.03-23.05 8.03-4.98 0-6.88-2.03-5.75-5.62.87-2.81 3.58-6.56 7.8-11.13 1.26-1.37 2.64-2.8 4.15-4.3 3.17-3.14 11.25-10.61 11.45-10.8.46-.47.93-.89 1.4-1.26 3.38-2.71 5.77-3.08 14.18-2.93 1.65.03 2.63.04 3.77.04zm0 1c-1.15 0-2.13-.01-3.79-.04-8.18-.14-10.4.2-13.54 2.71-.44.35-.88.74-1.32 1.18-.2.21-8.3 7.69-11.45 10.82a134.6 134.6 0 0 0-4.12 4.26c-4.12 4.47-6.76 8.12-7.58 10.75-.9 2.88.45 4.32 4.8 4.32 9.46 0 14.44-2.07 22.46-7.84l.8-.57c4.13-2.96 6.42-4.36 9.56-5.56l2.3-.86.25-.1c7.55-2.84 10.8-4.25 13.97-6.3 4.08-2.65 6.16-5.6 6.16-9.27 0-2.89-.97-4.26-3-4.7-1.65-.37-3.05-.25-8.1.5-3.3.5-5.26.7-7.4.7zm112.47-45.34c-1.88 5.44-1.98 6.76-.98 12.76 1.18 7.06-1.38 16.58-5.49 16.58a16.89 16.89 0 0 0-1.51.07l-.64.04c-2.86.18-4.83.17-6.94-.17-6.55-1.06-10.41-5.14-10.41-13.44 0-13.9 2.14-19.69 8.13-26.33a21.9 21.9 0 0 0 2.52-3.75c.59-1.03 2.78-5.13 2.72-5.01 4.44-8.14 7.71-11.53 12.25-10.4 1.17.3 2.2.77 3.58 1.59l1.39.84a20 20 0 0 0 3.1 1.6c.7.27 1.8.32 4.75.26l.72-.01c3.16-.05 4.78.08 5.83.66 1.61.89 1.2 2.56-1.14 4.9a215.9 215.9 0 0 1-3.86 3.76c-10.6 10.1-12.75 12.4-14.02 16.05zm-.94-.32c1.34-3.9 3.46-6.17 14.27-16.46 1.55-1.47 2.73-2.62 3.85-3.73 1.94-1.95 2.17-2.88 1.35-3.33-.82-.45-2.37-.58-5.32-.53l-.72.01c-3.14.06-4.26.02-5.14-.34-1.06-.41-1.97-.9-3.25-1.67l-1.38-.83a12.1 12.1 0 0 0-3.31-1.47c-3.88-.97-6.92 2.17-11.13 9.9.07-.13-2.14 3.98-2.73 5.02a22.71 22.71 0 0 1-2.65 3.92c-5.81 6.47-7.87 12-7.87 25.67 0 7.79 3.48 11.47 9.57 12.45 2.01.33 3.92.34 6.71.16a371.33 371.33 0 0 0 1.23-.07c.42-.03.73-.04.99-.04 3.2 0 5.6-8.9 4.5-15.42-1.02-6.16-.91-7.64 1.03-13.24zm-9.26 12.42c.58.52 2.5 1.9 2.55 1.93 1.96 1.57 2.04 3.31.01 6.36-3.74 5.64-8.83 3.09-8.83-4.55 0-3.81.51-5.67 2.07-6.02 1.18-.26 2 .3 4.2 2.28zm-1.34 1.48c-1.5-1.35-2.23-1.85-2.43-1.8-.17.03-.5 1.23-.5 4.06 0 5.87 2.67 7.21 5.17 3.45 1.5-2.26 1.47-2.84.4-3.7.03.03-1.95-1.4-2.64-2zm222.9-130.19c2.2-1.1 3.67-1.66 5.88-2.36l.28-.09a48.92 48.92 0 0 0 8.79-3.55c4.17-2.08 6.35-1.88 6.96.84.44 2 .2 4.01-1.25 12.7-2.27 13.62-9.16 26.14-21.17 36.3-4.3 3.63-7.41 4.39-9.75 2.44-1.88-1.57-3.1-4.57-4.61-10.48-.3-1.15-1.43-5.83-1.72-6.96a114.18 114.18 0 0 0-2.71-9.22c-2.4-6.82-3.03-10.78-2.1-12.94.77-1.83 2.08-2.24 5.6-2.45 1.49-.09 2.09-.14 2.97-.28l1.95-.33c.72-.12 1.22-.2 1.68-.29 1.1-.2 1.92-.38 2.71-.6 1.7-.49 3.42-1.2 6.49-2.73zm.44.9c-3.11 1.54-4.88 2.29-6.65 2.79-.84.23-1.69.42-2.81.63a108.77 108.77 0 0 1-3.81.63c-.77.13-1.39.19-2.92.28-3.13.18-4.17.51-4.74 1.85-.78 1.84-.2 5.62 2.13 12.2a115.12 115.12 0 0 1 2.74 9.31l1.72 6.96c1.46 5.7 2.62 8.58 4.28 9.96 1.87 1.56 4.49.93 8.47-2.44 11.82-10 18.6-22.3 20.83-35.7 1.4-8.45 1.65-10.51 1.25-12.31-.41-1.87-1.86-2-5.54-.16a49.87 49.87 0 0 1-8.93 3.6l-.28.1a35.4 35.4 0 0 0-5.74 2.3zm-4.5 6.58c1.37-.32 2.5-.75 3.9-1.42.35-.18 2.57-1.31 3.32-1.67 1.5-.71 2.97-1.31 4.7-1.89 2.7-.9 4.64-.77 5.88.4.98.94 1.34 2.26 1.41 4.18.02.4.02.7.02 1.37 0 5.63-4.63 16.88-11.34 22.75-4.34 3.8-7.31 4.67-9.92 2.52-2.06-1.7-3.5-4.65-6.67-12.91-1.86-4.83-2.05-8.1-.68-10.2 1.12-1.7 2.9-2.36 5.83-2.7l1.26-.12c1.19-.12 1.75-.19 2.3-.31zm-2.1 2.3l-1.22.12c-2.4.27-3.7.76-4.39 1.81-.93 1.43-.78 4.1.87 8.38 3.02 7.84 4.41 10.71 6.08 12.09 1.63 1.34 3.64.75 7.33-2.48C584.6 250.77 589 240.08 589 235c0-.64 0-.93-.02-1.29-.05-1.44-.3-2.33-.79-2.8-.6-.57-1.8-.65-3.87.04a37.95 37.95 0 0 0-4.47 1.8c-.72.34-2.93 1.47-3.32 1.66a19.54 19.54 0 0 1-4.3 1.56c-.66.16-1.28.24-2.56.36zm-227.73-88.98c-1.59 4.3-3.54 7.25-7.14 11.4l-2.6 2.97a67.02 67.02 0 0 0-2.63 3.23 46.4 46.4 0 0 0-4.68 7.5c-2.85 5.7-7.14 10.18-12.85 13.89-4.25 2.76-8.25 4.62-15.67 7.59-11.01 4.4-16.43 1.26-27.22-16.4-2.86-4.69-8.8-8.63-17.98-12.66-3-1.33-12.88-5.24-14.43-5.92-4.96-2.18-7.04-3.72-6.42-5.85.67-2.32 5.3-4.05 15.48-6.08 16.63-3.32 26.93-3.82 39.93-3.02 7.9.49 9.67.5 12.74-.26 1.99-.48 3.92-1.3 6-2.6l2.79-1.71c9.86-6.14 12.94-7.96 17.3-9.9 6.03-2.71 10.57-3.32 13.94-1.4 7.2 4.12 7.68 7.7 3.44 19.22zm-1.88-.7c3.95-10.7 3.6-13.26-2.56-16.78-2.66-1.52-6.62-.99-12.12 1.48-4.24 1.9-7.3 3.7-17.07 9.77l-2.79 1.73a22.6 22.6 0 0 1-6.57 2.84c-3.36.81-5.22.8-13.34.3-12.84-.78-22.97-.29-39.41 3-4.9.97-8.45 1.88-10.79 2.75-2.03.76-3.04 1.45-3.17 1.91-.16.57 1.48 1.79 5.3 3.46 1.5.67 11.39 4.58 14.44 5.93 9.52 4.19 15.74 8.3 18.87 13.44 10.35 16.93 14.87 19.56 24.78 15.6 7.3-2.93 11.21-4.75 15.33-7.42 5.42-3.53 9.47-7.75 12.15-13.1 1.44-2.9 3.02-5.4 4.86-7.82a68.95 68.95 0 0 1 2.72-3.33l2.6-2.97c3.46-3.99 5.28-6.75 6.77-10.79zm-6.64-.39c-7.94 12.8-18.53 21.75-33.3 25.23-7.82 1.83-12.47-.79-13.12-5.93-.55-4.45 2.29-9.06 6-9.06 3.02 0 5.6-1.68 15.38-9.16 1.47-1.12 2.57-1.96 3.66-2.74 4.4-3.2 7.77-5.17 10.82-6.08 5.57-1.67 9.33-2.15 11.35-1.22 2.5 1.14 2.22 4.13-.79 8.96zm-.84-.52c2.72-4.4 2.94-6.74 1.21-7.53-1.71-.79-5.32-.33-10.65 1.27-2.9.87-6.2 2.79-10.51 5.92-1.08.79-2.18 1.62-3.65 2.74-10.08 7.72-12.62 9.36-15.98 9.36-3.02 0-5.5 4.02-5 7.94.56 4.5 4.62 6.78 11.89 5.07 14.48-3.4 24.86-12.18 32.69-24.77zM461.17 33.53c13.88 4.96 20.75 4.96 31.62.01 3.02-1.37 5.47-2.94 11-6.82 5.57-3.92 8.05-5.51 11.14-6.92 4.14-1.88 7.78-2.38 11.22-1.28 3.92 1.26 6.2 12.3 6.78 28.45.5 14.2-.52 28.93-2.46 34.2-1.82 4.93-5.86 8.17-11.51 10.02A41.7 41.7 0 0 1 506 93.01c-5.79 0-9 2.4-12.2 7.64-.37.59-1.55 2.6-1.71 2.87-1.75 2.9-3.05 4.33-4.93 4.95-.94.32-2.07.83-3.87 1.74l-2.43 1.23c-1.03.53-1.87.94-2.7 1.34-6.43 3.1-11.73 4.72-17.16 4.72-5.71 0-10.04 2.09-14.02 5.92-1.16 1.11-4.2 4.53-4.63 4.94-2.54 2.44-5.93 4.24-10.85 6.1-1.4.52-5.98 2.13-6.25 2.22l-2.06.78c-.89.36-1.78.63-2.7.81-5.55 1.14-11.14-.54-17.98-4.42-1.27-.73-5.13-3.06-5.76-3.42-2.05-1.16-4.12-1.53-9.09-1.9l-1.73-.15c-4.78-.4-7.68-1.14-10.22-2.97-5-3.61-6.77-7.76-5.65-12.33 1.33-5.42 6.5-11.02 14.85-17.28a169.2 169.2 0 0 1 6.5-4.61c-.33.23 4.33-2.92 5.3-3.6 2.73-1.91 4.8-3.9 12.75-12.04l1.09-1.1c3.49-3.56 5.89-5.89 8.12-7.83 2.9-2.5 4.72-5.95 7.5-13.05l.63-1.61c2.7-6.92 4.28-10 6.87-12.33 1.42-1.28 6.68-6.54 7.93-7.5 3.98-3 8.01-2.73 19.57 1.4zm-.34.94c-11.26-4.02-15-4.28-18.62-1.53-1.19.9-6.4 6.11-7.88 7.43-2.42 2.18-3.96 5.19-6.6 11.95l-.63 1.61c-2.83 7.26-4.72 10.8-7.77 13.45a141.85 141.85 0 0 0-9.16 8.87c-8.02 8.2-10.08 10.2-12.88 12.16-.99.69-5.65 3.84-5.31 3.6-2.5 1.71-4.52 3.13-6.47 4.59-8.17 6.13-13.23 11.6-14.48 16.72-1.02 4.15.58 7.9 5.26 11.27 2.36 1.7 5.11 2.4 9.72 2.8l1.73.13c5.12.4 7.28.78 9.5 2.05.65.36 4.5 2.7 5.76 3.4 6.66 3.78 12.04 5.4 17.29 4.32.86-.17 1.7-.42 2.52-.75a67 67 0 0 1 2.1-.8c.28-.1 4.86-1.7 6.24-2.22 4.8-1.8 8.08-3.56 10.5-5.88.4-.38 3.44-3.8 4.63-4.94 4.16-4 8.72-6.2 14.72-6.2 5.25 0 10.42-1.59 16.73-4.62.82-.4 1.65-.8 2.68-1.33.12-.06 1.93-.99 2.43-1.23 1.84-.93 3-1.46 4-1.8 1.6-.52 2.76-1.82 4.39-4.52l1.7-2.88c3.39-5.5 6.87-8.11 13.07-8.11 4.45 0 8.73-.49 12.64-1.77 5.4-1.76 9.2-4.8 10.9-9.41 1.87-5.11 2.9-19.75 2.39-33.83-.56-15.53-2.81-26.48-6.08-27.52-3.18-1.02-6.57-.55-10.5 1.23-3.02 1.37-5.47 2.94-11 6.83-5.57 3.92-8.05 5.5-11.14 6.92-11.13 5.05-18.26 5.05-32.38.01zM475 55c5.38 0 7.55-.21 9.72-.96 1.26-.43 9.95-4.8 14.88-6.96 1.9-.82 3.56-2.44 6.6-6.04 2.56-3.04 3.19-3.75 4.4-4.84 3.7-3.35 7.07-3.28 10.22 1.23 6.23 8.9 5.61 15.94.07 27.02a71.26 71.26 0 0 0-2.5 5.48c-.32.8-1 2.7-1.09 2.9-.17.45-.34.81-.54 1.17-.63 1.14-1.56 2.21-4.05 4.7-2.4 2.4-5.16 3.27-11.68 4.33-1.81.3-2.2.36-3 .51-6.02 1.1-9.6 2.69-12.24 6.07-3.57 4.59-7.9 7.48-14.98 10.74-.55.24-1.1.5-1.8.8l-1.78.8a60.08 60.08 0 0 0-7.7 3.9c-2.57 1.6-4.79 2.35-9.42 3.46-8.58 2.06-12.28 3.76-17.37 9.36-5.12 5.64-10.17 7.64-16.63 6.7-5.36-.79-10.63-3.01-23.56-9.48-6.3-3.15-6.43-7.78-1.5-13.56 3.38-3.94 3.52-4.06 19.4-16.44 8.12-6.33 12.97-10.57 16.63-14.88 2.53-2.98 4.2-5.73 4.96-8.3 5.5-18.3 12.5-21.98 22.78-15.56 1.95 1.22 6.61 4.55 7.18 4.9 3.36 2.15 6.52 2.95 13 2.95zm0 2c-6.84 0-10.37-.89-14.08-3.26-.63-.4-5.27-3.71-7.16-4.9-9.05-5.65-14.66-2.7-19.8 14.45-.86 2.87-2.67 5.85-5.35 9.01-3.78 4.45-8.7 8.75-16.94 15.17-15.66 12.21-15.86 12.38-19.1 16.16-4.17 4.9-4.09 8 .88 10.48 12.71 6.35 17.89 8.54 22.94 9.28 5.78.84 10.18-.9 14.87-6.06 5.42-5.96 9.45-7.82 18.38-9.96 4.43-1.07 6.5-1.76 8.83-3.22a61.7 61.7 0 0 1 7.94-4.02l1.78-.8 1.78-.8c6.82-3.13 10.91-5.87 14.24-10.14 3-3.87 7-5.64 13.46-6.82.83-.15 1.21-.21 3.04-.51 6.1-1 8.6-1.78 10.58-3.77 2.36-2.36 3.21-3.34 3.72-4.26.15-.27.29-.56.44-.94.06-.15.75-2.06 1.09-2.9.64-1.6 1.45-3.4 2.57-5.64 5.24-10.49 5.8-16.8.07-24.98-2.4-3.44-4.37-3.48-7.24-.89-1.11 1-1.73 1.7-4.22 4.65-3.24 3.85-5.04 5.59-7.32 6.59-4.82 2.1-13.62 6.53-15.03 7.01-2.44.84-4.79 1.07-10.37 1.07zm-12.7 8.6c5.47 3.9 10.34 3.72 18.23.88 5.39-1.94 5.92-2.1 7.7-2.1 2.5-.01 4.21 1.36 5.24 4.46 1.66 4.98-2.32 8.52-12.3 12.68-2.7 1.13-16.25 6.18-20 7.73-7.86 3.24-13.93 6.42-18.87 10.15-13.02 9.84-18.36 11.93-23.71 9.68a24.67 24.67 0 0 1-3.62-1.98l-1.99-1.28a90.4 90.4 0 0 0-2.24-1.4c-3.33-2-2.82-4.28.85-7.34 1.35-1.13 10.66-7.61 13.53-9.91 7.1-5.69 11.91-11.47 14.41-18.34 3.07-8.45 4.89-12.1 6.8-13.39 1.73-1.16 3.36-.53 6.18 1.9.63.56 3.4 3.08 4.11 3.7 1.93 1.7 3.71 3.15 5.67 4.55zm-.6.8c-1.98-1.42-3.79-2.88-5.74-4.6-.73-.64-3.48-3.16-4.1-3.7-2.5-2.16-3.75-2.65-4.97-1.83-1.66 1.11-3.44 4.7-6.42 12.9-2.57 7.07-7.5 12.99-14.72 18.78-2.91 2.33-12.21 8.8-13.52 9.9-3.22 2.68-3.56 4.17-.97 5.72l2.26 1.4 1.99 1.28c1.47.93 2.48 1.5 3.47 1.91 4.9 2.07 9.96.07 22.72-9.56 5.02-3.79 11.15-7 19.1-10.28 3.76-1.55 17.3-6.6 20-7.72 9.5-3.97 13.14-7.2 11.73-11.44-.9-2.71-2.25-3.8-4.3-3.79-1.6 0-2.15.17-7.36 2.05-8.17 2.94-13.34 3.14-19.16-1.01z'%3E%3C/path%3E%3C/svg%3E"; + + return backgroundImage; + + } + +}; \ No newline at end of file diff --git a/webroot/js/helper.js b/webroot/js/helper.js index 460782668e..335752f420 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -33,6 +33,11 @@ foodcoopshop.Helper = { } }, + setBackgroundImage: function() { + var theme = $('body').hasClass('dark') ? 'dark' : 'light'; + $('body').css('background-image', 'url("' + foodcoopshop.BackgroundImage.getBackgroundImage(theme) + '"'); + }, + initThemeSwitcher: function() { $('#user-menu .theme').on('click', function() { var icon = $(this).find('i'); @@ -45,6 +50,7 @@ foodcoopshop.Helper = { icon.removeClass('fa-sun'); icon.addClass('fa-moon'); } + foodcoopshop.Helper.setBackgroundImage(); }).trigger('click'); }, From 5fd239b185d040ec8e7987b8553b08da63154896 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 11:42:59 +0100 Subject: [PATCH 350/646] border colors --- webroot/css/dark-mode.css | 32 +++++++++++++++++++++++++++++--- webroot/css/frontend.css | 1 + 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 6b7d695f4c..2abf987ec3 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -15,6 +15,7 @@ --main-bg-color: #1b1b1b; --2nd-bg-color: #0d1117; --main-font-color: #CDCDCD; + --main-border-color: #696969 ; } body.dark { background-color: var(--main-bg-color); @@ -30,6 +31,7 @@ body.dark #inner-content { body.dark #main-menu li ul, body.dark #user-menu li ul { background-color: var(--2nd-bg-color); + border-color: var(--main-border-color); } body.dark .vertical.menu a { background-color: var(--main-bg-color) ! important; @@ -37,9 +39,11 @@ body.dark .vertical.menu a { body.dark .btn-outline-light, body.dark select, body.dark #product-search input, -body.dark input { +body.dark input, +body.dark textarea { background-color: var(--2nd-bg-color); color: var(--main-font-color); + border-color: var(--main-border-color); } body.dark .btn-outline-light:hover, body.dark .btn-outline-light:active:focus { @@ -48,7 +52,8 @@ body.dark .btn-outline-light:active:focus { } body.dark #main-menu li > a, body.dark #user-menu li > a, -body.dark a.blog-post-wrapper span { +body.dark a.blog-post-wrapper span, +body.dark .cart span.product-name-wrapper span.unity { color: var(--main-font-color); } body.dark .vertical.menu a { @@ -60,4 +65,25 @@ body.dark a.blog-post-wrapper { body.dark .swiper-button-prev:after, body.dark .swiper-button-next:after { color: var(--main-bg-color); -} \ No newline at end of file +} + +body.dark .box, +body.dark #header, +body.dark .vertical.menu, +body.dark div.c2, +body.dark div.c3, +body.dark .vertical.menu li.header, +body.dark .vertical.menu a, +body.dark #content, +body.dark.carts .cart:not(#cart) .product, +body.dark #cart p.product-sum-wrapper, +body.dark #cart p.total-sum-wrapper, +body.dark #right .inner-right, +body.dark .pw, +body.dark .manufacturer-wrapper, +body.dark a.blog-post-wrapper h3 { + border-color: var(--main-border-color); +} +body.dark #load-last-order-details { + border-color: var(--main-border-color) ! important; +} diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index 5706953129..fb3948aa37 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -718,6 +718,7 @@ body.manufacturers.index h2.info { } #right .inner-right { position: fixed; + border-right: 1px solid #d6d4d4; } .box { left: 927px; From 37677659523dbf4ab98856cf69e3fcee45f8b1a4 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 12:19:06 +0100 Subject: [PATCH 351/646] font color for buttons, footer and menu --- webroot/css/dark-mode.css | 15 +++++++++++++-- webroot/css/frontend.css | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 2abf987ec3..228b65734b 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -45,6 +45,10 @@ body.dark textarea { color: var(--main-font-color); border-color: var(--main-border-color); } +body.dark #footer { + background-color: var(--2nd-bg-color); + border-color: var(--main-border-color); +} body.dark .btn-outline-light:hover, body.dark .btn-outline-light:active:focus { background-color: var(--2nd-bg-color) ! important; @@ -53,10 +57,17 @@ body.dark .btn-outline-light:active:focus { body.dark #main-menu li > a, body.dark #user-menu li > a, body.dark a.blog-post-wrapper span, -body.dark .cart span.product-name-wrapper span.unity { +body.dark .cart span.product-name-wrapper span.unity, +body.dark .vertical.menu li.header, +body.dark .box h3, +body.dark .box h3 i, +body.dark .btn-success, +body.dark #footer .bottom a i, +body.dark #footer .bottom a { color: var(--main-font-color); } -body.dark .vertical.menu a { +body.dark .vertical.menu a, +body.dark .cart-extra-info { color: var(--main-font-color) ! important; } body.dark a.blog-post-wrapper { diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index fb3948aa37..45a0f8dc34 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -639,6 +639,7 @@ body.manufacturers.index h2.info { width: 928px; min-height: 172px; float: left; + border-right: 1px solid #d6d4d4; } #footer .inner-footer { padding: 20px; From aded5bf66d45c2695b7a5d7d54dc43862e18034d Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 12:21:55 +0100 Subject: [PATCH 352/646] Revert "add user property dark_mode_enabled" This reverts commit 0c798776349f6ff2c88213b9908b0f0e0a19d1b9. --- config/Migrations/20221204185634_DarkMode.php | 26 ------------------ config/Migrations/schema-dump-default.lock | Bin 94912 -> 98105 bytes config/Seeds/tests/InitTestDataSeed.php | 14 +++++----- ...ducts-for-demo-vegetable-manufacturer.json | 1 - src/Controller/Component/AppAuthComponent.php | 5 ---- 5 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 config/Migrations/20221204185634_DarkMode.php diff --git a/config/Migrations/20221204185634_DarkMode.php b/config/Migrations/20221204185634_DarkMode.php deleted file mode 100644 index 459b4cb07e..0000000000 --- a/config/Migrations/20221204185634_DarkMode.php +++ /dev/null @@ -1,26 +0,0 @@ -table('fcs_customer'); - $table->addColumn('dark_mode_enabled', 'tinyinteger', [ - 'default' => '0', - 'limit' => null, - 'null' => true, - 'signed' => false, - ]); - $table->update(); - } -} diff --git a/config/Migrations/schema-dump-default.lock b/config/Migrations/schema-dump-default.lock index 393babc51fb316ca4e44c84b2c260b31d181d2df..16b495610732ff493e4407ccfbd76c96bf4234c5 100644 GIT binary patch delta 1073 zcmZXSTWAw$6vsI>_ZFMjq_swEGDfAPHc2mDM(|oMO{G>5Uy6-m@})-8nQ<~ByOwH& zvXoWXm4kc=KD3Iv2)m+=Fj_&U58{hr^~FLF^g-Vg^hNZcIx|Tm=-YSh|MNSa{?>kP z&Tiw__Sh|3YXC=eui72>uM%(iwqb8`Eq3>ZXl^ZRSMP>D0u613CX7UC)OX8r5&Jrp z$)>S?XUf&VGJK9?WD0%YM?J9!E4psr)x;X=mB5W+!iTOzxN)Khj5l;z&VvgX%qQ70n-UAZJ=P_RI$KeZg7#nS;(>&DU&3~5LGscAp z`sQt>Bb{)f+Bm-HF?c5jjT$<&9_r{pFVtdefsM|EA%dG$)R?;IHo*WW>~AqO?V!&c zumr^y!Ge0zWnvJetRQ9O-|g$6El6_ppyp&N>djsh)PpC5;AS-yZ{N(D_vX#a_q=Ybt{DwH z>mMx}d`|Na>*5m$QII4h=u|C)n}>r~&C|+Q-(*W8vf@o{tMYnVVS5J?U|n%u7Lr*p z&*gYg$jD^L4Ia$VCM<^BHbzs+%m`Dmm`K-~ z5ODn2DXcwh!{X+B+7z8S#fhF@cBP(Q+CWJxGt9dFm6tE|k_kJ|?S6J%!v?ka<|H{g zD~KGvSUBDOUuGtoOlSVsi!J&cBdjZ(;MVJNyd+(~^2%aSyC|WH(FYC&Q*~DC2#)r;e!va}#!vVbKl+KOTXf`cwZ(__ef=#G+tR=_pLOVBt5= C0P%(Z diff --git a/config/Seeds/tests/InitTestDataSeed.php b/config/Seeds/tests/InitTestDataSeed.php index 474ad2f243..002c4bb6bf 100644 --- a/config/Seeds/tests/InitTestDataSeed.php +++ b/config/Seeds/tests/InitTestDataSeed.php @@ -209,13 +209,13 @@ public function run() /*!40000 ALTER TABLE `fcs_customer` DISABLE KEYS */; INSERT INTO `fcs_customer` VALUES -(87,3,0,'Demo','Mitglied','fcs-demo-mitglied@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2014-12-02 12:19:31','2015-12-06 23:37:44',0,0,'SP',1,1,1,1,0,0), -(88,4,0,'Demo','Admin','fcs-demo-admin@mailinator.com','$2y$10\\\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2014-12-02 12:28:43','2016-09-29 16:25:09',0,0,'SP',1,1,1,1,0,0), -(89,4,0,'Demo','Gemüse-Hersteller','fcs-demo-gemuese-hersteller@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:37:26','2015-03-11 18:12:10',0,0,'SP',1,1,1,1,0,0), -(90,4,0,'Demo','Milch-Hersteller','fcs-demo-milch-hersteller@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:37:49','2015-03-11 18:11:54',0,0,'SP',1,1,1,1,0,0), -(91,4,0,'Demo','Fleisch-Hersteller','fcs-demo-fleisch-hersteller@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:38:12','2015-03-11 18:11:47',0,0,'SP',1,1,1,1,0,0), -(92,5,0,'Demo','Superadmin','fcs-demo-superadmin@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2016-09-29 16:26:12','2016-09-29 16:26:12',0,0,'SP',1,1,1,1,0,0), -(93,2,0,'Demo','SB-Kunde','fcs-demo-sb-kunde@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,0,'2016-09-29 16:26:12','2016-09-29 16:26:12',0,0,'SP',1,1,1,1,0,0); +(87,3,0,'Demo','Mitglied','fcs-demo-mitglied@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2014-12-02 12:19:31','2015-12-06 23:37:44',0,0,'SP',1,1,1,1,0), +(88,4,0,'Demo','Admin','fcs-demo-admin@mailinator.com','$2y$10\\\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2014-12-02 12:28:43','2016-09-29 16:25:09',0,0,'SP',1,1,1,1,0), +(89,4,0,'Demo','Gemüse-Hersteller','fcs-demo-gemuese-hersteller@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:37:26','2015-03-11 18:12:10',0,0,'SP',1,1,1,1,0), +(90,4,0,'Demo','Milch-Hersteller','fcs-demo-milch-hersteller@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:37:49','2015-03-11 18:11:54',0,0,'SP',1,1,1,1,0), +(91,4,0,'Demo','Fleisch-Hersteller','fcs-demo-fleisch-hersteller@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,1,'2014-12-02 12:38:12','2015-03-11 18:11:47',0,0,'SP',1,1,1,1,0), +(92,5,0,'Demo','Superadmin','fcs-demo-superadmin@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,1,'2018-08-03',NULL,1,'2016-09-29 16:26:12','2016-09-29 16:26:12',0,0,'SP',1,1,1,1,0), +(93,2,0,'Demo','SB-Kunde','fcs-demo-sb-kunde@mailinator.com','$2y$10\$uu/znwy2GwCx0NlLOIqaquY862AdcV6BgTGtNEUdKj4o1US.idVlm',NULL,NULL,NULL,0,'2018-08-03',NULL,0,'2016-09-29 16:26:12','2016-09-29 16:26:12',0,0,'SP',1,1,1,1,0); /*!40000 ALTER TABLE `fcs_customer` ENABLE KEYS */; /*!40000 ALTER TABLE `fcs_deposits` DISABLE KEYS */; diff --git a/plugins/Network/tests/comparisons/products-for-demo-vegetable-manufacturer.json b/plugins/Network/tests/comparisons/products-for-demo-vegetable-manufacturer.json index 7124c40a4f..cb918d9971 100644 --- a/plugins/Network/tests/comparisons/products-for-demo-vegetable-manufacturer.json +++ b/plugins/Network/tests/comparisons/products-for-demo-vegetable-manufacturer.json @@ -28,7 +28,6 @@ "pickup_day_reminder_enabled": 1, "credit_upload_reminder_enabled": 1, "newsletter_enabled": 0, - "dark_mode_enabled": 0, "address_customer": null, "name": "Demo Gem\u00fcse-Hersteller" }, diff --git a/src/Controller/Component/AppAuthComponent.php b/src/Controller/Component/AppAuthComponent.php index 805ee8cead..1c03f2adfe 100644 --- a/src/Controller/Component/AppAuthComponent.php +++ b/src/Controller/Component/AppAuthComponent.php @@ -72,11 +72,6 @@ public function getAbbreviatedUserName() return $result; } - public function isDarkModeEnabled() - { - return $this->user('dark_mode_enabled'); - } - public function getGroupId() { return $this->user('id_default_group'); From f21045d0b5e907ba505d5e7193339e633ddf8ad6 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 12:23:01 +0100 Subject: [PATCH 353/646] removed user property --- templates/element/userMenu.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/templates/element/userMenu.php b/templates/element/userMenu.php index c17bd939ed..a4248de33d 100644 --- a/templates/element/userMenu.php +++ b/templates/element/userMenu.php @@ -38,11 +38,7 @@ $this->element('addScript', [ 'script' => Configure::read('app.jsNamespace') . ".Helper.initThemeSwitcher();" ]); - if ($appAuth->isDarkModeEnabled()) { - $menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw fas fa-moon', 'class' => ['theme']]]; - } else { - $menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw fas fa-sun', 'class' => ['theme']]]; - } + $menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw fas fa-sun', 'class' => ['theme']]]; if (!$appAuth->isOrderForDifferentCustomerMode()) { $menu[] = ['slug' => $profileSlug, 'name' => $userName, 'options' => ['fa-icon' => 'ok fa-fw fa-user']]; } From 6841c6b7e87eb70f5a66e5a0bde2e1a8d1835ff8 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 12:28:02 +0100 Subject: [PATCH 354/646] add transistion --- webroot/css/global.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webroot/css/global.css b/webroot/css/global.css index 0b93c24bca..f036551e77 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -16,6 +16,9 @@ content: ''; } } +* { + transition: background .5s, border .5s; +} body { font-family: 'Open Sans'; color: #333333; From fae6ca06290a79849926849d8ad51acac9f8c65d Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 15:47:08 +0100 Subject: [PATCH 355/646] transition fix --- webroot/css/dark-mode.css | 15 ++++++++++++++- webroot/css/global.css | 3 --- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 228b65734b..e1c7a85041 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -15,7 +15,19 @@ --main-bg-color: #1b1b1b; --2nd-bg-color: #0d1117; --main-font-color: #CDCDCD; - --main-border-color: #696969 ; + --main-border-color: #696969; + --main-transition-duration: .5s; +} +body, +#header, +#content, +.sidebar, +.box +#inner-content, +input, +select, +a.blog-post-wrapper { + transition: background var(--main-transition-duration); } body.dark { background-color: var(--main-bg-color); @@ -26,6 +38,7 @@ body.dark #content, body.dark .sidebar, body.dark .box, body.dark #inner-content { + transition: background .5s; background-color: var(--main-bg-color); } body.dark #main-menu li ul, diff --git a/webroot/css/global.css b/webroot/css/global.css index f036551e77..0b93c24bca 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -16,9 +16,6 @@ content: ''; } } -* { - transition: background .5s, border .5s; -} body { font-family: 'Open Sans'; color: #333333; From c765d6983824b056b506dbad2d62b6ef2a7e9a0c Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 15:54:28 +0100 Subject: [PATCH 356/646] finetuning --- webroot/css/dark-mode.css | 8 ++++---- webroot/css/global.css | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index e1c7a85041..110e773a62 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -16,7 +16,6 @@ --2nd-bg-color: #0d1117; --main-font-color: #CDCDCD; --main-border-color: #696969; - --main-transition-duration: .5s; } body, #header, @@ -27,7 +26,7 @@ body, input, select, a.blog-post-wrapper { - transition: background var(--main-transition-duration); + transition: background .5s; } body.dark { background-color: var(--main-bg-color); @@ -38,7 +37,6 @@ body.dark #content, body.dark .sidebar, body.dark .box, body.dark #inner-content { - transition: background .5s; background-color: var(--main-bg-color); } body.dark #main-menu li ul, @@ -83,7 +81,8 @@ body.dark .vertical.menu a, body.dark .cart-extra-info { color: var(--main-font-color) ! important; } -body.dark a.blog-post-wrapper { +body.dark a.blog-post-wrapper, +body.dark .vertical.menu { background-color: var(--2nd-bg-color); } body.dark .swiper-button-prev:after, @@ -96,6 +95,7 @@ body.dark #header, body.dark .vertical.menu, body.dark div.c2, body.dark div.c3, +body.dark .vertical.menu, body.dark .vertical.menu li.header, body.dark .vertical.menu a, body.dark #content, diff --git a/webroot/css/global.css b/webroot/css/global.css index 0b93c24bca..c9e868c83d 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -292,7 +292,6 @@ h2.info a:not(.btn) { width: 145px; background: #efefef; margin-right: 5px; - border-top: 1px solid #dfdfdf; } .vertical.menu a, .vertical.menu > li img.logo { From eb59d63ce3caafb0848a6be09e9514026758dc46 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 16:24:58 +0100 Subject: [PATCH 357/646] finetuning borders / modal --- webroot/css/dark-mode.css | 7 +++++-- webroot/css/frontend.css | 25 ++++++++++++++++++++++--- webroot/css/modal.css | 2 ++ 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 110e773a62..5375a3bee2 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -36,7 +36,8 @@ body.dark #header, body.dark #content, body.dark .sidebar, body.dark .box, -body.dark #inner-content { +body.dark #inner-content, +body.dark .modal-content { background-color: var(--main-bg-color); } body.dark #main-menu li ul, @@ -74,7 +75,9 @@ body.dark .box h3, body.dark .box h3 i, body.dark .btn-success, body.dark #footer .bottom a i, -body.dark #footer .bottom a { +body.dark #footer .bottom a, +body.dark .modal-title, +body.dark .modal-header i { color: var(--main-font-color); } body.dark .vertical.menu a, diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index 45a0f8dc34..eaf13c3651 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -73,6 +73,9 @@ body { #header .logo-wrapper a { display: block; } +#header .logo { + border-radius: 5px; +} .sidebar { float: left; padding-right: 10px; @@ -398,6 +401,7 @@ a[disabled] { .pw .c1 a img { max-width: 150px; height: auto; + border-radius: 5px; } .pw .heading { width: 100%; @@ -427,6 +431,7 @@ body.superadmin .pw .heading h4 { } .manufacturer-wrapper div.c1 img { width: 148px; + border-radius: 5px; } .pw div.c1 span.fa-stack i.fa-star { color: #fff; @@ -453,6 +458,7 @@ body.products.detail .pw.delivery-break-enabled .descriptions { } .pw .toggle-content.description img { margin-bottom: 3px; + border-radius: 5px; } .pw div.c2, .manufacturer-wrapper div.c2 { @@ -581,6 +587,7 @@ body.products.detail .pw.delivery-break-enabled .descriptions { height: 28px; border: 1px solid #d6d4d4; width: 28px; + border-radius: 3px; } .pw .amount-wrapper .below-input { float: left; @@ -605,6 +612,9 @@ body.manufacturers.detail .manufacturer-infos { margin-bottom: 20px; float: left; } +body.manufacturers.detail .manufacturer-infos img { + border-radius: 5px; +} body.manufacturers.detail .manufacturer-infos h2 { border: none; font-size: 20px; @@ -625,6 +635,7 @@ body.manufacturers.detail img.manufacturer-logo { float: right; margin-left: 15px; margin-bottom: 15px; + border-radius: 5px; } body.manufacturers.detail .imprint { float: right; @@ -1122,11 +1133,15 @@ body.carts .cart:not(#cart) .btn-success.btn-order { padding: 6px; background: #fbfbfb; line-height: 1.5; + border-top-left-radius: 5px; + border-bottom-left-radius: 5px; } #product-search .btn { padding: 6px 10px; border-radius: 0; float: right; + border-top-right-radius: 5px; + border-bottom-right-radius: 5px; } #product-search a.btn { margin-left: 1px; @@ -1160,10 +1175,11 @@ a.blog-post-wrapper:nth-of-type(3n) { } a.blog-post-wrapper img { padding: 2px; - width: 100%; - object-fit: contain; - height: 145px; margin-bottom: 3px; + height: 145px; + border-radius: 5px; + max-width: 100%; + max-height: 100%; } a.blog-post-wrapper h3 { font-size: 16px; @@ -1195,6 +1211,9 @@ a.blog-post-wrapper span.date { } a.blog-post-wrapper span.img-wrapper { float: none; + display: flex; + align-items: center; + justify-content: center; } a.blog-post-wrapper:hover { box-shadow: 8px 10px 15px 0px rgba(0,0,0,0.5); diff --git a/webroot/css/modal.css b/webroot/css/modal.css index ce44bc731a..99f953ece8 100644 --- a/webroot/css/modal.css +++ b/webroot/css/modal.css @@ -21,6 +21,7 @@ .modal-header { color: #fff; min-height: 55px; + border-bottom: none; } .modal-header .btn-close { background-image: none; @@ -208,6 +209,7 @@ body.iframe_self_service_order { width: auto; max-width: 766px; max-height: calc(100vh - 154px); + border-radius: 5px; } #modal-product-add input[type="text"], #modal-product-name-edit input[type="text"], From e8982cbdd1cff8b752c3daa64bee3b7bb6f6e8a5 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 16:30:19 +0100 Subject: [PATCH 358/646] show icon if not logged in --- templates/element/userMenu.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/element/userMenu.php b/templates/element/userMenu.php index a4248de33d..4b2e07600d 100644 --- a/templates/element/userMenu.php +++ b/templates/element/userMenu.php @@ -34,11 +34,11 @@ $userName = $appAuth->getManufacturerName(); } +$this->element('addScript', [ + 'script' => Configure::read('app.jsNamespace') . ".Helper.initThemeSwitcher();" +]); +$menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw fas fa-sun', 'class' => ['theme']]]; if ($appAuth->user()) { - $this->element('addScript', [ - 'script' => Configure::read('app.jsNamespace') . ".Helper.initThemeSwitcher();" - ]); - $menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw fas fa-sun', 'class' => ['theme']]]; if (!$appAuth->isOrderForDifferentCustomerMode()) { $menu[] = ['slug' => $profileSlug, 'name' => $userName, 'options' => ['fa-icon' => 'ok fa-fw fa-user']]; } From 099b9d7d0262ab38f909330c6f1d5a7b365e8c54 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 16:33:59 +0100 Subject: [PATCH 359/646] fixes --- webroot/css/dark-mode.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 5375a3bee2..b497ed9e4c 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -108,7 +108,8 @@ body.dark #cart p.total-sum-wrapper, body.dark #right .inner-right, body.dark .pw, body.dark .manufacturer-wrapper, -body.dark a.blog-post-wrapper h3 { +body.dark a.blog-post-wrapper h3, +body.dark .modal-footer { border-color: var(--main-border-color); } body.dark #load-last-order-details { From eea9ddd9c64e5634dc2984e00fc730b9c8594fb0 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 20:19:54 +0100 Subject: [PATCH 360/646] border radius --- webroot/css/frontend.css | 30 ++++++++++++++---------------- webroot/css/global.css | 3 +++ webroot/css/modal.css | 1 - 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index eaf13c3651..0817537d34 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -73,9 +73,6 @@ body { #header .logo-wrapper a { display: block; } -#header .logo { - border-radius: 5px; -} .sidebar { float: left; padding-right: 10px; @@ -135,6 +132,10 @@ body.categories.detail div.description-wrapper { color: #fff; border-bottom: 1px solid #dfdfdf; font-weight: 600; + border-top-right-radius: 5px; +} +.vertical.menu li:last-of-type a { + border-bottom-right-radius: 3px; } .vertical.menu a { padding: 4px 10px; @@ -174,6 +175,7 @@ body.categories.detail div.description-wrapper { border: 1px solid #d6d4d4; z-index: 1000; display: none; + border-radius: 5px; } #main-menu li ul ul { display: none ! important; /* never show third level */ @@ -401,7 +403,6 @@ a[disabled] { .pw .c1 a img { max-width: 150px; height: auto; - border-radius: 5px; } .pw .heading { width: 100%; @@ -458,7 +459,6 @@ body.products.detail .pw.delivery-break-enabled .descriptions { } .pw .toggle-content.description img { margin-bottom: 3px; - border-radius: 5px; } .pw div.c2, .manufacturer-wrapper div.c2 { @@ -612,9 +612,6 @@ body.manufacturers.detail .manufacturer-infos { margin-bottom: 20px; float: left; } -body.manufacturers.detail .manufacturer-infos img { - border-radius: 5px; -} body.manufacturers.detail .manufacturer-infos h2 { border: none; font-size: 20px; @@ -635,7 +632,6 @@ body.manufacturers.detail img.manufacturer-logo { float: right; margin-left: 15px; margin-bottom: 15px; - border-radius: 5px; } body.manufacturers.detail .imprint { float: right; @@ -730,13 +726,13 @@ body.manufacturers.index h2.info { } #right .inner-right { position: fixed; - border-right: 1px solid #d6d4d4; } .box { left: 927px; - width: 305px; + width: 306px; background: #fff; border-bottom: 1px solid #d6d4d4; + border-right: 1px solid #d6d4d4; } .box h3 { color: #fff; @@ -753,6 +749,9 @@ body.manufacturers.index h2.info { padding: 5px; padding-bottom: 0px; } +.box:last-of-type { + border-bottom-right-radius: 3px; +} #cart { min-height: 140px; } @@ -1133,15 +1132,15 @@ body.carts .cart:not(#cart) .btn-success.btn-order { padding: 6px; background: #fbfbfb; line-height: 1.5; - border-top-left-radius: 5px; - border-bottom-left-radius: 5px; + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; } #product-search .btn { padding: 6px 10px; border-radius: 0; float: right; - border-top-right-radius: 5px; - border-bottom-right-radius: 5px; + border-top-right-radius: 3px; + border-bottom-right-radius: 3px; } #product-search a.btn { margin-left: 1px; @@ -1177,7 +1176,6 @@ a.blog-post-wrapper img { padding: 2px; margin-bottom: 3px; height: 145px; - border-radius: 5px; max-width: 100%; max-height: 100%; } diff --git a/webroot/css/global.css b/webroot/css/global.css index c9e868c83d..bedb8ad7b0 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -22,6 +22,9 @@ body { background-attachment: fixed; background-color: #e6e6e6; } +img { + border-radius: 5px; +} a { color: #333; } diff --git a/webroot/css/modal.css b/webroot/css/modal.css index 99f953ece8..26de2fcd29 100644 --- a/webroot/css/modal.css +++ b/webroot/css/modal.css @@ -209,7 +209,6 @@ body.iframe_self_service_order { width: auto; max-width: 766px; max-height: calc(100vh - 154px); - border-radius: 5px; } #modal-product-add input[type="text"], #modal-product-name-edit input[type="text"], From a359376f3b356b577bb7a589f6fba4a6eafcffd0 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 20:23:28 +0100 Subject: [PATCH 361/646] indention --- webroot/css/global.css | 66 +++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/webroot/css/global.css b/webroot/css/global.css index bedb8ad7b0..eafee23e87 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -33,7 +33,7 @@ a:not(.btn):visited, a:not(.btn):active, a:not([href]):not([tabindex]), a:not([href]):not([tabindex]):focus { - text-decoration: none ! important; + text-decoration: none ! important; } table.list a:not(.btn), @@ -58,7 +58,7 @@ body.admin h2 span a:hover, border-color: transparent; } a:not(.btn):not(.btn-arrow):not(.swiper-button-prev):not(.swiper-button-next):hover { - text-decoration: underline ! important; + text-decoration: underline ! important; } ul.menu:not(#user-menu):not(#footer-menu) a:hover { text-decoration: none ! important; @@ -89,8 +89,8 @@ button, } .btn-outline-light { color: #333; - background-color: #fff; - border-color: #ccc; + background-color: #fff; + border-color: #ccc; } .btn-outline-light.disabled { color: #333; @@ -119,13 +119,13 @@ button, .btn-danger:active, .btn-danger:active:focus, .btn-danger.disabled { - background-color: #f3515c; - border-color: #f3515c; - color: #fff; + background-color: #f3515c; + border-color: #f3515c; + color: #fff; } .btn-danger { - background-color: #f3515c; - border-color: #d9534f; + background-color: #f3515c; + border-color: #d9534f; } .btn-warning { background-color: #f0ad4e; @@ -143,7 +143,7 @@ button, .btn-success:hover, .btn-danger:hover, .btn-warning:hover { - opacity: 0.8; + opacity: 0.8; } .sc { clear: both; height: 0px; font-size: 0px; background-color: transparent; } .hide { @@ -353,35 +353,35 @@ a.toggle-link.collapsed i:before { font-family: 'Open Sans'; } #scroll-to-top { - position: fixed; - bottom: 10px; - left: 10px; - z-index: 99; - display: none; + position: fixed; + bottom: 10px; + left: 10px; + z-index: 99; + display: none; } #scroll-to-top a { - width: 45px; - height: 45px; - display: block; - -webkit-transition: 0.6s; - -moz-transition: 0.6s; - -o-transition: 0.6s; - transition: 0.6s; - background: #fff; - border-radius: 100px; - font-size: 34px; - text-align: center; - background: #fff; - line-height: 1.5; + width: 45px; + height: 45px; + display: block; + -webkit-transition: 0.6s; + -moz-transition: 0.6s; + -o-transition: 0.6s; + transition: 0.6s; + background: #fff; + border-radius: 100px; + font-size: 34px; + text-align: center; + background: #fff; + line-height: 1.5; } #scroll-to-top a i { - font-size: 41px; + font-size: 41px; } .truncate { - width: 250px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + width: 250px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } input[type="text"], From 0076ebb5df0db11d6b663dce560db515a5163f66 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 20:37:48 +0100 Subject: [PATCH 362/646] buttons --- webroot/css/dark-mode.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index b497ed9e4c..0f462078fa 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -37,7 +37,8 @@ body.dark #content, body.dark .sidebar, body.dark .box, body.dark #inner-content, -body.dark .modal-content { +body.dark .modal-content, +body.dark .btn-outline-light.disabled { background-color: var(--main-bg-color); } body.dark #main-menu li ul, @@ -115,3 +116,6 @@ body.dark .modal-footer { body.dark #load-last-order-details { border-color: var(--main-border-color) ! important; } +body.dark .btn-outline-light:active { + color: #fff; +} From f105e32f1f1d1c6659ad6dd3810894bf1dca1637 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 20:52:40 +0100 Subject: [PATCH 363/646] menu left and links --- webroot/css/dark-mode.css | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 0f462078fa..91f7277a85 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -78,7 +78,8 @@ body.dark .btn-success, body.dark #footer .bottom a i, body.dark #footer .bottom a, body.dark .modal-title, -body.dark .modal-header i { +body.dark .modal-header i, +body.dark #footer a:hover { color: var(--main-font-color); } body.dark .vertical.menu a, @@ -119,3 +120,12 @@ body.dark #load-last-order-details { body.dark .btn-outline-light:active { color: #fff; } +body.dark .menu.vertical span.additional-info { + background-color: transparent ! important; + color: var(--main-font-color) ! important; +} +body.dark ul.menu.vertical:not(#user-menu):not(#footer-menu) a:hover, +body.dark ul.menu.vertical:not(#user-menu):not(#footer-menu) a.active, +body.dark #footer a:hover { + text-decoration: underline ! important; +} From b0de369fa033c1629f7fd71e8fd7dc0798fa9b34 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 20:56:52 +0100 Subject: [PATCH 364/646] right boxes --- webroot/css/self-service.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webroot/css/self-service.css b/webroot/css/self-service.css index 166bf7b920..5f5349e21d 100644 --- a/webroot/css/self-service.css +++ b/webroot/css/self-service.css @@ -18,7 +18,7 @@ body.self_services { body.self_services #content, .self-service, .self-service .footer { - width: 917px; + width: 918px; } body.self_services #content { margin-top: -46px; @@ -33,7 +33,7 @@ body.self_services #content { .self-service .right-box { position: fixed; left: 611px; - width: 305px; + width: 306px; top: 0; overflow-y: auto; background-color: #fff; From fa1db778583877262a78387a72cecb498b21134b Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 21:01:29 +0100 Subject: [PATCH 365/646] self service login form fix --- webroot/css/self-service.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/webroot/css/self-service.css b/webroot/css/self-service.css index 5f5349e21d..ece9ce2cb3 100644 --- a/webroot/css/self-service.css +++ b/webroot/css/self-service.css @@ -95,9 +95,6 @@ body.self_services #content { left: 315px; width: 396px; } -.self-service #login-form { - padding-top: 70px; -} .self-service #login-form form { padding-top: 20px; position: relative; @@ -187,7 +184,8 @@ body.customers.login .self-service .footer { border: none; } body.customers.login .self-service { - margin-top: 0 ! important; + margin-top: -100px ! important; + min-height: 565px ! important; } body.customers.login .footer .left-wrapper, body.customers.login .footer .right-wrapper .btn-add-deposit { From 1c743b9c21f9634b8e1a8e4b45fdd9c918d541bd Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 21:08:51 +0100 Subject: [PATCH 366/646] anmelden --- webroot/css/dark-mode.css | 3 ++- webroot/css/frontend.css | 12 ++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 91f7277a85..154dd5e729 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -111,7 +111,8 @@ body.dark #right .inner-right, body.dark .pw, body.dark .manufacturer-wrapper, body.dark a.blog-post-wrapper h3, -body.dark .modal-footer { +body.dark .modal-footer, +body.dark .h1-registration { border-color: var(--main-border-color); } body.dark #load-last-order-details { diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index 0817537d34..7a460f4840 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -265,24 +265,16 @@ body.categories.detail div.description-wrapper { margin: 0 auto; } #login-form h1 { - border: 1px solid #fff; - border-bottom: none; line-height: 30px; margin-bottom: 0px; padding: 10px; padding-left: 108px; - -moz-border-radius: 0px; - -webkit-border-radius: 10px 10px 0px 0px; - border-radius: 10px 10px 0px 0px; } #inner-content #login-form form, body.customers.new_password_request #inner-content form { border-top: none; float: left; padding: 10px; - -moz-border-radius: 0px; - -webkit-border-radius: 0px 0px 10px 10px; - border-radius: 0px 0px 10px 10px; } body.customers.new_password_request #inner-content form { padding: 0; @@ -342,7 +334,7 @@ body.customers.new_password_request .input { body.customers.new_password_request .input input { width: 255px; padding: 3px; - border: 1px solid #ccc; + border-radius: 3px; } body.customers.new_password_request .input { margin-right: 10px; @@ -961,7 +953,7 @@ body.carts #CartsDetailForm { .h1-registration { border-radius: 0; margin-top: 20px; - padding-top: 20px; + padding-top: 25px ! important; border-top: 1px solid #d6d4d4; } #CartsDetailForm .input.checkbox .error-message, From 02c9504ff0e6449cabe81fe713dabb21349e681b Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 21:13:06 +0100 Subject: [PATCH 367/646] form error border radius --- webroot/css/global.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/webroot/css/global.css b/webroot/css/global.css index eafee23e87..c3f6da2854 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -374,6 +374,10 @@ a.toggle-link.collapsed i:before { background: #fff; line-height: 1.5; } +div.input.error input { + border-bottom-right-radius: 0 ! important; + border-bottom-left-radius: 0 ! important; +} #scroll-to-top a i { font-size: 41px; } @@ -400,6 +404,8 @@ form div.error-message { padding: 3px 5px; margin-bottom: 5px; width: 270px; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; } form div.error-message.long { width: 562px; From 5427b6c7bab1f0372a51ef92682b37f10215ecc2 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 21:35:42 +0100 Subject: [PATCH 368/646] swiper buttons --- webroot/css/dark-mode.css | 7 +++++++ webroot/css/frontend.css | 3 +-- webroot/css/global.css | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 154dd5e729..8af593b34d 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -90,6 +90,9 @@ body.dark a.blog-post-wrapper, body.dark .vertical.menu { background-color: var(--2nd-bg-color); } +body.dark a.blog-post-wrapper:hover { + opacity: .8; +} body.dark .swiper-button-prev:after, body.dark .swiper-button-next:after { color: var(--main-bg-color); @@ -130,3 +133,7 @@ body.dark ul.menu.vertical:not(#user-menu):not(#footer-menu) a.active, body.dark #footer a:hover { text-decoration: underline ! important; } +body.dark .blog-wrapper .swiper-button-prev, +body.dark .blog-wrapper .swiper-button-next { + background-color: var(--main-font-color); +} \ No newline at end of file diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index 7a460f4840..ba63a99e42 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -33,7 +33,7 @@ body { } #inner-content { float: left; - width: 736px; + width: 737px; background: #fff; margin-top: 20px; padding-right: 10px; @@ -1331,7 +1331,6 @@ body.blog_posts.detail p.neighbors a { .blog-wrapper .swiper-button-prev, .blog-wrapper .swiper-button-next { background-color: #fff; - border-radius: 22px; } body.feedbacks.index .edit-shortcut-button { position: absolute; diff --git a/webroot/css/global.css b/webroot/css/global.css index c3f6da2854..fd6161ab9e 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -60,6 +60,10 @@ body.admin h2 span a:hover, a:not(.btn):not(.btn-arrow):not(.swiper-button-prev):not(.swiper-button-next):hover { text-decoration: underline ! important; } +.swiper-button-next, +.swiper-button-prev { + border-radius: 50%; +} ul.menu:not(#user-menu):not(#footer-menu) a:hover { text-decoration: none ! important; } From 8ec09936c0b14bd046159392f98c7edb8626daeb Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 21:43:53 +0100 Subject: [PATCH 369/646] fixes --- webroot/css/dark-mode.css | 7 ++++++- webroot/css/global.css | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 8af593b34d..ede995a710 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -128,12 +128,17 @@ body.dark .menu.vertical span.additional-info { background-color: transparent ! important; color: var(--main-font-color) ! important; } +body.dark .menu.vertical a:hover i, +body.dark .menu.vertical a.active i { + background-color: transparent ! important; +} body.dark ul.menu.vertical:not(#user-menu):not(#footer-menu) a:hover, body.dark ul.menu.vertical:not(#user-menu):not(#footer-menu) a.active, body.dark #footer a:hover { text-decoration: underline ! important; } body.dark .blog-wrapper .swiper-button-prev, -body.dark .blog-wrapper .swiper-button-next { +body.dark .blog-wrapper .swiper-button-next, +body.dark #scroll-to-top a { background-color: var(--main-font-color); } \ No newline at end of file diff --git a/webroot/css/global.css b/webroot/css/global.css index fd6161ab9e..03fb14e285 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -372,19 +372,19 @@ a.toggle-link.collapsed i:before { -o-transition: 0.6s; transition: 0.6s; background: #fff; - border-radius: 100px; + border-radius: 50%; font-size: 34px; text-align: center; background: #fff; line-height: 1.5; } +#scroll-to-top a i { + font-size: 43px; +} div.input.error input { border-bottom-right-radius: 0 ! important; border-bottom-left-radius: 0 ! important; } -#scroll-to-top a i { - font-size: 41px; -} .truncate { width: 250px; white-space: nowrap; From 732f34891f96584b9509c73bc84e43f3f56d080e Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 5 Dec 2022 22:15:53 +0100 Subject: [PATCH 370/646] iframe borderradius --- webroot/css/global.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webroot/css/global.css b/webroot/css/global.css index 03fb14e285..d898006263 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -22,7 +22,7 @@ body { background-attachment: fixed; background-color: #e6e6e6; } -img { +img, iframe { border-radius: 5px; } a { From cf2c0247af57e643ffbfd3c70e2e84f73886c1ad Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 7 Dec 2022 09:41:04 +0100 Subject: [PATCH 371/646] vendor updates --- composer.lock | 100 +++++++++++++++++++------------------- webroot/package-lock.json | 14 +++--- webroot/package.json | 2 +- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/composer.lock b/composer.lock index 7878b0458b..0f1cbcaa8a 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "cakephp/cakephp", - "version": "4.4.7", + "version": "4.4.8", "source": { "type": "git", "url": "https://github.com/cakephp/cakephp.git", - "reference": "20668423818ede9878df06a9d0621c77a5514dba" + "reference": "ad188775dde89ad758dad9923ff558900914d59c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/cakephp/zipball/20668423818ede9878df06a9d0621c77a5514dba", - "reference": "20668423818ede9878df06a9d0621c77a5514dba", + "url": "https://api.github.com/repos/cakephp/cakephp/zipball/ad188775dde89ad758dad9923ff558900914d59c", + "reference": "ad188775dde89ad758dad9923ff558900914d59c", "shasum": "" }, "require": { @@ -108,7 +108,7 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/cakephp" }, - "time": "2022-10-30T02:20:57+00:00" + "time": "2022-12-02T02:29:42+00:00" }, { "name": "cakephp/chronos", @@ -1455,26 +1455,26 @@ }, { "name": "markbaker/complex", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/MarkBaker/PHPComplex.git", - "reference": "ab8bc271e404909db09ff2d5ffa1e538085c0f22" + "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/ab8bc271e404909db09ff2d5ffa1e538085c0f22", - "reference": "ab8bc271e404909db09ff2d5ffa1e538085c0f22", + "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/95c56caa1cf5c766ad6d65b6344b807c1e8405b9", + "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "phpcompatibility/php-compatibility": "^9.0", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.3", - "squizlabs/php_codesniffer": "^3.4" + "dealerdirect/phpcodesniffer-composer-installer": "dev-master", + "phpcompatibility/php-compatibility": "^9.3", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "squizlabs/php_codesniffer": "^3.7" }, "type": "library", "autoload": { @@ -1500,36 +1500,36 @@ ], "support": { "issues": "https://github.com/MarkBaker/PHPComplex/issues", - "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.1" + "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.2" }, - "time": "2021-06-29T15:32:53+00:00" + "time": "2022-12-06T16:21:08+00:00" }, { "name": "markbaker/matrix", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/MarkBaker/PHPMatrix.git", - "reference": "c66aefcafb4f6c269510e9ac46b82619a904c576" + "reference": "728434227fe21be27ff6d86621a1b13107a2562c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/c66aefcafb4f6c269510e9ac46b82619a904c576", - "reference": "c66aefcafb4f6c269510e9ac46b82619a904c576", + "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/728434227fe21be27ff6d86621a1b13107a2562c", + "reference": "728434227fe21be27ff6d86621a1b13107a2562c", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "phpcompatibility/php-compatibility": "^9.0", + "dealerdirect/phpcodesniffer-composer-installer": "dev-master", + "phpcompatibility/php-compatibility": "^9.3", "phpdocumentor/phpdocumentor": "2.*", "phploc/phploc": "^4.0", "phpmd/phpmd": "2.*", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.3", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", "sebastian/phpcpd": "^4.0", - "squizlabs/php_codesniffer": "^3.4" + "squizlabs/php_codesniffer": "^3.7" }, "type": "library", "autoload": { @@ -1556,9 +1556,9 @@ ], "support": { "issues": "https://github.com/MarkBaker/PHPMatrix/issues", - "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.0" + "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.1" }, - "time": "2021-07-01T19:01:15+00:00" + "time": "2022-12-02T22:17:43+00:00" }, { "name": "markstory/asset_compress", @@ -2797,16 +2797,16 @@ }, { "name": "symfony/console", - "version": "v6.2.0", + "version": "v6.2.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "75d4749d9620a8fa21a2d2847800a84b5c4e7682" + "reference": "58f6cef5dc5f641b7bbdbf8b32b44cc926c35f3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/75d4749d9620a8fa21a2d2847800a84b5c4e7682", - "reference": "75d4749d9620a8fa21a2d2847800a84b5c4e7682", + "url": "https://api.github.com/repos/symfony/console/zipball/58f6cef5dc5f641b7bbdbf8b32b44cc926c35f3f", + "reference": "58f6cef5dc5f641b7bbdbf8b32b44cc926c35f3f", "shasum": "" }, "require": { @@ -2873,7 +2873,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.2.0" + "source": "https://github.com/symfony/console/tree/v6.2.1" }, "funding": [ { @@ -2889,20 +2889,20 @@ "type": "tidelift" } ], - "time": "2022-11-29T16:44:51+00:00" + "time": "2022-12-01T13:44:20+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.1.1", + "version": "v3.2.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918" + "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918", - "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3", + "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3", "shasum": "" }, "require": { @@ -2911,7 +2911,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.1-dev" + "dev-main": "3.3-dev" }, "thanks": { "name": "symfony/contracts", @@ -2940,7 +2940,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.1.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0" }, "funding": [ { @@ -2956,7 +2956,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T11:15:52+00:00" + "time": "2022-11-25T10:21:52+00:00" }, { "name": "symfony/filesystem", @@ -3524,16 +3524,16 @@ }, { "name": "tecnickcom/tcpdf", - "version": "6.5.0", + "version": "6.6.0", "source": { "type": "git", "url": "https://github.com/tecnickcom/TCPDF.git", - "reference": "cc54c1503685e618b23922f53635f46e87653662" + "reference": "154bba45ffc9c2a049aa9e21501d02472b24deb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/cc54c1503685e618b23922f53635f46e87653662", - "reference": "cc54c1503685e618b23922f53635f46e87653662", + "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/154bba45ffc9c2a049aa9e21501d02472b24deb4", + "reference": "154bba45ffc9c2a049aa9e21501d02472b24deb4", "shasum": "" }, "require": { @@ -3584,7 +3584,7 @@ ], "support": { "issues": "https://github.com/tecnickcom/TCPDF/issues", - "source": "https://github.com/tecnickcom/TCPDF/tree/6.5.0" + "source": "https://github.com/tecnickcom/TCPDF/tree/6.6.0" }, "funding": [ { @@ -3592,7 +3592,7 @@ "type": "custom" } ], - "time": "2022-08-12T07:50:54+00:00" + "time": "2022-12-06T09:28:13+00:00" }, { "name": "ua-parser/uap-php", @@ -7358,16 +7358,16 @@ }, { "name": "symfony/var-dumper", - "version": "v6.2.0", + "version": "v6.2.1", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "6228b11059d7b279be699682f164a107ba9a268d" + "reference": "1e7544c8698627b908657e5276854d52ab70087a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6228b11059d7b279be699682f164a107ba9a268d", - "reference": "6228b11059d7b279be699682f164a107ba9a268d", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1e7544c8698627b908657e5276854d52ab70087a", + "reference": "1e7544c8698627b908657e5276854d52ab70087a", "shasum": "" }, "require": { @@ -7426,7 +7426,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.2.0" + "source": "https://github.com/symfony/var-dumper/tree/v6.2.1" }, "funding": [ { @@ -7442,7 +7442,7 @@ "type": "tidelift" } ], - "time": "2022-11-28T13:41:56+00:00" + "time": "2022-12-03T22:32:58+00:00" }, { "name": "theseer/tokenizer", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index e7c6729015..87afafec42 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -29,7 +29,7 @@ "lazysizes": "^5.3.2", "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", - "svelte": "^3.53.1", + "svelte": "^3.54.0", "swiper": "8.4.5", "tooltipster": "^4.2.8", "uglify-js": "^3.17.4", @@ -990,9 +990,9 @@ "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==" }, "node_modules/svelte": { - "version": "3.53.1", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.53.1.tgz", - "integrity": "sha512-Q4/hHkktZogGhN5iqxqSi9sjEVoe/NbIxX4hXEHoasTxj+TxEQVAq66LnDMdAZxjmsodkoI5F3slqsS68U7FNw==", + "version": "3.54.0", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.54.0.tgz", + "integrity": "sha512-tdrgeJU0hob0ZWAMoKXkhcxXA7dpTg6lZGxUeko5YqvPdJBiyRspGsCwV27kIrbrqPP2WUoSV9ca0gnLlw8YzQ==", "engines": { "node": ">= 8" } @@ -1869,9 +1869,9 @@ "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==" }, "svelte": { - "version": "3.53.1", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.53.1.tgz", - "integrity": "sha512-Q4/hHkktZogGhN5iqxqSi9sjEVoe/NbIxX4hXEHoasTxj+TxEQVAq66LnDMdAZxjmsodkoI5F3slqsS68U7FNw==" + "version": "3.54.0", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.54.0.tgz", + "integrity": "sha512-tdrgeJU0hob0ZWAMoKXkhcxXA7dpTg6lZGxUeko5YqvPdJBiyRspGsCwV27kIrbrqPP2WUoSV9ca0gnLlw8YzQ==" }, "swiper": { "version": "8.4.5", diff --git a/webroot/package.json b/webroot/package.json index 2fab22e6c1..96db95e93e 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -35,7 +35,7 @@ "lazysizes": "^5.3.2", "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", - "svelte": "^3.53.1", + "svelte": "^3.54.0", "swiper": "8.4.5", "tooltipster": "^4.2.8", "uglify-js": "^3.17.4", From 429dd8731e73186656d1047eb31fbd1e785054b0 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 7 Dec 2022 10:56:14 +0100 Subject: [PATCH 372/646] change image brightness and contrast --- webroot/css/dark-mode.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index ede995a710..e5370776ec 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -32,6 +32,9 @@ body.dark { background-color: var(--main-bg-color); color: var(--main-font-color); } +body.dark img { + filter: brightness(.8) contrast(1.2); +} body.dark #header, body.dark #content, body.dark .sidebar, From b8d2e7b72af2ee08f7e3f4968d0e39e31a191a95 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 7 Dec 2022 11:28:16 +0100 Subject: [PATCH 373/646] brighter color for h3 and buttons --- webroot/css/dark-mode.css | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index e5370776ec..da0fa68eae 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -15,6 +15,7 @@ --main-bg-color: #1b1b1b; --2nd-bg-color: #0d1117; --main-font-color: #CDCDCD; + --2nd-font-color: #f4f0ec;; --main-border-color: #696969; } body, @@ -74,10 +75,6 @@ body.dark #main-menu li > a, body.dark #user-menu li > a, body.dark a.blog-post-wrapper span, body.dark .cart span.product-name-wrapper span.unity, -body.dark .vertical.menu li.header, -body.dark .box h3, -body.dark .box h3 i, -body.dark .btn-success, body.dark #footer .bottom a i, body.dark #footer .bottom a, body.dark .modal-title, @@ -85,6 +82,12 @@ body.dark .modal-header i, body.dark #footer a:hover { color: var(--main-font-color); } +body.dark .box h3, +body.dark .box h3 i, +body.dark .vertical.menu li.header, +body.dark .btn-success { + color: var(--2nd-font-color); +} body.dark .vertical.menu a, body.dark .cart-extra-info { color: var(--main-font-color) ! important; From 57b4446ff2074af34ff0f5dca11faa82352875bb Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 7 Dec 2022 11:45:00 +0100 Subject: [PATCH 374/646] renaming --- templates/element/userMenu.php | 4 ++-- webroot/css/dark-mode.css | 6 ++++-- webroot/css/frontend.css | 4 ++-- webroot/js/helper.js | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/templates/element/userMenu.php b/templates/element/userMenu.php index 4b2e07600d..e67a04f1fb 100644 --- a/templates/element/userMenu.php +++ b/templates/element/userMenu.php @@ -35,9 +35,9 @@ } $this->element('addScript', [ - 'script' => Configure::read('app.jsNamespace') . ".Helper.initThemeSwitcher();" + 'script' => Configure::read('app.jsNamespace') . ".Helper.initColorModeSwitcher();" ]); -$menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw fas fa-sun', 'class' => ['theme']]]; +$menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw fas fa-sun', 'class' => ['color-mode']]]; if ($appAuth->user()) { if (!$appAuth->isOrderForDifferentCustomerMode()) { $menu[] = ['slug' => $profileSlug, 'name' => $userName, 'options' => ['fa-icon' => 'ok fa-fw fa-user']]; diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index da0fa68eae..659d3789f5 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -12,12 +12,14 @@ * @link https://www.foodcoopshop.com */ :root { + color-scheme: light dark; --main-bg-color: #1b1b1b; --2nd-bg-color: #0d1117; --main-font-color: #CDCDCD; --2nd-font-color: #f4f0ec;; --main-border-color: #696969; } + body, #header, #content, @@ -84,12 +86,12 @@ body.dark #footer a:hover { } body.dark .box h3, body.dark .box h3 i, +body.dark .cart-extra-info, body.dark .vertical.menu li.header, body.dark .btn-success { color: var(--2nd-font-color); } -body.dark .vertical.menu a, -body.dark .cart-extra-info { +body.dark .vertical.menu a { color: var(--main-font-color) ! important; } body.dark a.blog-post-wrapper, diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index ba63a99e42..a3aac1b9c1 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -224,10 +224,10 @@ body.categories.detail div.description-wrapper { color: #333; } #user-menu i.fa-user, -#user-menu .theme i { +#user-menu .color-mode i { padding-right: 5px; } -#user-menu .theme { +#user-menu .color-mode { margin-right: 5px; } #user-menu > li { diff --git a/webroot/js/helper.js b/webroot/js/helper.js index 335752f420..bb75e06ac5 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -38,8 +38,8 @@ foodcoopshop.Helper = { $('body').css('background-image', 'url("' + foodcoopshop.BackgroundImage.getBackgroundImage(theme) + '"'); }, - initThemeSwitcher: function() { - $('#user-menu .theme').on('click', function() { + initColorModeSwitcher: function() { + $('#user-menu .color-mode').on('click', function() { var icon = $(this).find('i'); if ($('body').hasClass('dark')) { $('body').removeClass('dark'); From 4d141cecbb7ad3fdb2828ec7461175d0dcb1e6d2 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 7 Dec 2022 12:01:53 +0100 Subject: [PATCH 375/646] save desired color mode in local storage --- webroot/js/helper.js | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/webroot/js/helper.js b/webroot/js/helper.js index bb75e06ac5..285a4c91b0 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -39,19 +39,36 @@ foodcoopshop.Helper = { }, initColorModeSwitcher: function() { + let colorMode = localStorage.getItem('color-mode'); $('#user-menu .color-mode').on('click', function() { - var icon = $(this).find('i'); if ($('body').hasClass('dark')) { - $('body').removeClass('dark'); - icon.removeClass('fa-moon'); - icon.addClass('fa-sun'); + localStorage.setItem('color-mode', 'light'); + foodcoopshop.Helper.enableLightMode(); } else { - $('body').addClass('dark'); - icon.removeClass('fa-sun'); - icon.addClass('fa-moon'); + localStorage.setItem('color-mode', 'dark'); + foodcoopshop.Helper.enableDarkMode(); } - foodcoopshop.Helper.setBackgroundImage(); - }).trigger('click'); + }); + if (colorMode === 'dark') { + foodcoopshop.Helper.enableDarkMode(); + } else { + foodcoopshop.Helper.enableLightMode(); + } + foodcoopshop.Helper.setBackgroundImage(); + }, + + enableLightMode: function() { + $('body').removeClass('dark'); + var icon = $('#user-menu .color-mode').find('i'); + icon.removeClass('fa-moon'); + icon.addClass('fa-sun'); + }, + + enableDarkMode: function() { + $('body').addClass('dark'); + var icon = $('#user-menu .color-mode').find('i'); + icon.removeClass('fa-sun'); + icon.addClass('fa-moon'); }, initRegistrationAsCompany: function() { From b0a7a88972e90d089eb5e2ffafe4a0cb3daa2de7 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 7 Dec 2022 12:08:38 +0100 Subject: [PATCH 376/646] revert --- webroot/css/dark-mode.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 659d3789f5..f88f01e5b8 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -12,7 +12,6 @@ * @link https://www.foodcoopshop.com */ :root { - color-scheme: light dark; --main-bg-color: #1b1b1b; --2nd-bg-color: #0d1117; --main-font-color: #CDCDCD; @@ -27,8 +26,7 @@ body, .box #inner-content, input, -select, -a.blog-post-wrapper { +select { transition: background .5s; } body.dark { From 7e55ce4fc72b4a6f9a4041f37ede682c462487d9 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 7 Dec 2022 12:23:41 +0100 Subject: [PATCH 377/646] dark mode is set for self-service mode and admin --- config/asset_compress.ini | 2 -- plugins/Admin/templates/Pages/home.php | 1 + plugins/Admin/webroot/js/admin.js | 1 + src/Assets/AssetsProvider.php | 2 ++ webroot/js/helper.js | 6 +++++- webroot/js/self-service.js | 1 + 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/config/asset_compress.ini b/config/asset_compress.ini index 7942c46dd0..c3aca27029 100644 --- a/config/asset_compress.ini +++ b/config/asset_compress.ini @@ -34,7 +34,6 @@ files[] = self-service.css files[] = feedback.css files[] = frontend.css files[] = print.css -files[] = dark-mode.css [frontend.js] files[] = 'App\Assets\AssetsProvider::getJsFilesBase()' @@ -45,7 +44,6 @@ files[] = scrolltofixed/jquery-scrolltofixed.js files[] = swiper/swiper-bundle.js files[] = webrtc-adapter/out/adapter.js files[] = @ericblade/quagga2/dist/quagga.min.js -files[] = background-image.js files[] = helper.js files[] = self-service.js files[] = cart.js diff --git a/plugins/Admin/templates/Pages/home.php b/plugins/Admin/templates/Pages/home.php index 0df79e63d5..c972d37213 100644 --- a/plugins/Admin/templates/Pages/home.php +++ b/plugins/Admin/templates/Pages/home.php @@ -19,6 +19,7 @@ $this->element('addScript', [ 'script' => + Configure::read('app.jsNamespace') . ".Helper.initColorMode();" . Configure::read('app.jsNamespace') . ".Helper.showContent();" . Configure::read('app.jsNamespace') . ".Helper.initAnystretch();" . Configure::read('app.jsNamespace') . ".Admin.setMenuFixed();" . diff --git a/plugins/Admin/webroot/js/admin.js b/plugins/Admin/webroot/js/admin.js index 8907d78e1e..bbdfff2549 100644 --- a/plugins/Admin/webroot/js/admin.js +++ b/plugins/Admin/webroot/js/admin.js @@ -16,6 +16,7 @@ foodcoopshop.Admin = { init: function () { this.initFilter(); this.improveTableLayout(); + foodcoopshop.Helper.initColorMode(); foodcoopshop.Helper.showContent(); foodcoopshop.Helper.initMenu(); foodcoopshop.ModalLogout.init(); diff --git a/src/Assets/AssetsProvider.php b/src/Assets/AssetsProvider.php index e6c86e9c5a..088943c65d 100644 --- a/src/Assets/AssetsProvider.php +++ b/src/Assets/AssetsProvider.php @@ -32,6 +32,7 @@ public static function getCssFilesBase() 'bootstrap-select/dist/css/bootstrap-select.css', 'bootstrap/dist/css/bootstrap.css', '@fortawesome/fontawesome-free/css/all.css', + 'dark-mode.css', 'global.css', 'modal.css', 'fonts.css', @@ -62,6 +63,7 @@ public static function getJsFilesBase() 'jquery-backstretch/jquery.backstretch.js', 'tooltipster/dist/js/tooltipster.bundle.js', 'jquery.scrollto/jquery.scrollTo.js', + 'background-image.js', 'modal/modal.js', 'modal/modal-logout.js', 'modal/modal-order-for-different-customer-cancel.js', diff --git a/webroot/js/helper.js b/webroot/js/helper.js index 285a4c91b0..7591840a2b 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -24,6 +24,7 @@ foodcoopshop.Helper = { foodcoopshop.ModalLogout.init(); this.changeOutgoingLinksTargetToBlank(); this.initCookieBanner(); + this.initColorMode(); if (!this.isMobile()) { this.initWindowResize(); this.initScrolltopButton(); @@ -39,7 +40,6 @@ foodcoopshop.Helper = { }, initColorModeSwitcher: function() { - let colorMode = localStorage.getItem('color-mode'); $('#user-menu .color-mode').on('click', function() { if ($('body').hasClass('dark')) { localStorage.setItem('color-mode', 'light'); @@ -49,6 +49,10 @@ foodcoopshop.Helper = { foodcoopshop.Helper.enableDarkMode(); } }); + }, + + initColorMode: function() { + let colorMode = localStorage.getItem('color-mode'); if (colorMode === 'dark') { foodcoopshop.Helper.enableDarkMode(); } else { diff --git a/webroot/js/self-service.js b/webroot/js/self-service.js index 677014f193..5a56cbcb36 100644 --- a/webroot/js/self-service.js +++ b/webroot/js/self-service.js @@ -18,6 +18,7 @@ foodcoopshop.SelfService = { init : function() { foodcoopshop.ModalLogout.init(document.location.href); + foodcoopshop.Helper.initColorMode(); this.initWindowResize(); this.initSearchForm(); this.bindQuantityInUnitsInputFields(); From 05b41e0ad58ad093fd4b13abc7f1792b7a8a8909 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 8 Dec 2022 15:27:46 +0100 Subject: [PATCH 378/646] changed to 3 weeks --- src/Model/Table/CartsTable.php | 2 +- templates/element/cart/selectPickupDay.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Model/Table/CartsTable.php b/src/Model/Table/CartsTable.php index 67de91490a..09c9fc7d8e 100644 --- a/src/Model/Table/CartsTable.php +++ b/src/Model/Table/CartsTable.php @@ -94,7 +94,7 @@ public function getAllowOnlyDefinedPickupDaysValidator(Validator $validator, $fi { $validator->add($field, 'allow-only-defined-pickup-days', [ 'rule' => function ($value, $context) { - if (!in_array($value, array_keys(DeliveryRhythm::getNextDailyDeliveryDays(14))) + if (!in_array($value, array_keys(DeliveryRhythm::getNextDailyDeliveryDays(21))) || in_array($value, Configure::read('app.htmlHelper')->getGlobalNoDeliveryDaysAsArray())) { return false; } diff --git a/templates/element/cart/selectPickupDay.php b/templates/element/cart/selectPickupDay.php index aa2889cadc..a36ff4513c 100644 --- a/templates/element/cart/selectPickupDay.php +++ b/templates/element/cart/selectPickupDay.php @@ -29,7 +29,7 @@ echo '
'; - $preparedDeliveryDays = DeliveryRhythm::getNextDailyDeliveryDays(14); + $preparedDeliveryDays = DeliveryRhythm::getNextDailyDeliveryDays(21); $formattedToDatabaseDeliveryDays = $this->Html->getGlobalNoDeliveryDaysAsArray(); $i = 0; From 45718f7370b8c30de65f41f25c0c0a5b0da7ac70 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 8 Dec 2022 15:33:08 +0100 Subject: [PATCH 379/646] bg fix --- webroot/js/helper.js | 1 + 1 file changed, 1 insertion(+) diff --git a/webroot/js/helper.js b/webroot/js/helper.js index 7591840a2b..8331fedc0b 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -48,6 +48,7 @@ foodcoopshop.Helper = { localStorage.setItem('color-mode', 'dark'); foodcoopshop.Helper.enableDarkMode(); } + foodcoopshop.Helper.setBackgroundImage(); }); }, From ba451d357ee45fdc8984799dc490ebbe47489aab Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 8 Dec 2022 16:00:34 +0100 Subject: [PATCH 380/646] self service mode --- webroot/css/dark-mode.css | 28 ++++++++++++++++++++++------ webroot/css/self-service.css | 1 - 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index f88f01e5b8..53e0506767 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -42,11 +42,17 @@ body.dark .sidebar, body.dark .box, body.dark #inner-content, body.dark .modal-content, -body.dark .btn-outline-light.disabled { +body.dark .btn-outline-light.disabled, +body.dark .self-service .header, +body.dark .self-service #SelfServiceForm, +body.dark .self-service #login-form h2 span { background-color: var(--main-bg-color); } body.dark #main-menu li ul, -body.dark #user-menu li ul { +body.dark #user-menu li ul, +body.dark .bootstrap-select .dropdown-toggle, +body.dark .bootstrap-select .dropdown-menu, +body.dark .bootstrap-select .no-results { background-color: var(--2nd-bg-color); border-color: var(--main-border-color); } @@ -62,7 +68,8 @@ body.dark textarea { color: var(--main-font-color); border-color: var(--main-border-color); } -body.dark #footer { +body.dark #footer, +body.dark .self-service .footer { background-color: var(--2nd-bg-color); border-color: var(--main-border-color); } @@ -79,7 +86,11 @@ body.dark #footer .bottom a i, body.dark #footer .bottom a, body.dark .modal-title, body.dark .modal-header i, -body.dark #footer a:hover { +body.dark #footer a:hover, +body.dark .bootstrap-select .filter-option-inner-inner, +body.dark .bootstrap-select .dropdown-menu li a span.text, +body.dark .bootstrap-select .no-results, +body.dark .bootstrap-select > .dropdown-toggle:after { color: var(--main-font-color); } body.dark .box h3, @@ -103,7 +114,9 @@ body.dark .swiper-button-prev:after, body.dark .swiper-button-next:after { color: var(--main-bg-color); } - +body.dark .dropdown-item:hover span { + color: var(--main-bg-color) ! important; +} body.dark .box, body.dark #header, body.dark .vertical.menu, @@ -121,7 +134,10 @@ body.dark .pw, body.dark .manufacturer-wrapper, body.dark a.blog-post-wrapper h3, body.dark .modal-footer, -body.dark .h1-registration { +body.dark .h1-registration, +body.dark .self-service #SelfServiceForm, +body.dark .self-service #cart, +body.dark .self-service #login-form h2 { border-color: var(--main-border-color); } body.dark #load-last-order-details { diff --git a/webroot/css/self-service.css b/webroot/css/self-service.css index ece9ce2cb3..96fa3973e2 100644 --- a/webroot/css/self-service.css +++ b/webroot/css/self-service.css @@ -74,7 +74,6 @@ body.self_services #content { min-height: calc(100vh - 100px - 66px - 2px); } .self-service .pw { - background: #fff; border-right: 1px solid #d6d4d4; } .self-service .pw div.c1 { From ae3b10d21d9365ca1129fc68e6109f108044b3f1 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 8 Dec 2022 16:13:18 +0100 Subject: [PATCH 381/646] admin dark theme --- webroot/css/dark-mode.css | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 53e0506767..04f5142226 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -45,7 +45,10 @@ body.dark .modal-content, body.dark .btn-outline-light.disabled, body.dark .self-service .header, body.dark .self-service #SelfServiceForm, -body.dark .self-service #login-form h2 span { +body.dark .self-service #login-form h2 span, +body.dark.admin #menu, +body.dark.admin .filter-container, +body.dark.admin table.list { background-color: var(--main-bg-color); } body.dark #main-menu li ul, @@ -90,7 +93,8 @@ body.dark #footer a:hover, body.dark .bootstrap-select .filter-option-inner-inner, body.dark .bootstrap-select .dropdown-menu li a span.text, body.dark .bootstrap-select .no-results, -body.dark .bootstrap-select > .dropdown-toggle:after { +body.dark .bootstrap-select > .dropdown-toggle:after, +body.dark.admin .filter-container { color: var(--main-font-color); } body.dark .box h3, @@ -104,7 +108,9 @@ body.dark .vertical.menu a { color: var(--main-font-color) ! important; } body.dark a.blog-post-wrapper, -body.dark .vertical.menu { +body.dark .vertical.menu, +body.dark.admin div:not(.product-list) > table.list tr:nth-child(odd), +body.dark.admin table.list th { background-color: var(--2nd-bg-color); } body.dark a.blog-post-wrapper:hover { @@ -137,7 +143,11 @@ body.dark .modal-footer, body.dark .h1-registration, body.dark .self-service #SelfServiceForm, body.dark .self-service #cart, -body.dark .self-service #login-form h2 { +body.dark .self-service #login-form h2, +body.dark.admin .filter-container, +body.dark.admin table.list th, +body.dark.admin table.list td, +body.dark.admin table.list tr { border-color: var(--main-border-color); } body.dark #load-last-order-details { From 8f4cc81e54bfb8e0fbc5b94103c55d27d7083d54 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 8 Dec 2022 20:31:30 +0100 Subject: [PATCH 382/646] admin row hover --- plugins/Admin/webroot/css/admin.css | 7 +++--- webroot/css/dark-mode.css | 33 ++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/plugins/Admin/webroot/css/admin.css b/plugins/Admin/webroot/css/admin.css index 1e49a4ffe6..89f7fa1051 100644 --- a/plugins/Admin/webroot/css/admin.css +++ b/plugins/Admin/webroot/css/admin.css @@ -70,7 +70,8 @@ body.taxes.edit #flashMessage { margin-left: 155px; min-height: 500px; /* hack for mobile with little content */ background-color: #fff; - border-left: 2px solid #efefef; + border: 1px solid #efefef; + border-top: none; border-bottom-right-radius: 15px; position: relative; } @@ -203,7 +204,7 @@ td.amount .fa-times { background: #efefef; width: 1074px; /* be aware of table border if scrolled */ z-index: 100; - border-bottom: 1px solid #dfdfdf; + border: 1px solid #efefef; } .filter-container-not-fixed { float: left; @@ -457,7 +458,7 @@ body.order_details #add-self-service-order-button-wrapper div.select { body.order_details td .pickup-day-comment-edit-button.btn-disabled i.fas, body.customers.index td .customer-comment-edit-button.btn-disabled i.fas, body.customers.index td i.not-activated { - opacity: 0.3; + opacity: 0.6; } body.manufacturers.index a.edit-link, body.customers.index a.edit-link { diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 04f5142226..a10384c00e 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -66,7 +66,8 @@ body.dark .btn-outline-light, body.dark select, body.dark #product-search input, body.dark input, -body.dark textarea { +body.dark textarea, +body.dark .bootstrap-select .form-control:focus { background-color: var(--2nd-bg-color); color: var(--main-font-color); border-color: var(--main-border-color); @@ -94,17 +95,26 @@ body.dark .bootstrap-select .filter-option-inner-inner, body.dark .bootstrap-select .dropdown-menu li a span.text, body.dark .bootstrap-select .no-results, body.dark .bootstrap-select > .dropdown-toggle:after, -body.dark.admin .filter-container { +body.dark.admin .filter-container, +body.dark h2.warning, +body.dark h2.info, +body.dark h2.info2 { color: var(--main-font-color); } body.dark .box h3, body.dark .box h3 i, body.dark .cart-extra-info, body.dark .vertical.menu li.header, -body.dark .btn-success { +body.dark .btn-success, +body.dark .btn-warning { color: var(--2nd-font-color); } -body.dark .vertical.menu a { +body.dark .vertical.menu a, +body.dark.admin .vertical.menu a:hover i, +body.dark.admin .vertical.menu a.active i, +body.dark.admin table.list a:not(.btn), +body.dark.admin h2 span a, +body.dark.admin form .input a:not(.btn) { color: var(--main-font-color) ! important; } body.dark a.blog-post-wrapper, @@ -173,4 +183,17 @@ body.dark .blog-wrapper .swiper-button-prev, body.dark .blog-wrapper .swiper-button-next, body.dark #scroll-to-top a { background-color: var(--main-font-color); -} \ No newline at end of file +} +body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child):hover, +body.dark.admin table.list tr.selected { + background-color: var(--main-font-color) ! important; +} +body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child):hover td, +body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child):hover td a:not(.btn), +body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child):hover td > i, +body.dark.admin table.list tr.selected td, +body.dark.admin table.list tr.selected td a:not(.btn), +body.dark.admin table.list tr.selected td > i { + color: var(--main-bg-color) ! important; +} + From 307101fd3397ce3f0bb1a6357426cdba819f5a68 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 8 Dec 2022 20:32:45 +0100 Subject: [PATCH 383/646] remove transition --- webroot/css/dark-mode.css | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index a10384c00e..16e34e8613 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -19,16 +19,6 @@ --main-border-color: #696969; } -body, -#header, -#content, -.sidebar, -.box -#inner-content, -input, -select { - transition: background .5s; -} body.dark { background-color: var(--main-bg-color); color: var(--main-font-color); From 97b57a1ea44da1b02eec7838faf042856ac065e0 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 8 Dec 2022 20:52:45 +0100 Subject: [PATCH 384/646] tooltipster --- webroot/css/dark-mode.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 16e34e8613..df0d08994d 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -104,13 +104,16 @@ body.dark.admin .vertical.menu a:hover i, body.dark.admin .vertical.menu a.active i, body.dark.admin table.list a:not(.btn), body.dark.admin h2 span a, -body.dark.admin form .input a:not(.btn) { +body.dark.admin form .input a:not(.btn), +body.dark .tooltipster-box .tooltipster-content, +body.dark .tooltipster-box .tooltipster-content a { color: var(--main-font-color) ! important; } body.dark a.blog-post-wrapper, body.dark .vertical.menu, body.dark.admin div:not(.product-list) > table.list tr:nth-child(odd), -body.dark.admin table.list th { +body.dark.admin table.list th, +body.dark .tooltipster-box .tooltipster-content { background-color: var(--2nd-bg-color); } body.dark a.blog-post-wrapper:hover { From d7b8fe949d495015fd7042b6e99922991824d25e Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 8 Dec 2022 21:10:25 +0100 Subject: [PATCH 385/646] dark mode mobile --- plugins/Admin/templates/layout/default.php | 7 ++- templates/element/layout/header.php | 1 + webroot/css/dark-mode.css | 58 ++++++++++------------ webroot/css/global.css | 9 ++++ webroot/css/mobile-dark-mode.css | 25 ++++++++++ 5 files changed, 66 insertions(+), 34 deletions(-) create mode 100644 webroot/css/mobile-dark-mode.css diff --git a/plugins/Admin/templates/layout/default.php b/plugins/Admin/templates/layout/default.php index beba6ee050..3fac27b83f 100644 --- a/plugins/Admin/templates/layout/default.php +++ b/plugins/Admin/templates/layout/default.php @@ -44,7 +44,12 @@ } echo $this->element('renderCss', ['configs' => $cssConfigs]); if ($isMobile) { - echo $this->Html->css(['/node_modules/slidebars/dist/slidebars', 'mobile-global', 'Admin.mobile']); + echo $this->Html->css([ + '/node_modules/slidebars/dist/slidebars', + 'mobile-global', + 'Admin.mobile', + 'mobile-dark-mode', + ]); } echo $this->element('customThemeStyleSheet'); echo $this->element('layout/customHeader'); diff --git a/templates/element/layout/header.php b/templates/element/layout/header.php index c7e90e93c4..ba36c2f9fa 100644 --- a/templates/element/layout/header.php +++ b/templates/element/layout/header.php @@ -58,6 +58,7 @@ 'mobile-frontend', 'mobile-frontend-portrait', 'mobile-self-service', + 'mobile-dark-mode', 'mobile-frontend-custom', ]); } diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index df0d08994d..5272896481 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -11,17 +11,9 @@ * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ - :root { - --main-bg-color: #1b1b1b; - --2nd-bg-color: #0d1117; - --main-font-color: #CDCDCD; - --2nd-font-color: #f4f0ec;; - --main-border-color: #696969; -} - body.dark { - background-color: var(--main-bg-color); - color: var(--main-font-color); + background-color: var(--dark-mode-main-bg-color); + color: var(--dark-mode-main-font-color); } body.dark img { filter: brightness(.8) contrast(1.2); @@ -39,37 +31,38 @@ body.dark .self-service #login-form h2 span, body.dark.admin #menu, body.dark.admin .filter-container, body.dark.admin table.list { - background-color: var(--main-bg-color); + background-color: var(--dark-mode-main-bg-color); } body.dark #main-menu li ul, body.dark #user-menu li ul, body.dark .bootstrap-select .dropdown-toggle, body.dark .bootstrap-select .dropdown-menu, body.dark .bootstrap-select .no-results { - background-color: var(--2nd-bg-color); - border-color: var(--main-border-color); + background-color: var(--dark-mode-2nd-bg-color); + border-color: var(--dark-mode-main-border-color); } body.dark .vertical.menu a { - background-color: var(--main-bg-color) ! important; + background-color: var(--dark-mode-main-bg-color) ! important; } body.dark .btn-outline-light, body.dark select, body.dark #product-search input, +body.dark #product-search select, body.dark input, body.dark textarea, body.dark .bootstrap-select .form-control:focus { - background-color: var(--2nd-bg-color); - color: var(--main-font-color); - border-color: var(--main-border-color); + background-color: var(--dark-mode-2nd-bg-color); + color: var(--dark-mode-main-font-color); + border-color: var(--dark-mode-main-border-color); } body.dark #footer, body.dark .self-service .footer { - background-color: var(--2nd-bg-color); - border-color: var(--main-border-color); + background-color: var(--dark-mode-2nd-bg-color); + border-color: var(--dark-mode-main-border-color); } body.dark .btn-outline-light:hover, body.dark .btn-outline-light:active:focus { - background-color: var(--2nd-bg-color) ! important; + background-color: var(--dark-mode-2nd-bg-color) ! important; opacity: .7; } body.dark #main-menu li > a, @@ -89,7 +82,7 @@ body.dark.admin .filter-container, body.dark h2.warning, body.dark h2.info, body.dark h2.info2 { - color: var(--main-font-color); + color: var(--dark-mode-main-font-color); } body.dark .box h3, body.dark .box h3 i, @@ -97,7 +90,7 @@ body.dark .cart-extra-info, body.dark .vertical.menu li.header, body.dark .btn-success, body.dark .btn-warning { - color: var(--2nd-font-color); + color: var(--dark-mode-2nd-font-color); } body.dark .vertical.menu a, body.dark.admin .vertical.menu a:hover i, @@ -107,24 +100,24 @@ body.dark.admin h2 span a, body.dark.admin form .input a:not(.btn), body.dark .tooltipster-box .tooltipster-content, body.dark .tooltipster-box .tooltipster-content a { - color: var(--main-font-color) ! important; + color: var(--dark-mode-main-font-color) ! important; } body.dark a.blog-post-wrapper, body.dark .vertical.menu, body.dark.admin div:not(.product-list) > table.list tr:nth-child(odd), body.dark.admin table.list th, body.dark .tooltipster-box .tooltipster-content { - background-color: var(--2nd-bg-color); + background-color: var(--dark-mode-2nd-bg-color); } body.dark a.blog-post-wrapper:hover { opacity: .8; } body.dark .swiper-button-prev:after, body.dark .swiper-button-next:after { - color: var(--main-bg-color); + color: var(--dark-mode-main-bg-color); } body.dark .dropdown-item:hover span { - color: var(--main-bg-color) ! important; + color: var(--dark-mode-main-bg-color) ! important; } body.dark .box, body.dark #header, @@ -151,17 +144,17 @@ body.dark.admin .filter-container, body.dark.admin table.list th, body.dark.admin table.list td, body.dark.admin table.list tr { - border-color: var(--main-border-color); + border-color: var(--dark-mode-main-border-color); } body.dark #load-last-order-details { - border-color: var(--main-border-color) ! important; + border-color: var(--dark-mode-main-border-color) ! important; } body.dark .btn-outline-light:active { color: #fff; } body.dark .menu.vertical span.additional-info { background-color: transparent ! important; - color: var(--main-font-color) ! important; + color: var(--dark-mode-main-font-color) ! important; } body.dark .menu.vertical a:hover i, body.dark .menu.vertical a.active i { @@ -175,11 +168,11 @@ body.dark #footer a:hover { body.dark .blog-wrapper .swiper-button-prev, body.dark .blog-wrapper .swiper-button-next, body.dark #scroll-to-top a { - background-color: var(--main-font-color); + background-color: var(--dark-mode-main-font-color); } body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child):hover, body.dark.admin table.list tr.selected { - background-color: var(--main-font-color) ! important; + background-color: var(--dark-mode-main-font-color) ! important; } body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child):hover td, body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child):hover td a:not(.btn), @@ -187,6 +180,5 @@ body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child): body.dark.admin table.list tr.selected td, body.dark.admin table.list tr.selected td a:not(.btn), body.dark.admin table.list tr.selected td > i { - color: var(--main-bg-color) ! important; + color: var(--dark-mode-main-bg-color) ! important; } - diff --git a/webroot/css/global.css b/webroot/css/global.css index d898006263..a6bd2014a8 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -11,6 +11,15 @@ * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com * @link https://www.foodcoopshop.com */ + + :root { + --dark-mode-main-bg-color: #1b1b1b; + --dark-mode-2nd-bg-color: #0d1117; + --dark-mode-main-font-color: #CDCDCD; + --dark-mode-2nd-font-color: #f4f0ec;; + --dark-mode-main-border-color: #696969; +} + @media print { a:link:after, a:visited:after { content: ''; diff --git a/webroot/css/mobile-dark-mode.css b/webroot/css/mobile-dark-mode.css new file mode 100644 index 0000000000..7ee4dafd14 --- /dev/null +++ b/webroot/css/mobile-dark-mode.css @@ -0,0 +1,25 @@ +/** + * FoodCoopShop - The open source software for your foodcoop + * + * Licensed under the GNU Affero General Public License version 3 + * For full copyright and license information, please see LICENSE + * Redistributions of files must retain the above copyright notice. + * + * @since FoodCoopShop 3.6.0 + * @license https://opensource.org/licenses/AGPL-3.0 + * @author Mario Rothauer + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ +@media only screen and (max-device-width: 850px) { + + body.dark #responsive-header, + body.dark .sb-slidebar, + body.dark.admin .sb-toggle-left { + background-color: var(--dark-mode-main-bg-color) ! important; + } + body.dark .sb-slidebar li a { + color: var(--dark-mode-main-font-color) ! important; + } + +} \ No newline at end of file From e57d0b3888b692d4a408d8457b00eaf00e90264c Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 8 Dec 2022 21:13:12 +0100 Subject: [PATCH 386/646] menu hover fix --- webroot/css/dark-mode.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 5272896481..76935c5946 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -93,8 +93,10 @@ body.dark .btn-warning { color: var(--dark-mode-2nd-font-color); } body.dark .vertical.menu a, -body.dark.admin .vertical.menu a:hover i, -body.dark.admin .vertical.menu a.active i, +body.dark .vertical.menu a:hover i, +body.dark .vertical.menu a.active i, +body.dark .vertical.menu a.active span.additional-info, +body.dark .vertical.menu a:hover span.additional-info, body.dark.admin table.list a:not(.btn), body.dark.admin h2 span a, body.dark.admin form .input a:not(.btn), From a14907c1421c96c44a5933b97de378c79a39cf2d Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 8 Dec 2022 21:17:19 +0100 Subject: [PATCH 387/646] cookie consent --- webroot/css/dark-mode.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 76935c5946..8200841028 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -65,6 +65,13 @@ body.dark .btn-outline-light:active:focus { background-color: var(--dark-mode-2nd-bg-color) ! important; opacity: .7; } +body.dark .cookieConsentWrapper { + background-color: var(--dark-mode-2nd-bg-color) ! important; + color: var(--dark-mode-main-font-color) ! important; +} +.cookieConsentWrapper .cookieConsent__Right button { + color: var(--dark-mode-2nd-font-color) ! important; +} body.dark #main-menu li > a, body.dark #user-menu li > a, body.dark a.blog-post-wrapper span, From 5f821111e49f838871d301fa645e9ba47e6f365d Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 8 Dec 2022 21:21:42 +0100 Subject: [PATCH 388/646] switching works mobile --- templates/element/userMenu.php | 2 +- webroot/js/helper.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/element/userMenu.php b/templates/element/userMenu.php index e67a04f1fb..04f16151bc 100644 --- a/templates/element/userMenu.php +++ b/templates/element/userMenu.php @@ -37,7 +37,7 @@ $this->element('addScript', [ 'script' => Configure::read('app.jsNamespace') . ".Helper.initColorModeSwitcher();" ]); -$menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw fas fa-sun', 'class' => ['color-mode']]]; +$menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw fas fa-sun', 'class' => ['color-mode-switcher']]]; if ($appAuth->user()) { if (!$appAuth->isOrderForDifferentCustomerMode()) { $menu[] = ['slug' => $profileSlug, 'name' => $userName, 'options' => ['fa-icon' => 'ok fa-fw fa-user']]; diff --git a/webroot/js/helper.js b/webroot/js/helper.js index 8331fedc0b..ce6cfe6858 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -40,7 +40,7 @@ foodcoopshop.Helper = { }, initColorModeSwitcher: function() { - $('#user-menu .color-mode').on('click', function() { + $('.color-mode-switcher').on('click', function() { if ($('body').hasClass('dark')) { localStorage.setItem('color-mode', 'light'); foodcoopshop.Helper.enableLightMode(); @@ -64,14 +64,14 @@ foodcoopshop.Helper = { enableLightMode: function() { $('body').removeClass('dark'); - var icon = $('#user-menu .color-mode').find('i'); + var icon = $('.color-mode-switcher').find('i'); icon.removeClass('fa-moon'); icon.addClass('fa-sun'); }, enableDarkMode: function() { $('body').addClass('dark'); - var icon = $('#user-menu .color-mode').find('i'); + var icon = $('.color-mode-switcher').find('i'); icon.removeClass('fa-sun'); icon.addClass('fa-moon'); }, From 1ec8b87e6d2838d68021b25e87d4450becafd265 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 8 Dec 2022 21:24:37 +0100 Subject: [PATCH 389/646] renaming --- templates/element/userMenu.php | 2 +- webroot/css/frontend.css | 4 ++-- webroot/js/helper.js | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/element/userMenu.php b/templates/element/userMenu.php index 04f16151bc..3ac3fc23e1 100644 --- a/templates/element/userMenu.php +++ b/templates/element/userMenu.php @@ -37,7 +37,7 @@ $this->element('addScript', [ 'script' => Configure::read('app.jsNamespace') . ".Helper.initColorModeSwitcher();" ]); -$menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw fas fa-sun', 'class' => ['color-mode-switcher']]]; +$menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw fas fa-sun', 'class' => ['color-mode-toggle']]]; if ($appAuth->user()) { if (!$appAuth->isOrderForDifferentCustomerMode()) { $menu[] = ['slug' => $profileSlug, 'name' => $userName, 'options' => ['fa-icon' => 'ok fa-fw fa-user']]; diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index a3aac1b9c1..b409dbbe8c 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -224,10 +224,10 @@ body.categories.detail div.description-wrapper { color: #333; } #user-menu i.fa-user, -#user-menu .color-mode i { +.color-mode-toggle i { padding-right: 5px; } -#user-menu .color-mode { +.color-mode-toggle { margin-right: 5px; } #user-menu > li { diff --git a/webroot/js/helper.js b/webroot/js/helper.js index ce6cfe6858..93d6a53b23 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -40,7 +40,7 @@ foodcoopshop.Helper = { }, initColorModeSwitcher: function() { - $('.color-mode-switcher').on('click', function() { + $('.color-mode-toggle').on('click', function() { if ($('body').hasClass('dark')) { localStorage.setItem('color-mode', 'light'); foodcoopshop.Helper.enableLightMode(); @@ -64,14 +64,14 @@ foodcoopshop.Helper = { enableLightMode: function() { $('body').removeClass('dark'); - var icon = $('.color-mode-switcher').find('i'); + var icon = $('.color-mode-toggle').find('i'); icon.removeClass('fa-moon'); icon.addClass('fa-sun'); }, enableDarkMode: function() { $('body').addClass('dark'); - var icon = $('.color-mode-switcher').find('i'); + var icon = $('.color-mode-toggle').find('i'); icon.removeClass('fa-sun'); icon.addClass('fa-moon'); }, From 7c46293e91fa50f2801dca81bb49337a8c66f29c Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 8 Dec 2022 21:40:30 +0100 Subject: [PATCH 390/646] selected row color --- plugins/Admin/webroot/css/admin.css | 1 + webroot/css/dark-mode.css | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Admin/webroot/css/admin.css b/plugins/Admin/webroot/css/admin.css index 89f7fa1051..f6c04dcfaf 100644 --- a/plugins/Admin/webroot/css/admin.css +++ b/plugins/Admin/webroot/css/admin.css @@ -205,6 +205,7 @@ td.amount .fa-times { width: 1074px; /* be aware of table border if scrolled */ z-index: 100; border: 1px solid #efefef; + border-bottom: none; } .filter-container-not-fixed { float: left; diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 8200841028..005fa56f7d 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -181,7 +181,7 @@ body.dark #scroll-to-top a { } body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child):hover, body.dark.admin table.list tr.selected { - background-color: var(--dark-mode-main-font-color) ! important; + background-color: #737373 ! important; } body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child):hover td, body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child):hover td a:not(.btn), From 65c4e35504ddf143faf05ff5c6a5b40e80451dcd Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 8 Dec 2022 21:48:32 +0100 Subject: [PATCH 391/646] fixes --- plugins/Admin/webroot/css/admin.css | 2 +- webroot/css/dark-mode.css | 5 ++++- webroot/css/table.css | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/Admin/webroot/css/admin.css b/plugins/Admin/webroot/css/admin.css index f6c04dcfaf..8528d259ba 100644 --- a/plugins/Admin/webroot/css/admin.css +++ b/plugins/Admin/webroot/css/admin.css @@ -205,7 +205,7 @@ td.amount .fa-times { width: 1074px; /* be aware of table border if scrolled */ z-index: 100; border: 1px solid #efefef; - border-bottom: none; + border-top: none; } .filter-container-not-fixed { float: left; diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 005fa56f7d..af5982358a 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -108,12 +108,15 @@ body.dark.admin table.list a:not(.btn), body.dark.admin h2 span a, body.dark.admin form .input a:not(.btn), body.dark .tooltipster-box .tooltipster-content, -body.dark .tooltipster-box .tooltipster-content a { +body.dark .tooltipster-box .tooltipster-content a, +body.dark table.list td.not-available, +body.dark table.list td.not-available i.sold-out-limit-for-dialog i { color: var(--dark-mode-main-font-color) ! important; } body.dark a.blog-post-wrapper, body.dark .vertical.menu, body.dark.admin div:not(.product-list) > table.list tr:nth-child(odd), +body.dark.admin table.list tr.custom-odd, body.dark.admin table.list th, body.dark .tooltipster-box .tooltipster-content { background-color: var(--dark-mode-2nd-bg-color); diff --git a/webroot/css/table.css b/webroot/css/table.css index 86ad682e4a..83faee8c63 100644 --- a/webroot/css/table.css +++ b/webroot/css/table.css @@ -66,13 +66,13 @@ table.list tr.sub-row td { } table.list td.not-available, table.list td.not-available i.sold-out-limit-for-dialog i { - background-color: red; + background-color: #dc143c; color: white; } table.list td.negative, b.negative, span.negative { - color: red ! important; + color: #dc143c ! important; } table.list tr:hover td.negative, tr:hover b.negative { From 2aac08d6e5ad841d5a82cafc9159e3d4c3ad9833 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 8 Dec 2022 21:49:56 +0100 Subject: [PATCH 392/646] white hover color --- webroot/css/dark-mode.css | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index af5982358a..cb9bc3a751 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -186,11 +186,4 @@ body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child): body.dark.admin table.list tr.selected { background-color: #737373 ! important; } -body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child):hover td, -body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child):hover td a:not(.btn), -body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child):hover td > i, -body.dark.admin table.list tr.selected td, -body.dark.admin table.list tr.selected td a:not(.btn), -body.dark.admin table.list tr.selected td > i { - color: var(--dark-mode-main-bg-color) ! important; -} + From 45219018f18015a605eb54b6ce787398660dfca8 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 15:43:49 +0100 Subject: [PATCH 393/646] replace red with new red --- plugins/Admin/webroot/css/admin.css | 6 +++--- webroot/css/global.css | 3 ++- webroot/css/mini-upload-form.css | 2 +- webroot/css/modal.css | 2 +- webroot/css/table.css | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/plugins/Admin/webroot/css/admin.css b/plugins/Admin/webroot/css/admin.css index 8528d259ba..8178145de3 100644 --- a/plugins/Admin/webroot/css/admin.css +++ b/plugins/Admin/webroot/css/admin.css @@ -302,7 +302,7 @@ input.datepicker { text-align: center; } .warning { - color: red; + color: var(--not-ok-red); } .ui-widget { font-family: 'Open Sans'; @@ -312,7 +312,7 @@ input.datepicker { margin-bottom: 0; } .tooltipster-content li.negative { - color: red; + color: var(--not-ok-red); } .tooltipster-content .credit-balance-wrapper { margin-top: 10px; @@ -429,7 +429,7 @@ form div.error-message { margin-left: 220px; } .overlay-info { - color: red; + color: var(--not-ok-red); font-weight: 600; font-size: 14px; } diff --git a/webroot/css/global.css b/webroot/css/global.css index a6bd2014a8..8bd5902385 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -18,6 +18,7 @@ --dark-mode-main-font-color: #CDCDCD; --dark-mode-2nd-font-color: #f4f0ec;; --dark-mode-main-border-color: #696969; + --not-ok-red: #dc143c; } @media print { @@ -523,7 +524,7 @@ i.gold { i.fa.not-ok, i.fas.not-ok, i.far.not-ok { - color: red; + color: var(--not-ok-red); } i.fa.neutral, i.fas.neutral, diff --git a/webroot/css/mini-upload-form.css b/webroot/css/mini-upload-form.css index 54ef2cf1d6..b25674699a 100644 --- a/webroot/css/mini-upload-form.css +++ b/webroot/css/mini-upload-form.css @@ -121,5 +121,5 @@ } .upload ul li.error p{ - color:red; + color:var(--not-ok-red); } diff --git a/webroot/css/modal.css b/webroot/css/modal.css index 26de2fcd29..f88016067e 100644 --- a/webroot/css/modal.css +++ b/webroot/css/modal.css @@ -185,7 +185,7 @@ body.iframe_self_service_order { text-align: right; } #order-detail-product-price-edit-form .price-per-unit-info-text { - color:red; + color:var(--not-ok-red); float:left; margin-bottom:5px; } diff --git a/webroot/css/table.css b/webroot/css/table.css index 83faee8c63..4572c328f5 100644 --- a/webroot/css/table.css +++ b/webroot/css/table.css @@ -66,13 +66,13 @@ table.list tr.sub-row td { } table.list td.not-available, table.list td.not-available i.sold-out-limit-for-dialog i { - background-color: #dc143c; + background-color: var(--not-ok-red); color: white; } table.list td.negative, b.negative, span.negative { - color: #dc143c ! important; + color: var(--not-ok-red) ! important; } table.list tr:hover td.negative, tr:hover b.negative { From 96c733dbafe10230d4aba848e94b29d512b803aa Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 15:45:41 +0100 Subject: [PATCH 394/646] no border with bg image --- plugins/Admin/webroot/css/admin.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/Admin/webroot/css/admin.css b/plugins/Admin/webroot/css/admin.css index 8178145de3..232fdfd33e 100644 --- a/plugins/Admin/webroot/css/admin.css +++ b/plugins/Admin/webroot/css/admin.css @@ -28,6 +28,9 @@ body.customers.login #content { body.pages.home .filter-container { display: none; } +body.pages.home #content { + border: none; +} #home { width: 100%; text-align: center; From 8341b75c838e0a6947c3f3d9ba36db60055dbd61 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 15:47:59 +0100 Subject: [PATCH 395/646] help button color --- webroot/css/dark-mode.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index cb9bc3a751..c6c89de85f 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -87,7 +87,7 @@ body.dark .bootstrap-select .no-results, body.dark .bootstrap-select > .dropdown-toggle:after, body.dark.admin .filter-container, body.dark h2.warning, -body.dark h2.info, +body.dark h2.info, body.dark h2.info2 { color: var(--dark-mode-main-font-color); } @@ -95,8 +95,7 @@ body.dark .box h3, body.dark .box h3 i, body.dark .cart-extra-info, body.dark .vertical.menu li.header, -body.dark .btn-success, -body.dark .btn-warning { +body.dark .btn-success { color: var(--dark-mode-2nd-font-color); } body.dark .vertical.menu a, @@ -125,10 +124,12 @@ body.dark a.blog-post-wrapper:hover { opacity: .8; } body.dark .swiper-button-prev:after, -body.dark .swiper-button-next:after { +body.dark .swiper-button-next:after, +body.dark .btn-warning { color: var(--dark-mode-main-bg-color); } -body.dark .dropdown-item:hover span { +body.dark .dropdown-item:hover span, +body.dark .btn-warning:hover { color: var(--dark-mode-main-bg-color) ! important; } body.dark .box, From 5fa8338cc1556d3097d95fd54c85b599bb17ead4 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 15:52:31 +0100 Subject: [PATCH 396/646] remove white border --- webroot/css/dark-mode.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index c6c89de85f..42ebeebe5f 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -128,6 +128,9 @@ body.dark .swiper-button-next:after, body.dark .btn-warning { color: var(--dark-mode-main-bg-color); } +body.dark.admin table.list th { + box-shadow: inset 0 0px 0 var(--dark-mode-main-border-color), inset 0 -1px 0 var(--dark-mode-main-border-color); +} body.dark .dropdown-item:hover span, body.dark .btn-warning:hover { color: var(--dark-mode-main-bg-color) ! important; From bc2d9697d5850e89a0299bee3322e241d87d3e3b Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 15:56:37 +0100 Subject: [PATCH 397/646] reponsive header icon color --- webroot/css/mobile-dark-mode.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/webroot/css/mobile-dark-mode.css b/webroot/css/mobile-dark-mode.css index 7ee4dafd14..9535a4da8d 100644 --- a/webroot/css/mobile-dark-mode.css +++ b/webroot/css/mobile-dark-mode.css @@ -18,8 +18,15 @@ body.dark.admin .sb-toggle-left { background-color: var(--dark-mode-main-bg-color) ! important; } - body.dark .sb-slidebar li a { + body.dark .sb-slidebar li a, + body.dark #responsive-header a { color: var(--dark-mode-main-font-color) ! important; } + body.dark .sb-left a, + body.dark .sb-left li.header, + body.dark .sb-left li.footer { + border-color: var(--dark-mode-main-border-color); + } + } \ No newline at end of file From 2e02c5485e51149f7fa1569811428a6c24f4e88c Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 15:58:36 +0100 Subject: [PATCH 398/646] admin home --- webroot/css/dark-mode.css | 3 ++- webroot/css/mobile-dark-mode.css | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 42ebeebe5f..d0b32d387a 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -50,7 +50,8 @@ body.dark #product-search input, body.dark #product-search select, body.dark input, body.dark textarea, -body.dark .bootstrap-select .form-control:focus { +body.dark .bootstrap-select .form-control:focus, +body.dark.admin #home h1 { background-color: var(--dark-mode-2nd-bg-color); color: var(--dark-mode-main-font-color); border-color: var(--dark-mode-main-border-color); diff --git a/webroot/css/mobile-dark-mode.css b/webroot/css/mobile-dark-mode.css index 9535a4da8d..7dfa07252f 100644 --- a/webroot/css/mobile-dark-mode.css +++ b/webroot/css/mobile-dark-mode.css @@ -19,7 +19,8 @@ background-color: var(--dark-mode-main-bg-color) ! important; } body.dark .sb-slidebar li a, - body.dark #responsive-header a { + body.dark #responsive-header a, + body.dark.admin .sb-toggle-left { color: var(--dark-mode-main-font-color) ! important; } From 0c96318fbddb7a9f66e759fb8398a0ef28d341bf Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 18:23:38 +0100 Subject: [PATCH 399/646] admin tabs --- plugins/Admin/webroot/css/admin.css | 8 ++++---- webroot/css/dark-mode.css | 13 ++++++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/plugins/Admin/webroot/css/admin.css b/plugins/Admin/webroot/css/admin.css index 232fdfd33e..78b2293aac 100644 --- a/plugins/Admin/webroot/css/admin.css +++ b/plugins/Admin/webroot/css/admin.css @@ -736,9 +736,7 @@ div.date-field-wrapper { } ul.nav-tabs { background: #efefef; - margin-top: -2px; - margin-left: -2px; - width: 1074px; + width: 1072px; padding-bottom: 1px; } ul.nav-tabs > li > a { @@ -749,6 +747,7 @@ ul.nav-tabs > li > a { ul.nav-tabs a:hover, ul.nav-tabs li.active a { background-color: #fff; + text-decoration: underline ! important; } a.btn-arrow { display: inline-block; @@ -846,7 +845,8 @@ body.reports.payment .payment-approval-comment { margin-right: 2px; } body.reports.payment form#csv-upload { - padding: 10px 0 5px 0; + padding: 10px 0 5px 10px; + border-bottom: 1px solid #efefef; } body.reports.payment form#csv-upload label { margin-right: 10px; diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index d0b32d387a..f0e1741fdc 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -51,7 +51,8 @@ body.dark #product-search select, body.dark input, body.dark textarea, body.dark .bootstrap-select .form-control:focus, -body.dark.admin #home h1 { +body.dark.admin #home h1, +body.dark.admin ul.nav-tabs { background-color: var(--dark-mode-2nd-bg-color); color: var(--dark-mode-main-font-color); border-color: var(--dark-mode-main-border-color); @@ -110,7 +111,8 @@ body.dark.admin form .input a:not(.btn), body.dark .tooltipster-box .tooltipster-content, body.dark .tooltipster-box .tooltipster-content a, body.dark table.list td.not-available, -body.dark table.list td.not-available i.sold-out-limit-for-dialog i { +body.dark table.list td.not-available i.sold-out-limit-for-dialog i, +body.dark.admin ul.nav-tabs > li > a { color: var(--dark-mode-main-font-color) ! important; } body.dark a.blog-post-wrapper, @@ -121,6 +123,10 @@ body.dark.admin table.list th, body.dark .tooltipster-box .tooltipster-content { background-color: var(--dark-mode-2nd-bg-color); } +body.dark.admin ul.nav-tabs li.active a, +body.dark.admin ul.nav-tabs li a:hover { + background-color: var(--dark-mode-main-bg-color) ! important; +} body.dark a.blog-post-wrapper:hover { opacity: .8; } @@ -160,7 +166,8 @@ body.dark .self-service #login-form h2, body.dark.admin .filter-container, body.dark.admin table.list th, body.dark.admin table.list td, -body.dark.admin table.list tr { +body.dark.admin table.list tr, +body.reports.payment form#csv-upload { border-color: var(--dark-mode-main-border-color); } body.dark #load-last-order-details { From 9cfcd176e1ceb86b869f750db52348ca995e7ce9 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 18:29:33 +0100 Subject: [PATCH 400/646] button color improvements --- plugins/Admin/webroot/css/admin.css | 2 +- webroot/css/dark-mode.css | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/Admin/webroot/css/admin.css b/plugins/Admin/webroot/css/admin.css index 78b2293aac..f08cbceb21 100644 --- a/plugins/Admin/webroot/css/admin.css +++ b/plugins/Admin/webroot/css/admin.css @@ -462,7 +462,7 @@ body.order_details #add-self-service-order-button-wrapper div.select { body.order_details td .pickup-day-comment-edit-button.btn-disabled i.fas, body.customers.index td .customer-comment-edit-button.btn-disabled i.fas, body.customers.index td i.not-activated { - opacity: 0.6; + opacity: 0.3; } body.manufacturers.index a.edit-link, body.customers.index a.edit-link { diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index f0e1741fdc..4c3df2fd3d 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -90,7 +90,8 @@ body.dark .bootstrap-select > .dropdown-toggle:after, body.dark.admin .filter-container, body.dark h2.warning, body.dark h2.info, -body.dark h2.info2 { +body.dark h2.info2, +body.dark.admin a.btn i:not(.not-ok) { color: var(--dark-mode-main-font-color); } body.dark .box h3, From ef76f1e73342259b258c482636a65188f47944fe Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 18:35:19 +0100 Subject: [PATCH 401/646] better hover color --- webroot/css/dark-mode.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 4c3df2fd3d..23d058f552 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -44,6 +44,9 @@ body.dark .bootstrap-select .no-results { body.dark .vertical.menu a { background-color: var(--dark-mode-main-bg-color) ! important; } +body.dark .modal-content { + border: 1px solid var(--dark-mode-main-border-color); +} body.dark .btn-outline-light, body.dark select, body.dark #product-search input, @@ -197,6 +200,6 @@ body.dark #scroll-to-top a { } body.dark.admin table.list:not(.no-hover) tr:not(:last-child):not(:first-child):hover, body.dark.admin table.list tr.selected { - background-color: #737373 ! important; + background-color: #43464B ! important; } From e460f2c19f8297509b7298a3d3a21ff51cba1a10 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 18:52:10 +0100 Subject: [PATCH 402/646] logo bg --- webroot/css/dark-mode.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 23d058f552..4711fa4e94 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -185,7 +185,8 @@ body.dark .menu.vertical span.additional-info { color: var(--dark-mode-main-font-color) ! important; } body.dark .menu.vertical a:hover i, -body.dark .menu.vertical a.active i { +body.dark .menu.vertical a.active i, +body.dark.admin .vertical.menu > li img.logo { background-color: transparent ! important; } body.dark ul.menu.vertical:not(#user-menu):not(#footer-menu) a:hover, From 4890f6fa21f9348640d2d23eb9b4a9fd7c00f682 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 19:52:16 +0100 Subject: [PATCH 403/646] improved bg colors --- webroot/css/global.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webroot/css/global.css b/webroot/css/global.css index 8bd5902385..edcb4dacf2 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -13,8 +13,8 @@ */ :root { - --dark-mode-main-bg-color: #1b1b1b; - --dark-mode-2nd-bg-color: #0d1117; + --dark-mode-main-bg-color: #0f0f0f; + --dark-mode-2nd-bg-color: #1b1b1b; --dark-mode-main-font-color: #CDCDCD; --dark-mode-2nd-font-color: #f4f0ec;; --dark-mode-main-border-color: #696969; From 6cc279b4c498cefe290a5ecf9ae5e08011a3806b Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 20:27:59 +0100 Subject: [PATCH 404/646] readable label color --- plugins/Admin/webroot/js/app.chart.js | 7 +++---- webroot/js/helper.js | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/Admin/webroot/js/app.chart.js b/plugins/Admin/webroot/js/app.chart.js index bf5386307c..8bf04d08bc 100644 --- a/plugins/Admin/webroot/js/app.chart.js +++ b/plugins/Admin/webroot/js/app.chart.js @@ -94,7 +94,7 @@ foodcoopshop.AppChart = { } return ''; }, - color: '#fff', + color: '#ccc', labels: { title: { font: { @@ -153,7 +153,6 @@ foodcoopshop.AppChart = { pointBackgroundColor: this.color, pointRadius: 5 }], - }; var ctx = $('#myLineChart').get(0).getContext('2d'); @@ -293,7 +292,7 @@ foodcoopshop.AppChart = { var pieChartData = { datasets: [{ data: dataPieChart, - borderColor: '#fff', + borderColor: '#CDCDCD', backgroundColor: backgroundColorPieChart, hoverBackgroundColor: this.color, borderWidth: 1, @@ -302,7 +301,7 @@ foodcoopshop.AppChart = { outer: { align: 'end', anchor: 'end', - color: '#333333', + color: foodcoopshop.Helper.getColorMode() == 'dark' ? '#CDCDCD' : '#333333', font: { size: 15 }, diff --git a/webroot/js/helper.js b/webroot/js/helper.js index 93d6a53b23..4d2e15097d 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -76,6 +76,10 @@ foodcoopshop.Helper = { icon.addClass('fa-moon'); }, + getColorMode: function() { + return $('body').hasClass('dark') ? 'dark' : 'light'; + }, + initRegistrationAsCompany: function() { var isCompanyCheckbox = $('#customers-is-company'); From a72ca33462232a60ad2b395b2f74d3b53528dad2 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 20:40:28 +0100 Subject: [PATCH 405/646] better toggle icon --- templates/element/userMenu.php | 2 +- webroot/css/frontend.css | 3 ++- webroot/css/mobile-frontend.css | 3 +++ webroot/js/helper.js | 12 ++++++------ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/templates/element/userMenu.php b/templates/element/userMenu.php index 3ac3fc23e1..3f4e016c5e 100644 --- a/templates/element/userMenu.php +++ b/templates/element/userMenu.php @@ -37,7 +37,7 @@ $this->element('addScript', [ 'script' => Configure::read('app.jsNamespace') . ".Helper.initColorModeSwitcher();" ]); -$menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw fas fa-sun', 'class' => ['color-mode-toggle']]]; +$menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw far fa-moon', 'class' => ['color-mode-toggle']]]; if ($appAuth->user()) { if (!$appAuth->isOrderForDifferentCustomerMode()) { $menu[] = ['slug' => $profileSlug, 'name' => $userName, 'options' => ['fa-icon' => 'ok fa-fw fa-user']]; diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index b409dbbe8c..07a8e5b6f0 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -228,7 +228,8 @@ body.categories.detail div.description-wrapper { padding-right: 5px; } .color-mode-toggle { - margin-right: 5px; + margin-top: 1px; + float: left; } #user-menu > li { padding-bottom: 5px; diff --git a/webroot/css/mobile-frontend.css b/webroot/css/mobile-frontend.css index 9fb945a94c..f82ec13845 100644 --- a/webroot/css/mobile-frontend.css +++ b/webroot/css/mobile-frontend.css @@ -31,6 +31,9 @@ #inner-content iframe { width: 100% ! important; } + .color-mode-toggle { + float: none; + } .cookieConsentWrapper { left: 2% ! important; bottom: 1% ! important; diff --git a/webroot/js/helper.js b/webroot/js/helper.js index 4d2e15097d..f9bf165a91 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -35,8 +35,8 @@ foodcoopshop.Helper = { }, setBackgroundImage: function() { - var theme = $('body').hasClass('dark') ? 'dark' : 'light'; - $('body').css('background-image', 'url("' + foodcoopshop.BackgroundImage.getBackgroundImage(theme) + '"'); + var colorMode = this.getColorMode(); + $('body').css('background-image', 'url("' + foodcoopshop.BackgroundImage.getBackgroundImage(colorMode) + '"'); }, initColorModeSwitcher: function() { @@ -65,15 +65,15 @@ foodcoopshop.Helper = { enableLightMode: function() { $('body').removeClass('dark'); var icon = $('.color-mode-toggle').find('i'); - icon.removeClass('fa-moon'); - icon.addClass('fa-sun'); + icon.removeClass('fas'); + icon.addClass('far'); }, enableDarkMode: function() { $('body').addClass('dark'); var icon = $('.color-mode-toggle').find('i'); - icon.removeClass('fa-sun'); - icon.addClass('fa-moon'); + icon.removeClass('far'); + icon.addClass('fas'); }, getColorMode: function() { From 1247ef7078ded4f36321a99b7d564b081da22004 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 21:05:18 +0100 Subject: [PATCH 406/646] filter container fix --- plugins/Admin/webroot/css/mobile.css | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/Admin/webroot/css/mobile.css b/plugins/Admin/webroot/css/mobile.css index 4a7890f871..3a514273b5 100644 --- a/plugins/Admin/webroot/css/mobile.css +++ b/plugins/Admin/webroot/css/mobile.css @@ -33,6 +33,7 @@ left: 0; width: 100vw; max-width: none; + border-left: none; } .filter-container .right { margin-top: 1px; From b9e569793ccd8c3fffe01d0ed1b6a3112d93b8f0 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 21:08:45 +0100 Subject: [PATCH 407/646] center toggle --- webroot/css/mobile-frontend.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webroot/css/mobile-frontend.css b/webroot/css/mobile-frontend.css index f82ec13845..c095952982 100644 --- a/webroot/css/mobile-frontend.css +++ b/webroot/css/mobile-frontend.css @@ -224,7 +224,7 @@ } #responsive-header .sb-toggle-left { float: left ! important; - margin: 13px 5px 5px 3px ! important; + margin: 12px 8px 5px 3px ! important; text-align: center; width: 25px; } From d1e115a366e20ada3c037b358c85d4c219846108 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 21:15:35 +0100 Subject: [PATCH 408/646] mobile toggle dark mode fix --- templates/element/customThemeStyleSheet.php | 1 + webroot/css/mobile-frontend.css | 1 + 2 files changed, 2 insertions(+) diff --git a/templates/element/customThemeStyleSheet.php b/templates/element/customThemeStyleSheet.php index 1b21628486..f6603f6b14 100644 --- a/templates/element/customThemeStyleSheet.php +++ b/templates/element/customThemeStyleSheet.php @@ -152,6 +152,7 @@ .sb-left li.header, .sb-left a:hover, .sb-left a.active, + .sb-left a:hover i.far, .sb-left a:hover i.fas:not(.gold), .sb-left a.active i.fas:not(.gold):not(.fa-pencil-alt) { background-color: ; diff --git a/webroot/css/mobile-frontend.css b/webroot/css/mobile-frontend.css index c095952982..dc31ab9002 100644 --- a/webroot/css/mobile-frontend.css +++ b/webroot/css/mobile-frontend.css @@ -32,6 +32,7 @@ width: 100% ! important; } .color-mode-toggle { + margin-top: 0; float: none; } .cookieConsentWrapper { From 7da009f1e8420942bb4548dc916a8d2c8f9d3567 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 9 Dec 2022 21:23:13 +0100 Subject: [PATCH 409/646] fixes --- webroot/css/dark-mode.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 4711fa4e94..c5a9ea96eb 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -30,7 +30,8 @@ body.dark .self-service #SelfServiceForm, body.dark .self-service #login-form h2 span, body.dark.admin #menu, body.dark.admin .filter-container, -body.dark.admin table.list { +body.dark.admin table.list, +body.dark.admin #actionLogs div.changed { background-color: var(--dark-mode-main-bg-color); } body.dark #main-menu li ul, @@ -77,6 +78,10 @@ body.dark .cookieConsentWrapper { .cookieConsentWrapper .cookieConsent__Right button { color: var(--dark-mode-2nd-font-color) ! important; } +body.dark .testimonial-quote blockquote, +body.dark .testimonial-quote cite span { + text-shadow: none; +} body.dark #main-menu li > a, body.dark #user-menu li > a, body.dark a.blog-post-wrapper span, From 15e03624326e6094f822ea91f39f1ab38d82dccd Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 10 Dec 2022 13:34:47 +0100 Subject: [PATCH 410/646] blog post img layout fixes --- webroot/css/frontend.css | 2 +- webroot/css/mobile-frontend-portrait.css | 3 --- webroot/css/mobile-frontend.css | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index 07a8e5b6f0..a494b3996f 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -1168,7 +1168,6 @@ a.blog-post-wrapper:nth-of-type(3n) { a.blog-post-wrapper img { padding: 2px; margin-bottom: 3px; - height: 145px; max-width: 100%; max-height: 100%; } @@ -1205,6 +1204,7 @@ a.blog-post-wrapper span.img-wrapper { display: flex; align-items: center; justify-content: center; + height: 145px; } a.blog-post-wrapper:hover { box-shadow: 8px 10px 15px 0px rgba(0,0,0,0.5); diff --git a/webroot/css/mobile-frontend-portrait.css b/webroot/css/mobile-frontend-portrait.css index 94169b79b1..07932610f9 100644 --- a/webroot/css/mobile-frontend-portrait.css +++ b/webroot/css/mobile-frontend-portrait.css @@ -36,9 +36,6 @@ body.blog_posts.detail .blog-post-wrapper { height: 234px; } - .blog-post-wrapper img.blog-post-image { - height: 100px; - } .blog-post-wrapper span.date { display: none; } diff --git a/webroot/css/mobile-frontend.css b/webroot/css/mobile-frontend.css index dc31ab9002..e3b1d8b62b 100644 --- a/webroot/css/mobile-frontend.css +++ b/webroot/css/mobile-frontend.css @@ -25,7 +25,6 @@ body.customers.new_password_request form, #login-form .input, body.customers.new_password_request .input, - a.blog-post-wrapper img, #RegistrationForm .detail-form, #RegistrationForm .input.checkbox label, #inner-content iframe { From c6f03f698a09ebc66ded5382e61c23a406cfa9af Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 10 Dec 2022 20:10:13 +0100 Subject: [PATCH 411/646] mobile logo height --- webroot/css/mobile-frontend.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webroot/css/mobile-frontend.css b/webroot/css/mobile-frontend.css index e3b1d8b62b..f27fd59652 100644 --- a/webroot/css/mobile-frontend.css +++ b/webroot/css/mobile-frontend.css @@ -214,7 +214,7 @@ height: 55px; } #responsive-header .logo { - height: 50px ! important; + height: 51px ! important; float: left ! important; } #responsive-header .fa-spin, From 2bdf52c8b877eff5e11897626b9aa7f8a6ed68c8 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 10 Dec 2022 20:22:52 +0100 Subject: [PATCH 412/646] brighter hover/active in sidebars --- webroot/css/dark-mode.css | 12 ++++++++---- webroot/css/frontend.css | 2 +- webroot/css/mobile-dark-mode.css | 4 +++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index c5a9ea96eb..4ec8560ebb 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -110,10 +110,6 @@ body.dark .btn-success { color: var(--dark-mode-2nd-font-color); } body.dark .vertical.menu a, -body.dark .vertical.menu a:hover i, -body.dark .vertical.menu a.active i, -body.dark .vertical.menu a.active span.additional-info, -body.dark .vertical.menu a:hover span.additional-info, body.dark.admin table.list a:not(.btn), body.dark.admin h2 span a, body.dark.admin form .input a:not(.btn), @@ -132,6 +128,14 @@ body.dark.admin table.list th, body.dark .tooltipster-box .tooltipster-content { background-color: var(--dark-mode-2nd-bg-color); } +body.dark .vertical.menu a.active, +body.dark .vertical.menu a:hover, +body.dark .vertical.menu a:hover i, +body.dark .vertical.menu a.active i, +body.dark .vertical.menu a.active span.additional-info, +body.dark .vertical.menu a:hover span.additional-info { + color: var(--dark-mode-2nd-font-color) ! important; +} body.dark.admin ul.nav-tabs li.active a, body.dark.admin ul.nav-tabs li a:hover { background-color: var(--dark-mode-main-bg-color) ! important; diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index a494b3996f..494dcb1a19 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -1190,7 +1190,7 @@ a.blog-post-wrapper span { word-break: break-word; } a.blog-post-wrapper span.content { - max-height: 107px; + max-height: 105px; overflow-y: hidden; } a.blog-post-wrapper span.date { diff --git a/webroot/css/mobile-dark-mode.css b/webroot/css/mobile-dark-mode.css index 7dfa07252f..2d9c0e53af 100644 --- a/webroot/css/mobile-dark-mode.css +++ b/webroot/css/mobile-dark-mode.css @@ -23,7 +23,9 @@ body.dark.admin .sb-toggle-left { color: var(--dark-mode-main-font-color) ! important; } - + body.dark .sb-slidebar li a.active { + color: var(--dark-mode-2nd-font-color) ! important; + } body.dark .sb-left a, body.dark .sb-left li.header, body.dark .sb-left li.footer { From 9a3ef4e1c1070bddbac30fc84cb792672426a461 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 10 Dec 2022 20:32:57 +0100 Subject: [PATCH 413/646] font color fixes --- webroot/css/dark-mode.css | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 4ec8560ebb..96cdf1e2e6 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -53,7 +53,9 @@ body.dark select, body.dark #product-search input, body.dark #product-search select, body.dark input, +body.dark .pw .amount-wrapper input, body.dark textarea, +body.dark .pw .amount-wrapper .ordered-products-total-amount, body.dark .bootstrap-select .form-control:focus, body.dark.admin #home h1, body.dark.admin ul.nav-tabs { @@ -86,8 +88,6 @@ body.dark #main-menu li > a, body.dark #user-menu li > a, body.dark a.blog-post-wrapper span, body.dark .cart span.product-name-wrapper span.unity, -body.dark #footer .bottom a i, -body.dark #footer .bottom a, body.dark .modal-title, body.dark .modal-header i, body.dark #footer a:hover, @@ -96,16 +96,18 @@ body.dark .bootstrap-select .dropdown-menu li a span.text, body.dark .bootstrap-select .no-results, body.dark .bootstrap-select > .dropdown-toggle:after, body.dark.admin .filter-container, -body.dark h2.warning, -body.dark h2.info, -body.dark h2.info2, body.dark.admin a.btn i:not(.not-ok) { color: var(--dark-mode-main-font-color); } +body.dark h2.warning, +body.dark h2.info, +body.dark h2.info2, body.dark .box h3, body.dark .box h3 i, body.dark .cart-extra-info, body.dark .vertical.menu li.header, +body.dark #footer .bottom a i, +body.dark #footer .bottom a, body.dark .btn-success { color: var(--dark-mode-2nd-font-color); } From 3ee7e9fccb5cf16b73076c994bfbc86d11b9a0f7 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 10 Dec 2022 20:40:31 +0100 Subject: [PATCH 414/646] network module --- plugins/Network/webroot/js/sync-base.js | 1 + webroot/css/dark-mode.css | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/Network/webroot/js/sync-base.js b/plugins/Network/webroot/js/sync-base.js index fdb9860052..d8fc1827f7 100644 --- a/plugins/Network/webroot/js/sync-base.js +++ b/plugins/Network/webroot/js/sync-base.js @@ -16,6 +16,7 @@ foodcoopshop.SyncBase = { activeAjaxRequests : [], init : function () { + foodcoopshop.Helper.initColorMode(); foodcoopshop.Helper.showContent(); foodcoopshop.Helper.initMenu(); foodcoopshop.ModalLogout.init(); diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 96cdf1e2e6..7cd6e27464 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -38,7 +38,9 @@ body.dark #main-menu li ul, body.dark #user-menu li ul, body.dark .bootstrap-select .dropdown-toggle, body.dark .bootstrap-select .dropdown-menu, -body.dark .bootstrap-select .no-results { +body.dark .bootstrap-select .no-results, +body.dark form.sync-login-form, +body.dark.syncs.product_data table.product-list tr.horizontal-checkboxes { background-color: var(--dark-mode-2nd-bg-color); border-color: var(--dark-mode-main-border-color); } From d458b585394a1db7a541c219c2d7409414b50e99 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 10 Dec 2022 21:03:11 +0100 Subject: [PATCH 415/646] 913 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0eefae4e76..ae146165c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe - Hersteller können ihre Bestellungen über [eine neue API](https://foodcoopshop.github.io/de/netzwerk-modul.html#6-api-zum-abrufen-von-bestellungen) abrufen und sie so im eigenen System weiterverarbeiten. [I#894](https://github.com/foodcoopshop/foodcoopshop/issues/894) / [PR#899](https://github.com/foodcoopshop/foodcoopshop/pull/899) - Bei der Umsatzstatistik kann jetzt auch nach "letzte 12 bzw. 24 Monate" gefiltert werden. [I#904](https://github.com/foodcoopshop/foodcoopshop/issues/904) / [PR#908](https://github.com/foodcoopshop/foodcoopshop/pull/908) - Bei allen Produkten kann jetzt die Anzahl der bestellten Einheiten für den nächsten Abholtag angezeigt werden. Das hilft, wenn bestimmte Gebindegrößen erreicht werden sollen. [I#909](https://github.com/foodcoopshop/foodcoopshop/issues/909) / [PR#910](https://github.com/foodcoopshop/foodcoopshop/pull/910) +- Ab sofort kann auch ein dunkles Design verwendet werden. Das schont die Augen und spart bei OLED-Bildschirmen auch Strom. Einfach auf den Mond neben dem Anmelde-Link klicken. [I#873](https://github.com/foodcoopshop/foodcoopshop/issues/873) / [PR#913](https://github.com/foodcoopshop/foodcoopshop/pull/913) ### For developers - New 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) and [Gitpod-Integration](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop). [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) / [PR#879](https://github.com/foodcoopshop/foodcoopshop/pull/879) / [PR#881](https://github.com/foodcoopshop/foodcoopshop/pull/881) From f5dc08e6a6a83a58721f218051acf91cab6fe667 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 10 Dec 2022 21:23:34 +0100 Subject: [PATCH 416/646] datepicker --- webroot/css/dark-mode.css | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 7cd6e27464..4d5a46d1b9 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -34,6 +34,14 @@ body.dark.admin table.list, body.dark.admin #actionLogs div.changed { background-color: var(--dark-mode-main-bg-color); } +body.dark .ui-widget-header, +body.dark .ui-state-default, +body.dark .ui-widget-header .ui-state-hover { + color: var(--dark-mode-main-font-color); + border-color: var(--dark-mode-main-border-color); + background-color: var(--dark-mode-main-bg-color); + background-image: none; +} body.dark #main-menu li ul, body.dark #user-menu li ul, body.dark .bootstrap-select .dropdown-toggle, @@ -60,7 +68,8 @@ body.dark textarea, body.dark .pw .amount-wrapper .ordered-products-total-amount, body.dark .bootstrap-select .form-control:focus, body.dark.admin #home h1, -body.dark.admin ul.nav-tabs { +body.dark.admin ul.nav-tabs, +body.dark .ui-widget.ui-widget-content { background-color: var(--dark-mode-2nd-bg-color); color: var(--dark-mode-main-font-color); border-color: var(--dark-mode-main-border-color); From dc27f124c717ccba313a7ce4c0ddd0d2f66f5357 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 10 Dec 2022 21:33:27 +0100 Subject: [PATCH 417/646] vendor updates --- composer.lock | 56 +++++++++++++-------------- config/asset_compress.ini | 2 +- plugins/Admin/webroot/js/app.chart.js | 2 +- webroot/package-lock.json | 33 +++++++++------- webroot/package.json | 4 +- 5 files changed, 50 insertions(+), 47 deletions(-) diff --git a/composer.lock b/composer.lock index 0f1cbcaa8a..dab4661f6e 100644 --- a/composer.lock +++ b/composer.lock @@ -170,29 +170,29 @@ }, { "name": "cakephp/migrations", - "version": "3.6.0", + "version": "3.7.0", "source": { "type": "git", "url": "https://github.com/cakephp/migrations.git", - "reference": "e1a0a768d6ff572ef5a9aa9024243882f29c96c9" + "reference": "3656173785245edc62efb0694fd477b50eb7402e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/migrations/zipball/e1a0a768d6ff572ef5a9aa9024243882f29c96c9", - "reference": "e1a0a768d6ff572ef5a9aa9024243882f29c96c9", + "url": "https://api.github.com/repos/cakephp/migrations/zipball/3656173785245edc62efb0694fd477b50eb7402e", + "reference": "3656173785245edc62efb0694fd477b50eb7402e", "shasum": "" }, "require": { "cakephp/cache": "^4.3.0", "cakephp/orm": "^4.3.0", "php": ">=7.4.0", - "robmorgan/phinx": "^0.12" + "robmorgan/phinx": "^0.13.2" }, "require-dev": { "cakephp/bake": "^2.6.0", "cakephp/cakephp": "^4.3.0", "cakephp/cakephp-codesniffer": "^4.1", - "phpunit/phpunit": "^8.5.0 || ^9.5.0" + "phpunit/phpunit": "^9.5.0" }, "suggest": { "cakephp/bake": "If you want to generate migrations.", @@ -226,7 +226,7 @@ "issues": "https://github.com/cakephp/migrations/issues", "source": "https://github.com/cakephp/migrations" }, - "time": "2022-10-14T05:38:58+00:00" + "time": "2022-12-09T18:33:11+00:00" }, { "name": "cakephp/plugin-installer", @@ -1377,23 +1377,23 @@ }, { "name": "maennchen/zipstream-php", - "version": "2.3.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/maennchen/ZipStream-PHP.git", - "reference": "8df0a40fff7b5cbf86cf9a6d7d8d15b9bc03bc98" + "reference": "3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/8df0a40fff7b5cbf86cf9a6d7d8d15b9bc03bc98", - "reference": "8df0a40fff7b5cbf86cf9a6d7d8d15b9bc03bc98", + "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3", + "reference": "3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3", "shasum": "" }, "require": { + "ext-mbstring": "*", "myclabs/php-enum": "^1.5", "php": "^8.0", - "psr/http-message": "^1.0", - "symfony/polyfill-mbstring": "^1.0" + "psr/http-message": "^1.0" }, "require-dev": { "ext-zip": "*", @@ -1402,7 +1402,7 @@ "mikey179/vfsstream": "^1.6", "php-coveralls/php-coveralls": "^2.4", "phpunit/phpunit": "^8.5.8 || ^9.4.2", - "vimeo/psalm": "^4.1" + "vimeo/psalm": "^5.0" }, "type": "library", "autoload": { @@ -1439,7 +1439,7 @@ ], "support": { "issues": "https://github.com/maennchen/ZipStream-PHP/issues", - "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.3.0" + "source": "https://github.com/maennchen/ZipStream-PHP/tree/v2.4.0" }, "funding": [ { @@ -1451,7 +1451,7 @@ "type": "open_collective" } ], - "time": "2022-11-28T12:13:34+00:00" + "time": "2022-12-08T12:29:14+00:00" }, { "name": "markbaker/complex", @@ -2511,16 +2511,16 @@ }, { "name": "robmorgan/phinx", - "version": "0.12.13", + "version": "0.13.3", "source": { "type": "git", "url": "https://github.com/cakephp/phinx.git", - "reference": "6eb0f295e140ed2804d93396755f0ce9ada4ec07" + "reference": "da741d10879bcdd235a830d589ae51659f746262" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/phinx/zipball/6eb0f295e140ed2804d93396755f0ce9ada4ec07", - "reference": "6eb0f295e140ed2804d93396755f0ce9ada4ec07", + "url": "https://api.github.com/repos/cakephp/phinx/zipball/da741d10879bcdd235a830d589ae51659f746262", + "reference": "da741d10879bcdd235a830d589ae51659f746262", "shasum": "" }, "require": { @@ -2591,9 +2591,9 @@ ], "support": { "issues": "https://github.com/cakephp/phinx/issues", - "source": "https://github.com/cakephp/phinx/tree/0.12.13" + "source": "https://github.com/cakephp/phinx/tree/0.13.3" }, - "time": "2022-10-03T04:57:40+00:00" + "time": "2022-12-01T16:30:23+00:00" }, { "name": "seld/cli-prompt", @@ -5559,16 +5559,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.26", + "version": "9.5.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2" + "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/851867efcbb6a1b992ec515c71cdcf20d895e9d2", - "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38", + "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38", "shasum": "" }, "require": { @@ -5641,7 +5641,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.26" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27" }, "funding": [ { @@ -5657,7 +5657,7 @@ "type": "tidelift" } ], - "time": "2022-10-28T06:00:21+00:00" + "time": "2022-12-09T07:31:23+00:00" }, { "name": "psy/psysh", diff --git a/config/asset_compress.ini b/config/asset_compress.ini index c3aca27029..08da316807 100644 --- a/config/asset_compress.ini +++ b/config/asset_compress.ini @@ -61,7 +61,7 @@ files[] = blueimp-file-upload/js/jquery.iframe-transport.js files[] = jquery-knob/js/jquery.knob.js files[] = blueimp-file-upload/js/vendor/jquery.ui.widget.js files[] = clipboard/dist/clipboard.js -files[] = chart.js/dist/chart.js +files[] = chart.js/dist/chart.umd.js files[] = chartjs-plugin-datalabels/dist/chartjs-plugin-datalabels.js files[] = js-cookie/dist/js.cookie.js files[] = helper.js diff --git a/plugins/Admin/webroot/js/app.chart.js b/plugins/Admin/webroot/js/app.chart.js index bf5386307c..e755b6409c 100644 --- a/plugins/Admin/webroot/js/app.chart.js +++ b/plugins/Admin/webroot/js/app.chart.js @@ -74,7 +74,7 @@ foodcoopshop.AppChart = { tooltip: { callbacks: { label: function(ctx) { - return ctx.label + ': ' + foodcoopshop.Helper.formatFloatAsCurrency(ctx.parsed); + return foodcoopshop.Helper.formatFloatAsCurrency(ctx.parsed); } } }, diff --git a/webroot/package-lock.json b/webroot/package-lock.json index 87afafec42..81f4a1d366 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -14,8 +14,8 @@ "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.3", "bootstrap-select": "^1.14.0-beta3", - "chart.js": "^3.9.1", - "chartjs-plugin-datalabels": "^2.1.0", + "chart.js": "^4.0.1", + "chartjs-plugin-datalabels": "^2.2.0", "ckeditor4": "^4.20.1", "clean-css-cli": "^5.6.1", "clipboard": "^2.0.11", @@ -248,16 +248,19 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "node_modules/chart.js": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz", - "integrity": "sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w==" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.0.1.tgz", + "integrity": "sha512-5/8/9eBivwBZK81mKvmIwTb2Pmw4D/5h1RK9fBWZLLZ8mCJ+kfYNmV9rMrGoa5Hgy2/wVDBMLSUDudul2/9ihA==", + "engines": { + "pnpm": "^7.0.0" + } }, "node_modules/chartjs-plugin-datalabels": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.1.0.tgz", - "integrity": "sha512-WA6R4saSlY6mnyX78SkbSo2gGc+cj87lFi5zBrsjjYxE76JgXyxHa1OTodVCzRPoqeYJqSEOffeJ/897kRHR6w==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.2.0.tgz", + "integrity": "sha512-14ZU30lH7n89oq+A4bWaJPnAG8a7ZTk7dKf48YAzMvJjQtjrgg5Dpk9f+LbjCF6bpx3RAGTeL13IXpKQYyRvlw==", "peerDependencies": { - "chart.js": "^3.0.0" + "chart.js": ">=3.0.0" } }, "node_modules/chokidar": { @@ -1290,14 +1293,14 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "chart.js": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz", - "integrity": "sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w==" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.0.1.tgz", + "integrity": "sha512-5/8/9eBivwBZK81mKvmIwTb2Pmw4D/5h1RK9fBWZLLZ8mCJ+kfYNmV9rMrGoa5Hgy2/wVDBMLSUDudul2/9ihA==" }, "chartjs-plugin-datalabels": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.1.0.tgz", - "integrity": "sha512-WA6R4saSlY6mnyX78SkbSo2gGc+cj87lFi5zBrsjjYxE76JgXyxHa1OTodVCzRPoqeYJqSEOffeJ/897kRHR6w==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.2.0.tgz", + "integrity": "sha512-14ZU30lH7n89oq+A4bWaJPnAG8a7ZTk7dKf48YAzMvJjQtjrgg5Dpk9f+LbjCF6bpx3RAGTeL13IXpKQYyRvlw==", "requires": {} }, "chokidar": { diff --git a/webroot/package.json b/webroot/package.json index 96db95e93e..b29fb5d726 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -20,8 +20,8 @@ "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.3", "bootstrap-select": "^1.14.0-beta3", - "chart.js": "^3.9.1", - "chartjs-plugin-datalabels": "^2.1.0", + "chart.js": "^4.0.1", + "chartjs-plugin-datalabels": "^2.2.0", "ckeditor4": "^4.20.1", "clean-css-cli": "^5.6.1", "clipboard": "^2.0.11", From 0165d681a6a818973f33d3859275c75bc779eda4 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 10 Dec 2022 21:37:35 +0100 Subject: [PATCH 418/646] declaration fix --- config/Seeds/AddTaxesAustriaSeed.php | 2 +- config/Seeds/AddTaxesGermanySeed.php | 2 +- config/Seeds/InitDataSeed.php | 2 +- config/Seeds/tests/InitTestDataSeed.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/Seeds/AddTaxesAustriaSeed.php b/config/Seeds/AddTaxesAustriaSeed.php index 967d8ff58e..707d87ff4e 100644 --- a/config/Seeds/AddTaxesAustriaSeed.php +++ b/config/Seeds/AddTaxesAustriaSeed.php @@ -5,7 +5,7 @@ class AddTaxesAustriaSeed extends AbstractSeed { - public function run() + public function run(): void { $query = " INSERT INTO `fcs_tax` VALUES diff --git a/config/Seeds/AddTaxesGermanySeed.php b/config/Seeds/AddTaxesGermanySeed.php index dfa8982cc0..8a5d38946a 100644 --- a/config/Seeds/AddTaxesGermanySeed.php +++ b/config/Seeds/AddTaxesGermanySeed.php @@ -5,7 +5,7 @@ class AddTaxesGermanySeed extends AbstractSeed { - public function run() + public function run(): void { $query = " INSERT INTO `fcs_tax` VALUES diff --git a/config/Seeds/InitDataSeed.php b/config/Seeds/InitDataSeed.php index 6e41fcbd62..0077a33aa7 100644 --- a/config/Seeds/InitDataSeed.php +++ b/config/Seeds/InitDataSeed.php @@ -5,7 +5,7 @@ class InitDataSeed extends AbstractSeed { - public function run() + public function run(): void { $query = " INSERT INTO `fcs_cronjobs` VALUES diff --git a/config/Seeds/tests/InitTestDataSeed.php b/config/Seeds/tests/InitTestDataSeed.php index 002c4bb6bf..133eeed961 100644 --- a/config/Seeds/tests/InitTestDataSeed.php +++ b/config/Seeds/tests/InitTestDataSeed.php @@ -5,7 +5,7 @@ class InitTestDataSeed extends AbstractSeed { - public function run() + public function run(): void { $query = " /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; From f173bbab4a9bb1b20713c3334239e8fb0f3b5756 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 11 Dec 2022 19:31:03 +0100 Subject: [PATCH 419/646] change heading color dark mode --- webroot/css/frontend.css | 1 - 1 file changed, 1 deletion(-) diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index 494dcb1a19..0c5b8742b1 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -1263,7 +1263,6 @@ body.blog_posts.detail #inner-content .content h2, body.pages:not(.home) #inner-content h2, body.manufacturers.detail .manufacturer-infos h2, body.categories.detail .description-wrapper h2 { - color: #333; padding-top: 10px; font-size: 18px; } From 72743df42eea7abedd36d2656b3ac74082db2d1a Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 11 Dec 2022 19:33:19 +0100 Subject: [PATCH 420/646] edit icon white dark mode --- webroot/css/dark-mode.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 4d5a46d1b9..8d7d7dc1b2 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -107,7 +107,8 @@ body.dark .bootstrap-select .dropdown-menu li a span.text, body.dark .bootstrap-select .no-results, body.dark .bootstrap-select > .dropdown-toggle:after, body.dark.admin .filter-container, -body.dark.admin a.btn i:not(.not-ok) { +body.dark.admin a.btn i:not(.not-ok), +body.dark a.btn.edit-shortcut-button i { color: var(--dark-mode-main-font-color); } body.dark h2.warning, From 9ebe411deb7749afc8c856f8bdceb8a228fcae51 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 11 Dec 2022 19:47:29 +0100 Subject: [PATCH 421/646] mobile hover color fix --- webroot/css/mobile-dark-mode.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webroot/css/mobile-dark-mode.css b/webroot/css/mobile-dark-mode.css index 2d9c0e53af..8fc96c0618 100644 --- a/webroot/css/mobile-dark-mode.css +++ b/webroot/css/mobile-dark-mode.css @@ -23,7 +23,8 @@ body.dark.admin .sb-toggle-left { color: var(--dark-mode-main-font-color) ! important; } - body.dark .sb-slidebar li a.active { + body.dark .sb-slidebar li a.active, + body.dark .sb-slidebar li a:hover { color: var(--dark-mode-2nd-font-color) ! important; } body.dark .sb-left a, From 3dabe131e99fa8174c05f26b19b25a049e52f7a8 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 11 Dec 2022 20:31:31 +0100 Subject: [PATCH 422/646] chart color fixes dark mode --- plugins/Admin/webroot/js/app.chart.js | 28 +++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/plugins/Admin/webroot/js/app.chart.js b/plugins/Admin/webroot/js/app.chart.js index eaf3bf322a..8d19ec68d1 100644 --- a/plugins/Admin/webroot/js/app.chart.js +++ b/plugins/Admin/webroot/js/app.chart.js @@ -15,6 +15,14 @@ foodcoopshop.AppChart = { color: '#cccccc', // default color + getFontColor: function() { + return foodcoopshop.Helper.getColorMode() == 'dark' ? '#CDCDCD' : '#333333'; + }, + + getGridColor: function() { + return foodcoopshop.Helper.getColorMode() == 'dark' ? '#696969' : '#dfdfdf'; + }, + barChartOptions : { plugins: { legend: { @@ -57,8 +65,9 @@ foodcoopshop.AppChart = { ticks: { callback: function(value, index, values) { return foodcoopshop.Helper.formatFloatAsCurrency(value); - } - } + }, + }, + grid: {} }, } }, @@ -123,7 +132,8 @@ foodcoopshop.AppChart = { x: { grid: { display: false - } + }, + ticks: {} }, y: { beginAtZero: true, @@ -131,7 +141,8 @@ foodcoopshop.AppChart = { callback: function(value, index, values) { return foodcoopshop.Helper.formatFloatAsCurrency(value); } - } + }, + grid: {} } } }, @@ -155,6 +166,10 @@ foodcoopshop.AppChart = { }], }; + this.lineChartOptions.scales.x.ticks.color = this.getFontColor(); + this.lineChartOptions.scales.y.ticks.color = this.getFontColor(); + this.lineChartOptions.scales.y.grid.color = this.getGridColor(); + var ctx = $('#myLineChart').get(0).getContext('2d'); new Chart(ctx, { responsive : true, @@ -262,6 +277,7 @@ foodcoopshop.AppChart = { type: 'line', } ); + this.barChartOptions.scales.y1 = { type: 'linear', display: true, @@ -275,6 +291,10 @@ foodcoopshop.AppChart = { display: false, }, }; + this.barChartOptions.scales.x.ticks.color = this.getFontColor(); + this.barChartOptions.scales.y.ticks.color = this.getFontColor(); + this.barChartOptions.plugins.legend.labels = {color: this.getFontColor()}; + this.barChartOptions.scales.y.grid.color = this.getGridColor(); } var ctx = $('#myBarChart').get(0).getContext('2d'); From d24a47e9452148c6daf23eee3775a5dbad30d337 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 11 Dec 2022 20:32:24 +0100 Subject: [PATCH 423/646] small layout fix --- webroot/css/frontend.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index 0c5b8742b1..592cdb9d7c 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -1167,7 +1167,7 @@ a.blog-post-wrapper:nth-of-type(3n) { } a.blog-post-wrapper img { padding: 2px; - margin-bottom: 3px; + margin-bottom: 5px; max-width: 100%; max-height: 100%; } From 3d4e9d468d53fca3826abd3d730cdfe378cb9912 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 11 Dec 2022 20:39:40 +0100 Subject: [PATCH 424/646] delivery break dark mode --- webroot/css/dark-mode.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 8d7d7dc1b2..49b9d093e1 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -24,7 +24,7 @@ body.dark .sidebar, body.dark .box, body.dark #inner-content, body.dark .modal-content, -body.dark .btn-outline-light.disabled, +body.dark .btn-outline-light.disabled:not(.btn-danger), body.dark .self-service .header, body.dark .self-service #SelfServiceForm, body.dark .self-service #login-form h2 span, @@ -48,7 +48,8 @@ body.dark .bootstrap-select .dropdown-toggle, body.dark .bootstrap-select .dropdown-menu, body.dark .bootstrap-select .no-results, body.dark form.sync-login-form, -body.dark.syncs.product_data table.product-list tr.horizontal-checkboxes { +body.dark.syncs.product_data table.product-list tr.horizontal-checkboxes, +body.dark .pw.delivery-break-enabled { background-color: var(--dark-mode-2nd-bg-color); border-color: var(--dark-mode-main-border-color); } @@ -58,7 +59,7 @@ body.dark .vertical.menu a { body.dark .modal-content { border: 1px solid var(--dark-mode-main-border-color); } -body.dark .btn-outline-light, +body.dark .btn-outline-light:not(.btn-danger), body.dark select, body.dark #product-search input, body.dark #product-search select, From 1ad8c240899487dc60e9fc39369a6949c4ef300f Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 11 Dec 2022 20:54:30 +0100 Subject: [PATCH 425/646] tick color fix --- plugins/Admin/webroot/js/app.chart.js | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/Admin/webroot/js/app.chart.js b/plugins/Admin/webroot/js/app.chart.js index 8d19ec68d1..b1471173a1 100644 --- a/plugins/Admin/webroot/js/app.chart.js +++ b/plugins/Admin/webroot/js/app.chart.js @@ -293,6 +293,7 @@ foodcoopshop.AppChart = { }; this.barChartOptions.scales.x.ticks.color = this.getFontColor(); this.barChartOptions.scales.y.ticks.color = this.getFontColor(); + this.barChartOptions.scales.y1.ticks.color = this.getFontColor(); this.barChartOptions.plugins.legend.labels = {color: this.getFontColor()}; this.barChartOptions.scales.y.grid.color = this.getGridColor(); } From 45584c15cf565e03eeb0ca7fdced00b1f5a0c301 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 11 Dec 2022 20:55:47 +0100 Subject: [PATCH 426/646] deposit chart colors --- plugins/Admin/webroot/js/app.chart.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/plugins/Admin/webroot/js/app.chart.js b/plugins/Admin/webroot/js/app.chart.js index b1471173a1..93cfd38972 100644 --- a/plugins/Admin/webroot/js/app.chart.js +++ b/plugins/Admin/webroot/js/app.chart.js @@ -223,6 +223,10 @@ foodcoopshop.AppChart = { var lineChartOptions = this.lineChartOptions; lineChartOptions.plugins.legend.display = true; + lineChartOptions.scales.x.ticks.color = this.getFontColor(); + lineChartOptions.scales.y.ticks.color = this.getFontColor(); + lineChartOptions.plugins.legend.labels = {color: this.getFontColor()}; + lineChartOptions.scales.y.grid.color = this.getGridColor(); var ctx = $('#myLineChart').get(0).getContext('2d'); new Chart(ctx, { @@ -278,7 +282,7 @@ foodcoopshop.AppChart = { } ); - this.barChartOptions.scales.y1 = { + lineChartOptions.scales.y1 = { type: 'linear', display: true, position: 'right', @@ -291,11 +295,11 @@ foodcoopshop.AppChart = { display: false, }, }; - this.barChartOptions.scales.x.ticks.color = this.getFontColor(); - this.barChartOptions.scales.y.ticks.color = this.getFontColor(); - this.barChartOptions.scales.y1.ticks.color = this.getFontColor(); - this.barChartOptions.plugins.legend.labels = {color: this.getFontColor()}; - this.barChartOptions.scales.y.grid.color = this.getGridColor(); + lineChartOptions.scales.x.ticks.color = this.getFontColor(); + lineChartOptions.scales.y.ticks.color = this.getFontColor(); + lineChartOptions.scales.y1.ticks.color = this.getFontColor(); + lineChartOptions.plugins.legend.labels = {color: this.getFontColor()}; + lineChartOptions.scales.y.grid.color = this.getGridColor(); } var ctx = $('#myBarChart').get(0).getContext('2d'); @@ -303,7 +307,7 @@ foodcoopshop.AppChart = { responsive : true, type: 'bar', data: barChartData, - options: this.barChartOptions + options: lineChartOptions }); }, From db254b09cb98b40b7b39f7d23d576110ea0e687e Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 11 Dec 2022 21:02:11 +0100 Subject: [PATCH 427/646] fix auto replacement --- plugins/Admin/webroot/js/app.chart.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/Admin/webroot/js/app.chart.js b/plugins/Admin/webroot/js/app.chart.js index 93cfd38972..1a08660704 100644 --- a/plugins/Admin/webroot/js/app.chart.js +++ b/plugins/Admin/webroot/js/app.chart.js @@ -282,7 +282,7 @@ foodcoopshop.AppChart = { } ); - lineChartOptions.scales.y1 = { + this.barChartOptions.scales.y1 = { type: 'linear', display: true, position: 'right', @@ -295,11 +295,11 @@ foodcoopshop.AppChart = { display: false, }, }; - lineChartOptions.scales.x.ticks.color = this.getFontColor(); - lineChartOptions.scales.y.ticks.color = this.getFontColor(); - lineChartOptions.scales.y1.ticks.color = this.getFontColor(); - lineChartOptions.plugins.legend.labels = {color: this.getFontColor()}; - lineChartOptions.scales.y.grid.color = this.getGridColor(); + this.barChartOptions.scales.x.ticks.color = this.getFontColor(); + this.barChartOptions.scales.y.ticks.color = this.getFontColor(); + this.barChartOptions.scales.y1.ticks.color = this.getFontColor(); + this.barChartOptions.plugins.legend.labels = {color: this.getFontColor()}; + this.barChartOptions.scales.y.grid.color = this.getGridColor(); } var ctx = $('#myBarChart').get(0).getContext('2d'); @@ -307,7 +307,7 @@ foodcoopshop.AppChart = { responsive : true, type: 'bar', data: barChartData, - options: lineChartOptions + options: this.barChartOptions }); }, From 63aa88c042915352dae6726a22fc6fd95b2148c7 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 11 Dec 2022 22:19:41 +0100 Subject: [PATCH 428/646] red border --- webroot/css/dark-mode.css | 1 - webroot/css/frontend.css | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 49b9d093e1..0b2e5f2ed7 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -66,7 +66,6 @@ body.dark #product-search select, body.dark input, body.dark .pw .amount-wrapper input, body.dark textarea, -body.dark .pw .amount-wrapper .ordered-products-total-amount, body.dark .bootstrap-select .form-control:focus, body.dark.admin #home h1, body.dark.admin ul.nav-tabs, diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index 592cdb9d7c..745282e6dc 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -589,7 +589,7 @@ body.products.detail .pw.delivery-break-enabled .descriptions { .pw .amount-wrapper .ordered-products-total-amount { float: right; border-radius: 50%; - border: 1px solid #d6d4d4; + border: 1px solid var(--not-ok-red); text-align: center; width: 30px; height: 30px; From ab3871ed815dd1bd6740f1c38ef895b3e2aa2c5a Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 12 Dec 2022 18:32:49 +0100 Subject: [PATCH 429/646] chart dark mode for foodcoops --- plugins/Admin/webroot/js/app.chart.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/Admin/webroot/js/app.chart.js b/plugins/Admin/webroot/js/app.chart.js index 1a08660704..d03264a35a 100644 --- a/plugins/Admin/webroot/js/app.chart.js +++ b/plugins/Admin/webroot/js/app.chart.js @@ -295,13 +295,14 @@ foodcoopshop.AppChart = { display: false, }, }; - this.barChartOptions.scales.x.ticks.color = this.getFontColor(); - this.barChartOptions.scales.y.ticks.color = this.getFontColor(); this.barChartOptions.scales.y1.ticks.color = this.getFontColor(); - this.barChartOptions.plugins.legend.labels = {color: this.getFontColor()}; - this.barChartOptions.scales.y.grid.color = this.getGridColor(); } + this.barChartOptions.scales.x.ticks.color = this.getFontColor(); + this.barChartOptions.scales.y.ticks.color = this.getFontColor(); + this.barChartOptions.plugins.legend.labels = {color: this.getFontColor()}; + this.barChartOptions.scales.y.grid.color = this.getGridColor(); + var ctx = $('#myBarChart').get(0).getContext('2d'); new Chart(ctx, { responsive : true, From 81ba5205e0d69dd779f6d59a24e6991603c3dde6 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 13 Dec 2022 09:23:31 +0100 Subject: [PATCH 430/646] vendor updates --- composer.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/composer.lock b/composer.lock index dab4661f6e..ba9da60637 100644 --- a/composer.lock +++ b/composer.lock @@ -170,16 +170,16 @@ }, { "name": "cakephp/migrations", - "version": "3.7.0", + "version": "3.7.1", "source": { "type": "git", "url": "https://github.com/cakephp/migrations.git", - "reference": "3656173785245edc62efb0694fd477b50eb7402e" + "reference": "bbe44b610bbf51bda751114ecabfe5dd172a6dab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/migrations/zipball/3656173785245edc62efb0694fd477b50eb7402e", - "reference": "3656173785245edc62efb0694fd477b50eb7402e", + "url": "https://api.github.com/repos/cakephp/migrations/zipball/bbe44b610bbf51bda751114ecabfe5dd172a6dab", + "reference": "bbe44b610bbf51bda751114ecabfe5dd172a6dab", "shasum": "" }, "require": { @@ -226,7 +226,7 @@ "issues": "https://github.com/cakephp/migrations/issues", "source": "https://github.com/cakephp/migrations" }, - "time": "2022-12-09T18:33:11+00:00" + "time": "2022-12-10T12:39:01+00:00" }, { "name": "cakephp/plugin-installer", @@ -3524,16 +3524,16 @@ }, { "name": "tecnickcom/tcpdf", - "version": "6.6.0", + "version": "6.6.1", "source": { "type": "git", "url": "https://github.com/tecnickcom/TCPDF.git", - "reference": "154bba45ffc9c2a049aa9e21501d02472b24deb4" + "reference": "a336b531f6f6b5487fca0caf034a671d4e60df5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/154bba45ffc9c2a049aa9e21501d02472b24deb4", - "reference": "154bba45ffc9c2a049aa9e21501d02472b24deb4", + "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/a336b531f6f6b5487fca0caf034a671d4e60df5c", + "reference": "a336b531f6f6b5487fca0caf034a671d4e60df5c", "shasum": "" }, "require": { @@ -3584,7 +3584,7 @@ ], "support": { "issues": "https://github.com/tecnickcom/TCPDF/issues", - "source": "https://github.com/tecnickcom/TCPDF/tree/6.6.0" + "source": "https://github.com/tecnickcom/TCPDF/tree/v" }, "funding": [ { @@ -3592,7 +3592,7 @@ "type": "custom" } ], - "time": "2022-12-06T09:28:13+00:00" + "time": "2022-12-12T14:42:28+00:00" }, { "name": "ua-parser/uap-php", @@ -5241,16 +5241,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.19", + "version": "9.2.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559" + "reference": "af7463c955007de36db0c5e26d03e2f933c2e980" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559", - "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/af7463c955007de36db0c5e26d03e2f933c2e980", + "reference": "af7463c955007de36db0c5e26d03e2f933c2e980", "shasum": "" }, "require": { @@ -5306,7 +5306,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.20" }, "funding": [ { @@ -5314,7 +5314,7 @@ "type": "github" } ], - "time": "2022-11-18T07:47:47+00:00" + "time": "2022-12-13T07:49:28+00:00" }, { "name": "phpunit/php-file-iterator", From d9e1561595d4754da5e839c2e09fc54d1f9be79d Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 14 Dec 2022 07:59:54 +0100 Subject: [PATCH 431/646] dark mode fixes for datepicker and tab navi --- webroot/css/dark-mode.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 0b2e5f2ed7..9f913e436c 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -153,6 +153,7 @@ body.dark .vertical.menu a:hover span.additional-info { body.dark.admin ul.nav-tabs li.active a, body.dark.admin ul.nav-tabs li a:hover { background-color: var(--dark-mode-main-bg-color) ! important; + } body.dark a.blog-post-wrapper:hover { opacity: .8; @@ -214,7 +215,8 @@ body.dark.admin .vertical.menu > li img.logo { } body.dark ul.menu.vertical:not(#user-menu):not(#footer-menu) a:hover, body.dark ul.menu.vertical:not(#user-menu):not(#footer-menu) a.active, -body.dark #footer a:hover { +body.dark #footer a:hover, +body.dark .ui-datepicker-calendar .ui-state-active { text-decoration: underline ! important; } body.dark .blog-wrapper .swiper-button-prev, From b84556d8035b96dc9ac449159b5c39501960f110 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 14 Dec 2022 08:03:51 +0100 Subject: [PATCH 432/646] update to php 8.2 --- Dockerfile | 2 +- README.md | 2 +- composer.json | 4 ++-- config/requirements.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e158279c21..ff5a87f875 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM node:18-alpine AS node -FROM webdevops/php-nginx:8.1-alpine +FROM webdevops/php-nginx:8.2-alpine #https://stackoverflow.com/questions/44447821/how-to-create-a-docker-image-for-php-and-node COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules diff --git a/README.md b/README.md index bbb4f85960..6aef82b4b8 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ ## ✔ Requirements * Server with **shell access** and **cronjobs** * Apache with `mod_rewrite` -* PHP >= 8.1 +* PHP >= 8.2 * PHP intl extension INTL_ICU_VERSION >= 50.1 * PHP bzip2 lib (for automatic database backups) * MySQL >= 8.0 diff --git a/composer.json b/composer.json index 4a7c8b0a95..e403708054 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "config": { "platform": { - "php": "8.1" + "php": "8.2" }, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true, @@ -19,7 +19,7 @@ } }, "require": { - "php": ">=8.1", + "php": ">=8.2", "cakephp/cakephp": "4.4.*", "cakephp/migrations": "^3.0", "cakephp/plugin-installer": "^1.0", diff --git a/config/requirements.php b/config/requirements.php index 670168a2c2..a16d43ee9d 100644 --- a/config/requirements.php +++ b/config/requirements.php @@ -22,8 +22,8 @@ /* * You can remove this if you are confident that your PHP version is sufficient. */ -if (version_compare(PHP_VERSION, '8.1.0') < 0) { - trigger_error('Your PHP version must be equal or higher than 8.1.0 to use CakePHP.', E_USER_ERROR); +if (version_compare(PHP_VERSION, '8.2.0') < 0) { + trigger_error('Your PHP version must be equal or higher than 8.2.0 to use CakePHP.', E_USER_ERROR); } /* From 7121f578df5a7613bcc9601f6d3ebaecc8c4e470 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 14 Dec 2022 08:50:28 +0100 Subject: [PATCH 433/646] no dynamic properties any more --- src/Lib/Pdf/CustomerInvoiceBaseTcpdf.php | 2 ++ src/Lib/Pdf/ListTcpdf.php | 2 ++ src/Model/Table/CartProductsTable.php | 2 ++ src/Model/Table/CartsTable.php | 2 ++ src/Model/Table/CategoriesTable.php | 2 ++ src/Model/Table/CustomersTable.php | 2 ++ src/Model/Table/ManufacturersTable.php | 2 ++ src/Model/Table/OrderDetailsTable.php | 2 ++ src/Model/Table/ProductAttributesTable.php | 4 ++++ src/Model/Table/ProductsTable.php | 4 ++++ src/Model/Table/PurchasePriceProductsTable.php | 2 ++ .../Task/GenerateInvoiceForManufacturerTask.php | 11 ++++++----- src/Queue/Task/GenerateOrderListTask.php | 14 ++++++-------- src/Queue/Task/UpdateActionLogTrait.php | 6 ++++-- 14 files changed, 42 insertions(+), 15 deletions(-) diff --git a/src/Lib/Pdf/CustomerInvoiceBaseTcpdf.php b/src/Lib/Pdf/CustomerInvoiceBaseTcpdf.php index 2c4396cafc..5cba7eab03 100644 --- a/src/Lib/Pdf/CustomerInvoiceBaseTcpdf.php +++ b/src/Lib/Pdf/CustomerInvoiceBaseTcpdf.php @@ -32,6 +32,8 @@ abstract class CustomerInvoiceBaseTcpdf extends AppTcpdf implements CustomerInvo public $headers = []; + public $html; + public function __construct($orientation = 'P', $unit = 'mm', $format = 'A4', $unicode = true, $encoding = 'UTF-8', $diskcache = false, $pdfa = false) { parent::__construct($orientation, $unit, $format, $unicode, $encoding, $diskcache, $pdfa); diff --git a/src/Lib/Pdf/ListTcpdf.php b/src/Lib/Pdf/ListTcpdf.php index 82e9e80779..5df9aeb328 100644 --- a/src/Lib/Pdf/ListTcpdf.php +++ b/src/Lib/Pdf/ListTcpdf.php @@ -28,6 +28,8 @@ class ListTcpdf extends AppTcpdf public $infoTextForFooter = ''; + public $html; + public function __construct($orientation = 'P', $unit = 'mm', $format = 'A4', $unicode = true, $encoding = 'UTF-8', $diskcache = false, $pdfa = false) { parent::__construct($orientation, $unit, $format, $unicode, $encoding, $diskcache, $pdfa); diff --git a/src/Model/Table/CartProductsTable.php b/src/Model/Table/CartProductsTable.php index fac80efb14..c98e0776c4 100644 --- a/src/Model/Table/CartProductsTable.php +++ b/src/Model/Table/CartProductsTable.php @@ -24,6 +24,8 @@ class CartProductsTable extends AppTable { + private $Cart; + public function initialize(array $config): void { parent::initialize($config); diff --git a/src/Model/Table/CartsTable.php b/src/Model/Table/CartsTable.php index 09c9fc7d8e..05a425dd9d 100644 --- a/src/Model/Table/CartsTable.php +++ b/src/Model/Table/CartsTable.php @@ -32,6 +32,8 @@ class CartsTable extends AppTable public const CART_SELF_SERVICE_PAYMENT_TYPE_CASH = 1; public const CART_SELF_SERVICE_PAYMENT_TYPE_CREDIT = 2; + private $Product; + public function initialize(array $config): void { parent::initialize($config); diff --git a/src/Model/Table/CategoriesTable.php b/src/Model/Table/CategoriesTable.php index 76511b8622..2702827acf 100644 --- a/src/Model/Table/CategoriesTable.php +++ b/src/Model/Table/CategoriesTable.php @@ -26,6 +26,8 @@ class CategoriesTable extends AppTable use ProductCacheClearAfterSaveAndDeleteTrait; + private $Catalog; + public function initialize(array $config): void { $this->setTable('category'); diff --git a/src/Model/Table/CustomersTable.php b/src/Model/Table/CustomersTable.php index e59ac1df5a..2377a51e34 100644 --- a/src/Model/Table/CustomersTable.php +++ b/src/Model/Table/CustomersTable.php @@ -27,6 +27,8 @@ class CustomersTable extends AppTable { + private $Product; + public function initialize(array $config): void { $this->setTable('customer'); diff --git a/src/Model/Table/ManufacturersTable.php b/src/Model/Table/ManufacturersTable.php index 74fa5ca591..64ab5f7cfb 100644 --- a/src/Model/Table/ManufacturersTable.php +++ b/src/Model/Table/ManufacturersTable.php @@ -28,6 +28,8 @@ class ManufacturersTable extends AppTable use ProductCacheClearAfterSaveAndDeleteTrait; + private $Catalog; + public function initialize(array $config): void { $this->setTable('manufacturer'); diff --git a/src/Model/Table/OrderDetailsTable.php b/src/Model/Table/OrderDetailsTable.php index 0e78fe9c62..3ded8df426 100644 --- a/src/Model/Table/OrderDetailsTable.php +++ b/src/Model/Table/OrderDetailsTable.php @@ -27,6 +27,8 @@ class OrderDetailsTable extends AppTable { use ProductCacheClearAfterSaveAndDeleteTrait; + + private $Manufacturer; public function initialize(array $config): void { diff --git a/src/Model/Table/ProductAttributesTable.php b/src/Model/Table/ProductAttributesTable.php index 375ac06b87..f41e9948e2 100644 --- a/src/Model/Table/ProductAttributesTable.php +++ b/src/Model/Table/ProductAttributesTable.php @@ -24,6 +24,10 @@ class ProductAttributesTable extends AppTable use ProductCacheClearAfterSaveAndDeleteTrait; + private $BarcodeProduct; + private $Product; + private $StockAvailable; + public function initialize(array $config): void { $this->setTable('product_attribute'); diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index 3be99cfe00..3b7b8ba90b 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -36,6 +36,10 @@ class ProductsTable extends AppTable public const ALLOWED_TAGS_DESCRIPTION_SHORT = '


'; public const ALLOWED_TAGS_DESCRIPTION = '


'; + private $Configuration; + private $Manufacturer; + private $Unit; + public function initialize(array $config): void { $this->setTable('product'); diff --git a/src/Model/Table/PurchasePriceProductsTable.php b/src/Model/Table/PurchasePriceProductsTable.php index 93e6816a39..0def83cd16 100644 --- a/src/Model/Table/PurchasePriceProductsTable.php +++ b/src/Model/Table/PurchasePriceProductsTable.php @@ -28,6 +28,8 @@ class PurchasePriceProductsTable extends AppTable use ProductAndAttributeEntityTrait; use ProductCacheClearAfterSaveAndDeleteTrait; + private $Product; + public function initialize(array $config): void { $this->setTable('purchase_prices'); diff --git a/src/Queue/Task/GenerateInvoiceForManufacturerTask.php b/src/Queue/Task/GenerateInvoiceForManufacturerTask.php index 2ef7c4e167..0ec757ccf1 100644 --- a/src/Queue/Task/GenerateInvoiceForManufacturerTask.php +++ b/src/Queue/Task/GenerateInvoiceForManufacturerTask.php @@ -3,10 +3,11 @@ namespace App\Queue\Task; -use App\Lib\PdfWriter\InvoiceToManufacturerPdfWriter; -use App\Mailer\AppMailer; -use Cake\Core\Configure; use Queue\Queue\Task; +use Cake\Core\Configure; +use App\Mailer\AppMailer; +use Cake\Datasource\FactoryLocator; +use App\Lib\PdfWriter\InvoiceToManufacturerPdfWriter; /** * FoodCoopShop - The open source software for your foodcoop @@ -46,7 +47,7 @@ public function run(array $data, $jobId) : void $dateFrom = $data['dateFrom']; $dateTo = $data['dateTo']; - $this->Manufacturer = $this->loadModel('Manufacturers'); + $this->Manufacturer = FactoryLocator::get('Table')->get('Manufacturers'); $manufacturer = $this->Manufacturer->getManufacturerByIdForSendingOrderListsOrInvoice($manufacturerId); $validOrderStates = [ @@ -71,7 +72,7 @@ public function run(array $data, $jobId) : void $this->Manufacturer->Invoices->newEntity($invoice2save) ); - $this->OrderDetail = $this->loadModel('OrderDetails'); + $this->OrderDetail = FactoryLocator::get('Table')->get('OrderDetails'); $this->OrderDetail->updateOrderState($dateFrom, $dateTo, $validOrderStates, Configure::read('app.htmlHelper')->getOrderStateBilled(), $manufacturer->id_manufacturer); $sendInvoice = $this->Manufacturer->getOptionSendInvoice($manufacturer->send_invoice); diff --git a/src/Queue/Task/GenerateOrderListTask.php b/src/Queue/Task/GenerateOrderListTask.php index 5d1a675df8..94edf57f18 100644 --- a/src/Queue/Task/GenerateOrderListTask.php +++ b/src/Queue/Task/GenerateOrderListTask.php @@ -3,11 +3,12 @@ namespace App\Queue\Task; +use Queue\Queue\Task; +use Cake\Core\Configure; use App\Mailer\AppMailer; -use App\Lib\PdfWriter\OrderListByCustomerPdfWriter; +use Cake\Datasource\FactoryLocator; use App\Lib\PdfWriter\OrderListByProductPdfWriter; -use Cake\Core\Configure; -use Queue\Queue\Task; +use App\Lib\PdfWriter\OrderListByCustomerPdfWriter; /** * FoodCoopShop - The open source software for your foodcoop @@ -26,13 +27,10 @@ class GenerateOrderListTask extends Task { use UpdateActionLogTrait; - + public $Manufacturer; - public $QueuedJobs; - public $timeout = 30; - public $retries = 2; public function run(array $data, $jobId) : void @@ -44,7 +42,7 @@ public function run(array $data, $jobId) : void $orderDetailIds = $data['orderDetailIds']; $actionLogId = $data['actionLogId']; - $this->Manufacturer = $this->loadModel('Manufacturers'); + $this->Manufacturer = FactoryLocator::get('Table')->get('Manufacturers'); $manufacturer = $this->Manufacturer->getManufacturerByIdForSendingOrderListsOrInvoice($manufacturerId); $currentDateForOrderLists = Configure::read('app.timeHelper')->getCurrentDateTimeForFilename(); diff --git a/src/Queue/Task/UpdateActionLogTrait.php b/src/Queue/Task/UpdateActionLogTrait.php index caff4e6b7d..89233f43ef 100644 --- a/src/Queue/Task/UpdateActionLogTrait.php +++ b/src/Queue/Task/UpdateActionLogTrait.php @@ -5,6 +5,7 @@ use Cake\Core\Configure; use Cake\I18n\FrozenTime; +use Cake\Datasource\FactoryLocator; /** * FoodCoopShop - The open source software for your foodcoop @@ -21,12 +22,13 @@ */ trait UpdateActionLogTrait { + public $ActionLog; public function updateActionLogFailure($actionLogId, $identifier, $jobId, $errorMessage) { - $this->ActionLog = $this->loadModel('ActionLogs'); + $this->ActionLog = FactoryLocator::get('Table')->get('ActionLogs'); $search = 'data-identifier="'.$identifier.'"'; $now = new FrozenTime(); @@ -46,7 +48,7 @@ public function updateActionLogFailure($actionLogId, $identifier, $jobId, $error public function updateActionLogSuccess($actionLogId, $identifier, $jobId) { - $this->ActionLog = $this->loadModel('ActionLogs'); + $this->ActionLog = FactoryLocator::get('Table')->get('ActionLogs'); $search = 'not-ok" data-identifier="'.$identifier.'"'; $now = new FrozenTime(); From f51b2efb4620b2f7dfc4e205fa1a40341bd23d61 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 14 Dec 2022 08:52:46 +0100 Subject: [PATCH 434/646] fix phpstan errors --- tests/TestCase/src/Command/EmailOrderReminderCommandTest.php | 1 + tests/TestCase/src/Command/SendOrderListsCommandTest.php | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/TestCase/src/Command/EmailOrderReminderCommandTest.php b/tests/TestCase/src/Command/EmailOrderReminderCommandTest.php index 33628ea173..c383d7c168 100644 --- a/tests/TestCase/src/Command/EmailOrderReminderCommandTest.php +++ b/tests/TestCase/src/Command/EmailOrderReminderCommandTest.php @@ -25,6 +25,7 @@ class EmailOrderReminderCommandTest extends AppCakeTestCase { protected $OrderDetail; + protected $EmailOrderReminder; use AppIntegrationTestTrait; use EmailTrait; diff --git a/tests/TestCase/src/Command/SendOrderListsCommandTest.php b/tests/TestCase/src/Command/SendOrderListsCommandTest.php index 0e05f61db3..c97fd7612d 100644 --- a/tests/TestCase/src/Command/SendOrderListsCommandTest.php +++ b/tests/TestCase/src/Command/SendOrderListsCommandTest.php @@ -31,6 +31,7 @@ class SendOrderListsCommandTest extends AppCakeTestCase public $Cart; protected $OrderDetail; protected $Product; + protected $SendOrderLists; use AppIntegrationTestTrait; use EmailTrait; From 3fae40e9b02192462aa42805203d872b9166452a Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 14 Dec 2022 09:08:10 +0100 Subject: [PATCH 435/646] 915 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae146165c4..511a679170 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe - New 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) and [Gitpod-Integration](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop). [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) / [PR#879](https://github.com/foodcoopshop/foodcoopshop/pull/879) / [PR#881](https://github.com/foodcoopshop/foodcoopshop/pull/881) - Enable strict typing in every php file to improve code quality. [I#872](https://github.com/foodcoopshop/foodcoopshop/issues/872) / [PR#893](https://github.com/foodcoopshop/foodcoopshop/pull/893) - Replace CakePHP's deprecated classes: File, Folder, Shell. [I#902](https://github.com/foodcoopshop/foodcoopshop/issues/902) [I#906](https://github.com/foodcoopshop/foodcoopshop/issues/906) / [PR#905](https://github.com/foodcoopshop/foodcoopshop/pull/905) / [PR#907](https://github.com/foodcoopshop/foodcoopshop/pull/907) +- Die Software ist jetzt kompatibel mit PHP 8.2. [I#915](https://github.com/foodcoopshop/foodcoopshop/issues/915) / [PR#916](https://github.com/foodcoopshop/foodcoopshop/pull/916) # v3.5.0 From ffe8b935cd601556f0bc918c49b4eafe01ecb05a Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 14 Dec 2022 09:21:47 +0100 Subject: [PATCH 436/646] remove php version check --- config/requirements.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/config/requirements.php b/config/requirements.php index a16d43ee9d..7a0fcf41b2 100644 --- a/config/requirements.php +++ b/config/requirements.php @@ -15,17 +15,6 @@ * @license https://opensource.org/licenses/AGPL-3.0 */ -/* - * You can empty out this file, if you are certain that you match all requirements. - */ - -/* - * You can remove this if you are confident that your PHP version is sufficient. - */ -if (version_compare(PHP_VERSION, '8.2.0') < 0) { - trigger_error('Your PHP version must be equal or higher than 8.2.0 to use CakePHP.', E_USER_ERROR); -} - /* * You can remove this if you are confident you have intl installed. */ From b116c99e2b4a0c85128650f4ca084035db6b63e7 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 14 Dec 2022 09:23:43 +0100 Subject: [PATCH 437/646] php version checks --- composer.json | 4 ++-- config/requirements.php | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e403708054..4a7c8b0a95 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "config": { "platform": { - "php": "8.2" + "php": "8.1" }, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true, @@ -19,7 +19,7 @@ } }, "require": { - "php": ">=8.2", + "php": ">=8.1", "cakephp/cakephp": "4.4.*", "cakephp/migrations": "^3.0", "cakephp/plugin-installer": "^1.0", diff --git a/config/requirements.php b/config/requirements.php index 7a0fcf41b2..670168a2c2 100644 --- a/config/requirements.php +++ b/config/requirements.php @@ -15,6 +15,17 @@ * @license https://opensource.org/licenses/AGPL-3.0 */ +/* + * You can empty out this file, if you are certain that you match all requirements. + */ + +/* + * You can remove this if you are confident that your PHP version is sufficient. + */ +if (version_compare(PHP_VERSION, '8.1.0') < 0) { + trigger_error('Your PHP version must be equal or higher than 8.1.0 to use CakePHP.', E_USER_ERROR); +} + /* * You can remove this if you are confident you have intl installed. */ From 8e2e0f931561c6232966c7f9e2823e6ebdda3efc Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 14 Dec 2022 13:42:11 +0100 Subject: [PATCH 438/646] css caching: move color theme css in extra file --- src/Assets/AssetsProvider.php | 3 +- templates/element/customThemeStyleSheet.php | 146 +------------------- webroot/css/mobile-global.css | 33 +++++ webroot/css/theme-color.css | 117 ++++++++++++++++ 4 files changed, 156 insertions(+), 143 deletions(-) create mode 100644 webroot/css/theme-color.css diff --git a/src/Assets/AssetsProvider.php b/src/Assets/AssetsProvider.php index 088943c65d..289d08499f 100644 --- a/src/Assets/AssetsProvider.php +++ b/src/Assets/AssetsProvider.php @@ -26,11 +26,12 @@ class AssetsProvider public static function getCssFilesBase() { return [ + 'bootstrap/dist/css/bootstrap.css', + 'theme-color.css', 'reset.css', 'jquery-ui/dist/themes/smoothness/jquery-ui.css', 'table.css', 'bootstrap-select/dist/css/bootstrap-select.css', - 'bootstrap/dist/css/bootstrap.css', '@fortawesome/fontawesome-free/css/all.css', 'dark-mode.css', 'global.css', diff --git a/templates/element/customThemeStyleSheet.php b/templates/element/customThemeStyleSheet.php index f6603f6b14..585840dbb7 100644 --- a/templates/element/customThemeStyleSheet.php +++ b/templates/element/customThemeStyleSheet.php @@ -20,147 +20,9 @@ ?> \ No newline at end of file diff --git a/webroot/css/mobile-global.css b/webroot/css/mobile-global.css index 6c764aba18..ec8c5d68aa 100644 --- a/webroot/css/mobile-global.css +++ b/webroot/css/mobile-global.css @@ -13,6 +13,39 @@ */ @media only screen and (max-device-width: 850px) { + #responsive-header a:not(.btn-camera), + body.self_services #responsive-header i.fa-circle-notch, + :not(button)> i.fas + :not(.fa-arrow-cycle-right) + :not(.fa-arrow-cycle-left) + :not(.fa-star) + :not(.fa-circle-notch) + :not(.fa-tags) + :not(.fa-shopping-bag) + :not(.fa-minus-circle) + :not(.fa-plus-circle) { + color: var(--theme-color) ! important; + } + body.self_services #responsive-header a.btn:not(.btn-flash-message), + body.self_services #responsive-header a.btn:not(.btn-flash-message) i.ok { + color: #fff ! important; + } + body:not(.admin) .sb-right h3 { + background-color: var(--theme-color) ! important; + } + .sb-left li.header, + .sb-left a:hover, + .sb-left a.active, + .sb-left a:hover i.far, + .sb-left a:hover i.fas:not(.gold), + .sb-left a.active i.fas:not(.gold):not(.fa-pencil-alt) { + background-color: var(--theme-color); + color: #fff ! important; + } + .sb-right .inner { + border-color: var(--theme-color) ! important; + } + /* START chrome pull refresh fix */ html { overflow-y: scroll; diff --git a/webroot/css/theme-color.css b/webroot/css/theme-color.css new file mode 100644 index 0000000000..85c07208bf --- /dev/null +++ b/webroot/css/theme-color.css @@ -0,0 +1,117 @@ +/** + * FoodCoopShop - The open source software for your foodcoop + * + * Licensed under the GNU Affero General Public License version 3 + * For full copyright and license information, please see LICENSE + * Redistributions of files must retain the above copyright notice. + * + * @since FoodCoopShop 3.6.0 + * @license https://opensource.org/licenses/AGPL-3.0 + * @author Mario Rothauer + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ + +#header .logo-wrapper { + width: var(--logo-width); +} +#header .logo { + max-width: var(--logo-width); +} +#main-menu { + width: calc(100% - var(--logo-width) - 34px); +} +#header .logo { + max-height: var(--logo-max-height); +} + +::selection { + background: var(--theme-color); + color: #fff; +} + +h2.info::selection, +h2.info b::selection, +#flashMessage.success::selection, +#flashMessage.success b::selection { + background-color: #fff; + color: #000; +} + +.box h3, +.btn-success, +.vertical.menu a:hover, .vertical.menu a:hover i, .vertical.menu a.active, .vertical.menu a.active i, +.vertical.menu li.heading, +.menu.vertical a:hover span.additional-info, +.menu.vertical a.active span.additional-info, +#main-menu a::after, +#categories-menu li.header, +#manufacturers-menu li.header, +h2.info, +#flashMessage.success, +.modal-header, +.cookieConsentWrapper .cookieConsent__Right button, +.drop a.upload-button, +#footer .bottom { + background-color: var(--theme-color); +} + +h1, +h2, +a.blog-post-wrapper h3, +.pw .price, +#scroll-to-top a, +#scroll-to-top a i, +.vertical.menu a i.fas, +.vertical.menu span.additional-info, +a:not(.btn), a:not(.btn):visited, a:not(.btn):active, +a.btn.edit-shortcut-button, +a.btn.prev-button i, a.btn.next-button i, +.pw .price-asterisk, +i.fa.ok, i.fas.ok, i.far.ok, +body.carts .cart:not(#cart) span.amount .btn, +#filter-loader i, +.btn-cart i.fa-cart-plus, +.btn-cart i.fa-shopping-bag { + color: var(--theme-color); +} + +.blog-wrapper .swiper-button-prev, +.blog-wrapper .swiper-button-next, +body.blog_posts.detail #inner-content h2.further-news, +body.customers.registration_successful #inner-content h2.further-news, +a.btn-arrow:hover { + color: var(--theme-color) ! important; +} + +.btn-success, +.btn-success:active:hover, +#flashMessage.success, +hr, +.pw, .manufacturer-wrapper, +.cookieConsentWrapper, +body.manufacturers.detail #inner-content h2, +h1.middle-line span.middle { + border-color: var(--theme-color); +} + +.btn-success:hover, +.btn-success:focus, +.btn-success:active, +.btn-success.disabled { + background-color: var(--theme-color) ! important; + border-color: var(--theme-color); +} +.btn-success:focus:active, +#flashMessage.success .progress-bar.bg-success, +.bootstrap-select .dropdown-item.active, +.bootstrap-select .dropdown-item:active, +table.list tr.selected { + background-color: var(--theme-color) ! important; +} +.vertical.menu a { + color: #333333; +} +body.customers.login #self-service { + box-shadow: inset 0 0 3em var(--theme-color); +} \ No newline at end of file From 0b68db528baf296f6758d4e7a4781d7d3c4c75b2 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 14 Dec 2022 13:50:43 +0100 Subject: [PATCH 439/646] refactoring cssVars --- plugins/Admin/templates/layout/default.php | 2 +- .../element/{customThemeStyleSheet.php => customCssVars.php} | 0 templates/element/layout/header.php | 2 +- templates/layout/error.php | 5 ++--- 4 files changed, 4 insertions(+), 5 deletions(-) rename templates/element/{customThemeStyleSheet.php => customCssVars.php} (100%) diff --git a/plugins/Admin/templates/layout/default.php b/plugins/Admin/templates/layout/default.php index 3fac27b83f..1c8857ea48 100644 --- a/plugins/Admin/templates/layout/default.php +++ b/plugins/Admin/templates/layout/default.php @@ -38,6 +38,7 @@ element('jsNamespace'); ?> element('customCssVars'); $cssConfigs = ['admin']; if ($this->plugin != 'Admin') { $cssConfigs[] = $this->plugin.'.all'; @@ -51,7 +52,6 @@ 'mobile-dark-mode', ]); } - echo $this->element('customThemeStyleSheet'); echo $this->element('layout/customHeader'); ?> diff --git a/templates/element/customThemeStyleSheet.php b/templates/element/customCssVars.php similarity index 100% rename from templates/element/customThemeStyleSheet.php rename to templates/element/customCssVars.php diff --git a/templates/element/layout/header.php b/templates/element/layout/header.php index ba36c2f9fa..bc1df88f4e 100644 --- a/templates/element/layout/header.php +++ b/templates/element/layout/header.php @@ -65,7 +65,7 @@ if (Configure::read('appDb.FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY')) { echo $this->Html->css(['customer-can-select-pickup-day']); } - echo $this->element('customThemeStyleSheet'); + echo $this->element('customCssVars'); echo $this->Html->css(['custom']); echo $this->element('layout/customHeader'); ?> diff --git a/templates/layout/error.php b/templates/layout/error.php index 3ed18de519..51db201bef 100644 --- a/templates/layout/error.php +++ b/templates/layout/error.php @@ -29,10 +29,12 @@ element('jsNamespace'); ?> element('customCssVars'); // do not use AssetCompressPlugin here (not loaded for errors!) echo $this->Html->css([ 'reset', '/node_modules/bootstrap/dist/css/bootstrap.css', + 'dark-mode', 'global', 'fonts', 'frontend', @@ -42,9 +44,6 @@ if ($isMobile) { echo $this->Html->css(['mobile-error']); } - - echo $this->element('customThemeStyleSheet'); - ?> From 862410936bb79e97f13d8628694954e4fba16a14 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 14 Dec 2022 14:05:00 +0100 Subject: [PATCH 440/646] performance: compress css files for mobile devices --- config/asset_compress.ini | 16 ++++++++++++++++ plugins/Admin/templates/layout/default.php | 18 +++++++----------- templates/element/layout/header.php | 16 ++++++---------- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/config/asset_compress.ini b/config/asset_compress.ini index 08da316807..e3d5165e7c 100644 --- a/config/asset_compress.ini +++ b/config/asset_compress.ini @@ -35,6 +35,15 @@ files[] = feedback.css files[] = frontend.css files[] = print.css +[frontend_mobile.css] +extend = frontend.css +files[] = slidebars/dist/slidebars.css +files[] = mobile-global.css +files[] = mobile-frontend.css +files[] = mobile-frontend-portrait.css +files[] = mobile-self-service.css +files[] = mobile-dark-mode.css + [frontend.js] files[] = 'App\Assets\AssetsProvider::getJsFilesBase()' files[] = @beyonk/gdpr-cookie-consent-banner/dist/browser/bundle.js @@ -55,6 +64,13 @@ files[] = plugin:Admin:css/admin.css files[] = plugin:Admin:css/upload.css files[] = print.css +[admin_mobile.css] +extend = admin.css +files[] = slidebars/dist/slidebars.css +files[] = mobile-global.css +files[] = plugin:Admin:css/mobile.css +files[] = mobile-dark-mode.css + [admin.js] files[] = 'App\Assets\AssetsProvider::getJsFilesBase()' files[] = blueimp-file-upload/js/jquery.iframe-transport.js diff --git a/plugins/Admin/templates/layout/default.php b/plugins/Admin/templates/layout/default.php index 1c8857ea48..39114f74d9 100644 --- a/plugins/Admin/templates/layout/default.php +++ b/plugins/Admin/templates/layout/default.php @@ -39,19 +39,15 @@ element('customCssVars'); - $cssConfigs = ['admin']; - if ($this->plugin != 'Admin') { - $cssConfigs[] = $this->plugin.'.all'; - } - echo $this->element('renderCss', ['configs' => $cssConfigs]); + + $renderConfigs = ['admin']; if ($isMobile) { - echo $this->Html->css([ - '/node_modules/slidebars/dist/slidebars', - 'mobile-global', - 'Admin.mobile', - 'mobile-dark-mode', - ]); + $renderConfigs = ['admin_mobile']; + } + if ($this->plugin != 'Admin') { + $renderConfigs[] = $this->plugin.'.all'; } + echo $this->element('renderCss', ['configs' => $renderConfigs]); echo $this->element('layout/customHeader'); ?> diff --git a/templates/element/layout/header.php b/templates/element/layout/header.php index bc1df88f4e..ac0bd5aec1 100644 --- a/templates/element/layout/header.php +++ b/templates/element/layout/header.php @@ -50,17 +50,13 @@ element('jsNamespace'); ?> element('renderCss', ['configs' => ['frontend']]); + $renderConfig = 'frontend'; if ($isMobile) { - echo $this->Html->css([ - '/node_modules/slidebars/dist/slidebars', - 'mobile-global', - 'mobile-frontend', - 'mobile-frontend-portrait', - 'mobile-self-service', - 'mobile-dark-mode', - 'mobile-frontend-custom', - ]); + $renderConfig = 'frontend_mobile'; + } + echo $this->element('renderCss', ['configs' => [$renderConfig]]); + if ($isMobile) { + echo $this->Html->css(['mobile-frontend-custom']); } if (Configure::read('appDb.FCS_CUSTOMER_CAN_SELECT_PICKUP_DAY')) { echo $this->Html->css(['customer-can-select-pickup-day']); From 64b03fd77cf498af816d29bb9befe5eeb72b312b Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 14 Dec 2022 14:12:28 +0100 Subject: [PATCH 441/646] image height fix --- webroot/css/frontend.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index 745282e6dc..6445e75595 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -1204,7 +1204,7 @@ a.blog-post-wrapper span.img-wrapper { display: flex; align-items: center; justify-content: center; - height: 145px; + height: 55%; } a.blog-post-wrapper:hover { box-shadow: 8px 10px 15px 0px rgba(0,0,0,0.5); From 4d197c7831af01824f6917e2554a90adc695cbbe Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 15 Dec 2022 08:53:44 +0100 Subject: [PATCH 442/646] dark mode: background color for images in admin lists --- plugins/Admin/templates/BlogPosts/index.php | 2 +- plugins/Admin/templates/Manufacturers/index.php | 2 +- plugins/Admin/templates/Sliders/index.php | 2 +- webroot/css/dark-mode.css | 3 ++- webroot/css/table.css | 3 +++ 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/Admin/templates/BlogPosts/index.php b/plugins/Admin/templates/BlogPosts/index.php index af286d3db0..e7f9c79b4f 100644 --- a/plugins/Admin/templates/BlogPosts/index.php +++ b/plugins/Admin/templates/BlogPosts/index.php @@ -95,7 +95,7 @@ echo $blogPost->id_blog_post; echo ''; - echo ''; + echo ''; $srcLargeImage = $this->Html->getBlogPostImageSrc($blogPost, 'single'); $srcSmallImage = $this->Html->getBlogPostImageSrc($blogPost, 'home'); diff --git a/plugins/Admin/templates/Manufacturers/index.php b/plugins/Admin/templates/Manufacturers/index.php index bc574d622d..1dd5b0b06e 100644 --- a/plugins/Admin/templates/Manufacturers/index.php +++ b/plugins/Admin/templates/Manufacturers/index.php @@ -105,7 +105,7 @@ echo ''; echo $manufacturer->id_manufacturer; echo ''; - echo ''; + echo ''; $srcLargeImage = $this->Html->getManufacturerImageSrc($manufacturer->id_manufacturer, 'large'); $largeImageExists = preg_match('/de-default-large_default/', $srcLargeImage); if (! $largeImageExists) { diff --git a/plugins/Admin/templates/Sliders/index.php b/plugins/Admin/templates/Sliders/index.php index 3b61fb7b8b..8031308a19 100644 --- a/plugins/Admin/templates/Sliders/index.php +++ b/plugins/Admin/templates/Sliders/index.php @@ -83,7 +83,7 @@ echo $slider->id_slider; echo ''; - echo ''; + echo ''; echo ''; echo ''; diff --git a/webroot/css/dark-mode.css b/webroot/css/dark-mode.css index 9f913e436c..4cd24d3b37 100644 --- a/webroot/css/dark-mode.css +++ b/webroot/css/dark-mode.css @@ -31,7 +31,8 @@ body.dark .self-service #login-form h2 span, body.dark.admin #menu, body.dark.admin .filter-container, body.dark.admin table.list, -body.dark.admin #actionLogs div.changed { +body.dark.admin #actionLogs div.changed, +body.dark table.list td.image { background-color: var(--dark-mode-main-bg-color); } body.dark .ui-widget-header, diff --git a/webroot/css/table.css b/webroot/css/table.css index 4572c328f5..2e6d886479 100644 --- a/webroot/css/table.css +++ b/webroot/css/table.css @@ -69,6 +69,9 @@ table.list td.not-available i.sold-out-limit-for-dialog i { background-color: var(--not-ok-red); color: white; } +table.list td.image { + background-color: #fff; +} table.list td.negative, b.negative, span.negative { From 8471d46e9ef0134b783ec66af7941183828c9ce7 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 15 Dec 2022 08:57:54 +0100 Subject: [PATCH 443/646] vendor updates --- composer.lock | 72 +++++++++++++++++++-------------------- webroot/package-lock.json | 28 +++++++-------- webroot/package.json | 4 +-- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/composer.lock b/composer.lock index ba9da60637..b6efa2df0b 100644 --- a/composer.lock +++ b/composer.lock @@ -925,16 +925,16 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.22.0", + "version": "2.23.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "df8c7f9e11d854269f4aa7c06ffa38caa42e4405" + "reference": "a738cecb420e3bcff34c33177f1ce9f68902695c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/df8c7f9e11d854269f4aa7c06ffa38caa42e4405", - "reference": "df8c7f9e11d854269f4aa7c06ffa38caa42e4405", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/a738cecb420e3bcff34c33177f1ce9f68902695c", + "reference": "a738cecb420e3bcff34c33177f1ce9f68902695c", "shasum": "" }, "require": { @@ -956,10 +956,10 @@ "ext-libxml": "*", "http-interop/http-factory-tests": "^0.9.0", "laminas/laminas-coding-standard": "^2.4.0", - "php-http/psr7-integration-tests": "^1.1.1", + "php-http/psr7-integration-tests": "^1.2", "phpunit/phpunit": "^9.5.26", "psalm/plugin-phpunit": "^0.18.0", - "vimeo/psalm": "^4.29.0" + "vimeo/psalm": "^5.0.0" }, "type": "library", "extra": { @@ -1018,7 +1018,7 @@ "type": "community_bridge" } ], - "time": "2022-11-22T05:54:54+00:00" + "time": "2022-12-14T22:31:50+00:00" }, { "name": "laminas/laminas-httphandlerrunner", @@ -5137,16 +5137,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.13.1", + "version": "1.15.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "aac44118344d197e6d5f7c6cee91885f0a89acdd" + "reference": "6ff970a7101acfe99b3048e4bbfbc094e55c5b04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/aac44118344d197e6d5f7c6cee91885f0a89acdd", - "reference": "aac44118344d197e6d5f7c6cee91885f0a89acdd", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ff970a7101acfe99b3048e4bbfbc094e55c5b04", + "reference": "6ff970a7101acfe99b3048e4bbfbc094e55c5b04", "shasum": "" }, "require": { @@ -5176,22 +5176,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.13.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.15.0" }, - "time": "2022-11-20T08:52:26+00:00" + "time": "2022-12-07T16:12:39+00:00" }, { "name": "phpstan/phpstan", - "version": "1.9.2", + "version": "1.9.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "d6fdf01c53978b6429f1393ba4afeca39cc68afa" + "reference": "709999b91448d4f2bb07daffffedc889b33e461c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d6fdf01c53978b6429f1393ba4afeca39cc68afa", - "reference": "d6fdf01c53978b6429f1393ba4afeca39cc68afa", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/709999b91448d4f2bb07daffffedc889b33e461c", + "reference": "709999b91448d4f2bb07daffffedc889b33e461c", "shasum": "" }, "require": { @@ -5221,7 +5221,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.2" + "source": "https://github.com/phpstan/phpstan/tree/1.9.3" }, "funding": [ { @@ -5237,20 +5237,20 @@ "type": "tidelift" } ], - "time": "2022-11-10T09:56:11+00:00" + "time": "2022-12-13T10:28:10+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.20", + "version": "9.2.21", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "af7463c955007de36db0c5e26d03e2f933c2e980" + "reference": "3f893e19712bb0c8bc86665d1562e9fd509c4ef0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/af7463c955007de36db0c5e26d03e2f933c2e980", - "reference": "af7463c955007de36db0c5e26d03e2f933c2e980", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/3f893e19712bb0c8bc86665d1562e9fd509c4ef0", + "reference": "3f893e19712bb0c8bc86665d1562e9fd509c4ef0", "shasum": "" }, "require": { @@ -5306,7 +5306,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.20" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.21" }, "funding": [ { @@ -5314,7 +5314,7 @@ "type": "github" } ], - "time": "2022-12-13T07:49:28+00:00" + "time": "2022-12-14T13:26:54+00:00" }, { "name": "phpunit/php-file-iterator", @@ -6950,32 +6950,32 @@ }, { "name": "slevomat/coding-standard", - "version": "8.6.4", + "version": "8.7.0", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "8a02c83e59c3230a2a4367b29956a2f2b56e3a24" + "reference": "326d195209d196be02f8c2a0034529262fc7ffcc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/8a02c83e59c3230a2a4367b29956a2f2b56e3a24", - "reference": "8a02c83e59c3230a2a4367b29956a2f2b56e3a24", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/326d195209d196be02f8c2a0034529262fc7ffcc", + "reference": "326d195209d196be02f8c2a0034529262fc7ffcc", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", "php": "^7.2 || ^8.0", - "phpstan/phpdoc-parser": ">=1.11.0 <1.14.0", + "phpstan/phpdoc-parser": ">=1.15.0 <1.16.0", "squizlabs/php_codesniffer": "^3.7.1" }, "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.10|1.9.2", - "phpstan/phpstan-deprecation-rules": "1.0.0", - "phpstan/phpstan-phpunit": "1.0.0|1.2.2", + "phpstan/phpstan": "1.4.10|1.9.3", + "phpstan/phpstan-deprecation-rules": "1.1.0", + "phpstan/phpstan-phpunit": "1.0.0|1.3.1", "phpstan/phpstan-strict-rules": "1.4.4", - "phpunit/phpunit": "7.5.20|8.5.21|9.5.26" + "phpunit/phpunit": "7.5.20|8.5.21|9.5.27" }, "type": "phpcodesniffer-standard", "extra": { @@ -6999,7 +6999,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.6.4" + "source": "https://github.com/slevomat/coding-standard/tree/8.7.0" }, "funding": [ { @@ -7011,7 +7011,7 @@ "type": "tidelift" } ], - "time": "2022-11-14T09:26:24+00:00" + "time": "2022-12-13T15:02:08+00:00" }, { "name": "squizlabs/php_codesniffer", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index 81f4a1d366..5a2272b316 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -19,7 +19,7 @@ "ckeditor4": "^4.20.1", "clean-css-cli": "^5.6.1", "clipboard": "^2.0.11", - "jquery": "^3.6.1", + "jquery": "^3.6.2", "jquery-backstretch": "^2.1.18", "jquery-knob": "~1.2.11", "jquery-ui": "^1.13.2", @@ -29,7 +29,7 @@ "lazysizes": "^5.3.2", "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", - "svelte": "^3.54.0", + "svelte": "^3.55.0", "swiper": "8.4.5", "tooltipster": "^4.2.8", "uglify-js": "^3.17.4", @@ -651,9 +651,9 @@ "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==" }, "node_modules/jquery": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz", - "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==" + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.2.tgz", + "integrity": "sha512-/e7ulNIEEYk1Z/l4X0vpxGt+B/dNsV8ghOPAWZaJs8pkGvsSC0tm33aMGylXcj/U7y4IcvwtMXPMyBFZn/gK9A==" }, "node_modules/jquery-backstretch": { "version": "2.1.18", @@ -993,9 +993,9 @@ "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==" }, "node_modules/svelte": { - "version": "3.54.0", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.54.0.tgz", - "integrity": "sha512-tdrgeJU0hob0ZWAMoKXkhcxXA7dpTg6lZGxUeko5YqvPdJBiyRspGsCwV27kIrbrqPP2WUoSV9ca0gnLlw8YzQ==", + "version": "3.55.0", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.55.0.tgz", + "integrity": "sha512-uGu2FVMlOuey4JoKHKrpZFkoYyj0VLjJdz47zX5+gVK5odxHM40RVhar9/iK2YFRVxvfg9FkhfVlR0sjeIrOiA==", "engines": { "node": ">= 8" } @@ -1606,9 +1606,9 @@ "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==" }, "jquery": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz", - "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==" + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.2.tgz", + "integrity": "sha512-/e7ulNIEEYk1Z/l4X0vpxGt+B/dNsV8ghOPAWZaJs8pkGvsSC0tm33aMGylXcj/U7y4IcvwtMXPMyBFZn/gK9A==" }, "jquery-backstretch": { "version": "2.1.18", @@ -1872,9 +1872,9 @@ "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==" }, "svelte": { - "version": "3.54.0", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.54.0.tgz", - "integrity": "sha512-tdrgeJU0hob0ZWAMoKXkhcxXA7dpTg6lZGxUeko5YqvPdJBiyRspGsCwV27kIrbrqPP2WUoSV9ca0gnLlw8YzQ==" + "version": "3.55.0", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.55.0.tgz", + "integrity": "sha512-uGu2FVMlOuey4JoKHKrpZFkoYyj0VLjJdz47zX5+gVK5odxHM40RVhar9/iK2YFRVxvfg9FkhfVlR0sjeIrOiA==" }, "swiper": { "version": "8.4.5", diff --git a/webroot/package.json b/webroot/package.json index b29fb5d726..fddc8ff012 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -25,7 +25,7 @@ "ckeditor4": "^4.20.1", "clean-css-cli": "^5.6.1", "clipboard": "^2.0.11", - "jquery": "^3.6.1", + "jquery": "^3.6.2", "jquery-backstretch": "^2.1.18", "jquery-knob": "~1.2.11", "jquery-ui": "^1.13.2", @@ -35,7 +35,7 @@ "lazysizes": "^5.3.2", "scrolltofixed": "^1.0.6", "slidebars": "^2.0.2", - "svelte": "^3.54.0", + "svelte": "^3.55.0", "swiper": "8.4.5", "tooltipster": "^4.2.8", "uglify-js": "^3.17.4", From 3c2d757c8838a2618bf35e0f34bc40bf0dd9647d Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 15 Dec 2022 21:01:05 +0100 Subject: [PATCH 444/646] submenu from main-nav in columns (items are easier to find) --- webroot/css/frontend.css | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/webroot/css/frontend.css b/webroot/css/frontend.css index 6445e75595..c573ef0d52 100644 --- a/webroot/css/frontend.css +++ b/webroot/css/frontend.css @@ -170,26 +170,25 @@ body.categories.detail div.description-wrapper { left: 241px; top: 137px; width: 670px; - padding: 24px 15px 0 15px; + padding: 15px 15px 0 15px; background: #fff; border: 1px solid #d6d4d4; z-index: 1000; display: none; border-radius: 5px; + columns: 3; + min-height: 49px; } #main-menu li ul ul { display: none ! important; /* never show third level */ } -#main-menu li ul li { - float: left; - line-height: 17px; - width: 201px; - margin-left: 16px; -} #main-menu li ul li a { + line-height: 16px; + margin-left: 16px; margin-top: 0px; - margin-bottom: 7px; + margin-bottom: 5px; float: left; + width: 201px; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; From f1df398bbc3dd5c65cc1130aaba4fd84fed3100c Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 15 Dec 2022 22:06:31 +0100 Subject: [PATCH 445/646] code cleaning color-mode --- config/asset_compress.ini | 2 + plugins/Admin/templates/Pages/home.php | 2 +- plugins/Admin/webroot/js/admin.js | 2 +- plugins/Network/webroot/js/sync-base.js | 2 +- templates/element/userMenu.php | 2 +- webroot/js/background-image.js | 2 +- webroot/js/color-mode.js | 63 +++++++++++++++++++++++++ webroot/js/helper.js | 50 +------------------- webroot/js/self-service.js | 2 +- 9 files changed, 73 insertions(+), 54 deletions(-) create mode 100644 webroot/js/color-mode.js diff --git a/config/asset_compress.ini b/config/asset_compress.ini index e3d5165e7c..2524b3bb45 100644 --- a/config/asset_compress.ini +++ b/config/asset_compress.ini @@ -53,6 +53,7 @@ files[] = scrolltofixed/jquery-scrolltofixed.js files[] = swiper/swiper-bundle.js files[] = webrtc-adapter/out/adapter.js files[] = @ericblade/quagga2/dist/quagga.min.js +files[] = color-mode.js files[] = helper.js files[] = self-service.js files[] = cart.js @@ -80,6 +81,7 @@ files[] = clipboard/dist/clipboard.js files[] = chart.js/dist/chart.umd.js files[] = chartjs-plugin-datalabels/dist/chartjs-plugin-datalabels.js files[] = js-cookie/dist/js.cookie.js +files[] = color-mode.js files[] = helper.js files[] = plugin:Admin:js/app.chart.js files[] = plugin:Admin:js/upload.js diff --git a/plugins/Admin/templates/Pages/home.php b/plugins/Admin/templates/Pages/home.php index c972d37213..881b011211 100644 --- a/plugins/Admin/templates/Pages/home.php +++ b/plugins/Admin/templates/Pages/home.php @@ -19,7 +19,7 @@ $this->element('addScript', [ 'script' => - Configure::read('app.jsNamespace') . ".Helper.initColorMode();" . + Configure::read('app.jsNamespace') . ".ColorMode.init();" . Configure::read('app.jsNamespace') . ".Helper.showContent();" . Configure::read('app.jsNamespace') . ".Helper.initAnystretch();" . Configure::read('app.jsNamespace') . ".Admin.setMenuFixed();" . diff --git a/plugins/Admin/webroot/js/admin.js b/plugins/Admin/webroot/js/admin.js index bbdfff2549..1bc69d1b7f 100644 --- a/plugins/Admin/webroot/js/admin.js +++ b/plugins/Admin/webroot/js/admin.js @@ -16,7 +16,7 @@ foodcoopshop.Admin = { init: function () { this.initFilter(); this.improveTableLayout(); - foodcoopshop.Helper.initColorMode(); + foodcoopshop.ColorMode.init(); foodcoopshop.Helper.showContent(); foodcoopshop.Helper.initMenu(); foodcoopshop.ModalLogout.init(); diff --git a/plugins/Network/webroot/js/sync-base.js b/plugins/Network/webroot/js/sync-base.js index d8fc1827f7..3a78e11ff3 100644 --- a/plugins/Network/webroot/js/sync-base.js +++ b/plugins/Network/webroot/js/sync-base.js @@ -16,7 +16,7 @@ foodcoopshop.SyncBase = { activeAjaxRequests : [], init : function () { - foodcoopshop.Helper.initColorMode(); + foodcoopshop.ColorMode.init(); foodcoopshop.Helper.showContent(); foodcoopshop.Helper.initMenu(); foodcoopshop.ModalLogout.init(); diff --git a/templates/element/userMenu.php b/templates/element/userMenu.php index 3f4e016c5e..82adf8932c 100644 --- a/templates/element/userMenu.php +++ b/templates/element/userMenu.php @@ -35,7 +35,7 @@ } $this->element('addScript', [ - 'script' => Configure::read('app.jsNamespace') . ".Helper.initColorModeSwitcher();" + 'script' => Configure::read('app.jsNamespace') . ".ColorMode.initToggle();" ]); $menu[] = ['slug' => 'javascript:void(0)', 'name' => '', 'options' => ['fa-icon' => 'ok fa-fw far fa-moon', 'class' => ['color-mode-toggle']]]; if ($appAuth->user()) { diff --git a/webroot/js/background-image.js b/webroot/js/background-image.js index 1eae2aeaf0..c245642b9e 100644 --- a/webroot/js/background-image.js +++ b/webroot/js/background-image.js @@ -16,7 +16,7 @@ foodcoopshop.BackgroundImage = { getBackgroundImage: function(theme) { var opacity = 0.33; - + if (theme == 'dark') { opacity = 0.03; } diff --git a/webroot/js/color-mode.js b/webroot/js/color-mode.js new file mode 100644 index 0000000000..a1efb6782f --- /dev/null +++ b/webroot/js/color-mode.js @@ -0,0 +1,63 @@ +/** + * FoodCoopShop - The open source software for your foodcoop + * + * Licensed under the GNU Affero General Public License version 3 + * For full copyright and license information, please see LICENSE + * Redistributions of files must retain the above copyright notice. + * + * @since FoodCoopShop 3.6.0 + * @license https://opensource.org/licenses/AGPL-3.0 + * @author Mario Rothauer + * @copyright Copyright (c) Mario Rothauer, https://www.rothauer-it.com + * @link https://www.foodcoopshop.com + */ + +foodcoopshop.ColorMode = { + + init: function() { + var colorMode = localStorage.getItem('color-mode'); + if (colorMode === 'dark') { + this.enableDarkMode(); + } else { + this.enableLightMode(); + } + this.setBackgroundImage(); + }, + + setBackgroundImage: function() { + var colorMode = this.getColorMode(); + $('body').css('background-image', 'url("' + foodcoopshop.BackgroundImage.getBackgroundImage(colorMode) + '"'); + }, + + initToggle: function() { + $('.color-mode-toggle').on('click', function() { + if ($('body').hasClass('dark')) { + localStorage.setItem('color-mode', 'light'); + foodcoopshop.ColorMode.enableLightMode(); + } else { + localStorage.setItem('color-mode', 'dark'); + foodcoopshop.ColorMode.enableDarkMode(); + } + foodcoopshop.ColorMode.setBackgroundImage(); + }); + }, + + enableLightMode: function() { + $('body').removeClass('dark'); + var icon = $('.color-mode-toggle').find('i'); + icon.removeClass('fas'); + icon.addClass('far'); + }, + + enableDarkMode: function() { + $('body').addClass('dark'); + var icon = $('.color-mode-toggle').find('i'); + icon.removeClass('far'); + icon.addClass('fas'); + }, + + getColorMode: function() { + return $('body').hasClass('dark') ? 'dark' : 'light'; + } + +}; diff --git a/webroot/js/helper.js b/webroot/js/helper.js index f9bf165a91..467395a6c7 100644 --- a/webroot/js/helper.js +++ b/webroot/js/helper.js @@ -24,7 +24,7 @@ foodcoopshop.Helper = { foodcoopshop.ModalLogout.init(); this.changeOutgoingLinksTargetToBlank(); this.initCookieBanner(); - this.initColorMode(); + foodcoopshop.ColorMode.init(); if (!this.isMobile()) { this.initWindowResize(); this.initScrolltopButton(); @@ -33,53 +33,7 @@ foodcoopshop.Helper = { this.showContent(); } }, - - setBackgroundImage: function() { - var colorMode = this.getColorMode(); - $('body').css('background-image', 'url("' + foodcoopshop.BackgroundImage.getBackgroundImage(colorMode) + '"'); - }, - - initColorModeSwitcher: function() { - $('.color-mode-toggle').on('click', function() { - if ($('body').hasClass('dark')) { - localStorage.setItem('color-mode', 'light'); - foodcoopshop.Helper.enableLightMode(); - } else { - localStorage.setItem('color-mode', 'dark'); - foodcoopshop.Helper.enableDarkMode(); - } - foodcoopshop.Helper.setBackgroundImage(); - }); - }, - - initColorMode: function() { - let colorMode = localStorage.getItem('color-mode'); - if (colorMode === 'dark') { - foodcoopshop.Helper.enableDarkMode(); - } else { - foodcoopshop.Helper.enableLightMode(); - } - foodcoopshop.Helper.setBackgroundImage(); - }, - - enableLightMode: function() { - $('body').removeClass('dark'); - var icon = $('.color-mode-toggle').find('i'); - icon.removeClass('fas'); - icon.addClass('far'); - }, - - enableDarkMode: function() { - $('body').addClass('dark'); - var icon = $('.color-mode-toggle').find('i'); - icon.removeClass('far'); - icon.addClass('fas'); - }, - - getColorMode: function() { - return $('body').hasClass('dark') ? 'dark' : 'light'; - }, - + initRegistrationAsCompany: function() { var isCompanyCheckbox = $('#customers-is-company'); diff --git a/webroot/js/self-service.js b/webroot/js/self-service.js index 5a56cbcb36..539fea2b86 100644 --- a/webroot/js/self-service.js +++ b/webroot/js/self-service.js @@ -18,7 +18,7 @@ foodcoopshop.SelfService = { init : function() { foodcoopshop.ModalLogout.init(document.location.href); - foodcoopshop.Helper.initColorMode(); + foodcoopshop.ColorMode.init(); this.initWindowResize(); this.initSearchForm(); this.bindQuantityInUnitsInputFields(); From e8d35ea5e717ba799de9c9af57df197685245846 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 16 Dec 2022 19:46:00 +0100 Subject: [PATCH 446/646] fix color mode for charts --- plugins/Admin/webroot/js/app.chart.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Admin/webroot/js/app.chart.js b/plugins/Admin/webroot/js/app.chart.js index d03264a35a..6561856ecf 100644 --- a/plugins/Admin/webroot/js/app.chart.js +++ b/plugins/Admin/webroot/js/app.chart.js @@ -16,11 +16,11 @@ foodcoopshop.AppChart = { color: '#cccccc', // default color getFontColor: function() { - return foodcoopshop.Helper.getColorMode() == 'dark' ? '#CDCDCD' : '#333333'; + return foodcoopshop.ColorMode.getColorMode() == 'dark' ? '#CDCDCD' : '#333333'; }, getGridColor: function() { - return foodcoopshop.Helper.getColorMode() == 'dark' ? '#696969' : '#dfdfdf'; + return foodcoopshop.ColorMode.getColorMode() == 'dark' ? '#696969' : '#dfdfdf'; }, barChartOptions : { From 56abf89e74f1ebf73c0e8accaae05ff39d914167 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 16 Dec 2022 19:47:17 +0100 Subject: [PATCH 447/646] fix color mode --- plugins/Admin/webroot/js/app.chart.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Admin/webroot/js/app.chart.js b/plugins/Admin/webroot/js/app.chart.js index 6561856ecf..05d7a02644 100644 --- a/plugins/Admin/webroot/js/app.chart.js +++ b/plugins/Admin/webroot/js/app.chart.js @@ -327,7 +327,7 @@ foodcoopshop.AppChart = { outer: { align: 'end', anchor: 'end', - color: foodcoopshop.Helper.getColorMode() == 'dark' ? '#CDCDCD' : '#333333', + color: this.getFontColor(), font: { size: 15 }, From 8274b117c683911d6d42288b09657905d4bf26d1 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sat, 17 Dec 2022 18:47:10 +0100 Subject: [PATCH 448/646] fix php 8.2 deprecation --- src/Model/Table/ProductsTable.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Model/Table/ProductsTable.php b/src/Model/Table/ProductsTable.php index 3b7b8ba90b..6e8bd39b1e 100644 --- a/src/Model/Table/ProductsTable.php +++ b/src/Model/Table/ProductsTable.php @@ -36,6 +36,7 @@ class ProductsTable extends AppTable public const ALLOWED_TAGS_DESCRIPTION_SHORT = '


'; public const ALLOWED_TAGS_DESCRIPTION = '


'; + private $Catalog; private $Configuration; private $Manufacturer; private $Unit; From d4d2b0728cd8dff6175ee5e63ffe37f02858fdb0 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 20 Dec 2022 19:57:13 +0100 Subject: [PATCH 449/646] create dummy data for deleted customers --- src/Model/Table/InvoicesTable.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Model/Table/InvoicesTable.php b/src/Model/Table/InvoicesTable.php index 92e4ba53c2..d7b9c8c8b9 100644 --- a/src/Model/Table/InvoicesTable.php +++ b/src/Model/Table/InvoicesTable.php @@ -181,6 +181,12 @@ public function getDataForCustomerInvoice($customerId, $currentDay) $paymentsTable = FactoryLocator::get('Table')->get('Payments'); $deposits = $paymentsTable->getCustomerDepositNotBilled($customerId); + // create empty dummy data for deleted customer + if (is_null($customer)) { + $customer = $customersTable->newEmptyEntity(); + $customer->active_order_details = []; + } + $preparedData = $this->prepareDataForCustomerInvoice($customer->active_order_details, $deposits, null); $customer->active_order_details = $preparedData['active_order_details']; From 624b8c3c9f0dbd2a7ed95f0b01f2a85190fdf13a Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 20 Dec 2022 20:10:19 +0100 Subject: [PATCH 450/646] show correct error message for deleted customers --- plugins/Admin/src/Controller/CustomersController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/Admin/src/Controller/CustomersController.php b/plugins/Admin/src/Controller/CustomersController.php index c7ffed0050..13ddac07e4 100644 --- a/plugins/Admin/src/Controller/CustomersController.php +++ b/plugins/Admin/src/Controller/CustomersController.php @@ -399,6 +399,10 @@ private function _processForm($customerId) ] ])->first(); + if (empty($customer)) { + throw new NotFoundException('customer not found'); + } + $this->setFormReferer(); if (empty($this->getRequest()->getData())) { From 1b4f3bc2d98288277feb3a93f4d1d968c4e62e30 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 21 Dec 2022 16:46:01 +0100 Subject: [PATCH 451/646] vendor updates --- composer.lock | 244 +++++++++++++++++++++++++------------- webroot/package-lock.json | 44 ++++--- webroot/package.json | 4 +- 3 files changed, 194 insertions(+), 98 deletions(-) diff --git a/composer.lock b/composer.lock index b6efa2df0b..aad6d9ac6e 100644 --- a/composer.lock +++ b/composer.lock @@ -925,16 +925,16 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.23.0", + "version": "2.24.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "a738cecb420e3bcff34c33177f1ce9f68902695c" + "reference": "6028af6c3b5ced4d063a680d2483cce67578b902" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/a738cecb420e3bcff34c33177f1ce9f68902695c", - "reference": "a738cecb420e3bcff34c33177f1ce9f68902695c", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/6028af6c3b5ced4d063a680d2483cce67578b902", + "reference": "6028af6c3b5ced4d063a680d2483cce67578b902", "shasum": "" }, "require": { @@ -957,9 +957,9 @@ "http-interop/http-factory-tests": "^0.9.0", "laminas/laminas-coding-standard": "^2.4.0", "php-http/psr7-integration-tests": "^1.2", - "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "^0.18.0", - "vimeo/psalm": "^5.0.0" + "phpunit/phpunit": "^9.5.27", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.4" }, "type": "library", "extra": { @@ -1018,7 +1018,7 @@ "type": "community_bridge" } ], - "time": "2022-12-14T22:31:50+00:00" + "time": "2022-12-20T12:22:40+00:00" }, { "name": "laminas/laminas-httphandlerrunner", @@ -1934,16 +1934,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.25.2", + "version": "1.26.0", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5" + "reference": "5b6ceea9705b068f993e268e4debc566c2637063" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a317a09e7def49852400a4b3eca4a4b0790ceeb5", - "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/5b6ceea9705b068f993e268e4debc566c2637063", + "reference": "5b6ceea9705b068f993e268e4debc566c2637063", "shasum": "" }, "require": { @@ -1964,7 +1964,7 @@ "maennchen/zipstream-php": "^2.1", "markbaker/complex": "^3.0", "markbaker/matrix": "^3.0", - "php": "^7.3 || ^8.0", + "php": "^7.4 || ^8.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", "psr/simple-cache": "^1.0 || ^2.0 || ^3.0" @@ -1973,14 +1973,14 @@ "dealerdirect/phpcodesniffer-composer-installer": "dev-master", "dompdf/dompdf": "^1.0 || ^2.0", "friendsofphp/php-cs-fixer": "^3.2", - "mitoteam/jpgraph": "10.2.4", - "mpdf/mpdf": "8.1.1", + "mitoteam/jpgraph": "^10.2.4", + "mpdf/mpdf": "^8.1.1", "phpcompatibility/php-compatibility": "^9.3", "phpstan/phpstan": "^1.1", "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^8.5 || ^9.0", "squizlabs/php_codesniffer": "^3.7", - "tecnickcom/tcpdf": "6.5" + "tecnickcom/tcpdf": "^6.5" }, "suggest": { "dompdf/dompdf": "Option for rendering PDF with PDF Writer", @@ -2033,9 +2033,9 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.25.2" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.26.0" }, - "time": "2022-09-25T17:21:01+00:00" + "time": "2022-12-21T12:22:06+00:00" }, { "name": "psr/container", @@ -2797,16 +2797,16 @@ }, { "name": "symfony/console", - "version": "v6.2.1", + "version": "v6.2.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "58f6cef5dc5f641b7bbdbf8b32b44cc926c35f3f" + "reference": "5a9bd5c543f00157c55face973c149957467db31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/58f6cef5dc5f641b7bbdbf8b32b44cc926c35f3f", - "reference": "58f6cef5dc5f641b7bbdbf8b32b44cc926c35f3f", + "url": "https://api.github.com/repos/symfony/console/zipball/5a9bd5c543f00157c55face973c149957467db31", + "reference": "5a9bd5c543f00157c55face973c149957467db31", "shasum": "" }, "require": { @@ -2873,7 +2873,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.2.1" + "source": "https://github.com/symfony/console/tree/v6.2.2" }, "funding": [ { @@ -2889,7 +2889,7 @@ "type": "tidelift" } ], - "time": "2022-12-01T13:44:20+00:00" + "time": "2022-12-16T15:08:36+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3353,16 +3353,16 @@ }, { "name": "symfony/service-contracts", - "version": "v3.1.1", + "version": "v3.2.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239" + "reference": "aac98028c69df04ee77eb69b96b86ee51fbf4b75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/925e713fe8fcacf6bc05e936edd8dd5441a21239", - "reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/aac98028c69df04ee77eb69b96b86ee51fbf4b75", + "reference": "aac98028c69df04ee77eb69b96b86ee51fbf4b75", "shasum": "" }, "require": { @@ -3378,7 +3378,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.1-dev" + "dev-main": "3.3-dev" }, "thanks": { "name": "symfony/contracts", @@ -3418,7 +3418,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.1.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.2.0" }, "funding": [ { @@ -3434,20 +3434,20 @@ "type": "tidelift" } ], - "time": "2022-05-30T19:18:58+00:00" + "time": "2022-11-25T10:21:52+00:00" }, { "name": "symfony/string", - "version": "v6.2.0", + "version": "v6.2.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "145702685e0d12f81d755c71127bfff7582fdd36" + "reference": "863219fd713fa41cbcd285a79723f94672faff4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/145702685e0d12f81d755c71127bfff7582fdd36", - "reference": "145702685e0d12f81d755c71127bfff7582fdd36", + "url": "https://api.github.com/repos/symfony/string/zipball/863219fd713fa41cbcd285a79723f94672faff4d", + "reference": "863219fd713fa41cbcd285a79723f94672faff4d", "shasum": "" }, "require": { @@ -3504,7 +3504,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.2.0" + "source": "https://github.com/symfony/string/tree/v6.2.2" }, "funding": [ { @@ -3520,20 +3520,20 @@ "type": "tidelift" } ], - "time": "2022-11-30T17:13:47+00:00" + "time": "2022-12-14T16:11:27+00:00" }, { "name": "tecnickcom/tcpdf", - "version": "6.6.1", + "version": "6.6.2", "source": { "type": "git", "url": "https://github.com/tecnickcom/TCPDF.git", - "reference": "a336b531f6f6b5487fca0caf034a671d4e60df5c" + "reference": "e3cffc9bcbc76e89e167e9eb0bbda0cab7518459" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/a336b531f6f6b5487fca0caf034a671d4e60df5c", - "reference": "a336b531f6f6b5487fca0caf034a671d4e60df5c", + "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/e3cffc9bcbc76e89e167e9eb0bbda0cab7518459", + "reference": "e3cffc9bcbc76e89e167e9eb0bbda0cab7518459", "shasum": "" }, "require": { @@ -3584,7 +3584,7 @@ ], "support": { "issues": "https://github.com/tecnickcom/TCPDF/issues", - "source": "https://github.com/tecnickcom/TCPDF/tree/v" + "source": "https://github.com/tecnickcom/TCPDF/tree/6.6.2" }, "funding": [ { @@ -3592,7 +3592,7 @@ "type": "custom" } ], - "time": "2022-12-12T14:42:28+00:00" + "time": "2022-12-17T10:28:59+00:00" }, { "name": "ua-parser/uap-php", @@ -4021,23 +4021,23 @@ }, { "name": "composer/composer", - "version": "2.4.4", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "e8d9087229bcdbc5867594d3098091412f1130cf" + "reference": "09ef0e3acbb377f28927fa6a527c251da713ebac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/e8d9087229bcdbc5867594d3098091412f1130cf", - "reference": "e8d9087229bcdbc5867594d3098091412f1130cf", + "url": "https://api.github.com/repos/composer/composer/zipball/09ef0e3acbb377f28927fa6a527c251da713ebac", + "reference": "09ef0e3acbb377f28927fa6a527c251da713ebac", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0", "composer/class-map-generator": "^1.0", "composer/metadata-minifier": "^1.0", - "composer/pcre": "^2 || ^3", + "composer/pcre": "^2.1 || ^3.1", "composer/semver": "^3.0", "composer/spdx-licenses": "^1.5.7", "composer/xdebug-handler": "^2.0.2 || ^3.0.3", @@ -4053,10 +4053,11 @@ "symfony/finder": "^5.4 || ^6.0", "symfony/polyfill-php73": "^1.24", "symfony/polyfill-php80": "^1.24", + "symfony/polyfill-php81": "^1.24", "symfony/process": "^5.4 || ^6.0" }, "require-dev": { - "phpstan/phpstan": "^1.4.1", + "phpstan/phpstan": "^1.9.3", "phpstan/phpstan-deprecation-rules": "^1", "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1", @@ -4074,7 +4075,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "phpstan": { "includes": [ @@ -4113,7 +4114,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.4.4" + "source": "https://github.com/composer/composer/tree/2.5.0" }, "funding": [ { @@ -4129,7 +4130,7 @@ "type": "tidelift" } ], - "time": "2022-10-27T12:39:29+00:00" + "time": "2022-12-20T09:44:08+00:00" }, { "name": "composer/metadata-minifier", @@ -5137,16 +5138,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.15.0", + "version": "1.15.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "6ff970a7101acfe99b3048e4bbfbc094e55c5b04" + "reference": "61800f71a5526081d1b5633766aa88341f1ade76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ff970a7101acfe99b3048e4bbfbc094e55c5b04", - "reference": "6ff970a7101acfe99b3048e4bbfbc094e55c5b04", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/61800f71a5526081d1b5633766aa88341f1ade76", + "reference": "61800f71a5526081d1b5633766aa88341f1ade76", "shasum": "" }, "require": { @@ -5176,22 +5177,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.15.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.15.3" }, - "time": "2022-12-07T16:12:39+00:00" + "time": "2022-12-20T20:56:55+00:00" }, { "name": "phpstan/phpstan", - "version": "1.9.3", + "version": "1.9.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "709999b91448d4f2bb07daffffedc889b33e461c" + "reference": "d03bccee595e2146b7c9d174486b84f4dc61b0f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/709999b91448d4f2bb07daffffedc889b33e461c", - "reference": "709999b91448d4f2bb07daffffedc889b33e461c", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d03bccee595e2146b7c9d174486b84f4dc61b0f2", + "reference": "d03bccee595e2146b7c9d174486b84f4dc61b0f2", "shasum": "" }, "require": { @@ -5221,7 +5222,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.3" + "source": "https://github.com/phpstan/phpstan/tree/1.9.4" }, "funding": [ { @@ -5237,20 +5238,20 @@ "type": "tidelift" } ], - "time": "2022-12-13T10:28:10+00:00" + "time": "2022-12-17T13:33:52+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.21", + "version": "9.2.22", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "3f893e19712bb0c8bc86665d1562e9fd509c4ef0" + "reference": "e4bf60d2220b4baaa0572986b5d69870226b06df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/3f893e19712bb0c8bc86665d1562e9fd509c4ef0", - "reference": "3f893e19712bb0c8bc86665d1562e9fd509c4ef0", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e4bf60d2220b4baaa0572986b5d69870226b06df", + "reference": "e4bf60d2220b4baaa0572986b5d69870226b06df", "shasum": "" }, "require": { @@ -5306,7 +5307,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.21" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.22" }, "funding": [ { @@ -5314,7 +5315,7 @@ "type": "github" } ], - "time": "2022-12-14T13:26:54+00:00" + "time": "2022-12-18T16:40:55+00:00" }, { "name": "phpunit/php-file-iterator", @@ -6950,16 +6951,16 @@ }, { "name": "slevomat/coding-standard", - "version": "8.7.0", + "version": "8.7.1", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "326d195209d196be02f8c2a0034529262fc7ffcc" + "reference": "c51edb898bebd36aac70a190c6a41a7c056bb5b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/326d195209d196be02f8c2a0034529262fc7ffcc", - "reference": "326d195209d196be02f8c2a0034529262fc7ffcc", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/c51edb898bebd36aac70a190c6a41a7c056bb5b9", + "reference": "c51edb898bebd36aac70a190c6a41a7c056bb5b9", "shasum": "" }, "require": { @@ -6999,7 +7000,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.7.0" + "source": "https://github.com/slevomat/coding-standard/tree/8.7.1" }, "funding": [ { @@ -7011,7 +7012,7 @@ "type": "tidelift" } ], - "time": "2022-12-13T15:02:08+00:00" + "time": "2022-12-14T08:49:18+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -7295,6 +7296,85 @@ ], "time": "2022-11-03T14:55:06+00:00" }, + { + "name": "symfony/polyfill-php81", + "version": "v1.27.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.27-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-11-03T14:55:06+00:00" + }, { "name": "symfony/process", "version": "v6.2.0", @@ -7358,16 +7438,16 @@ }, { "name": "symfony/var-dumper", - "version": "v6.2.1", + "version": "v6.2.2", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "1e7544c8698627b908657e5276854d52ab70087a" + "reference": "6168f544827e897f708a684f75072a8c33a5e309" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1e7544c8698627b908657e5276854d52ab70087a", - "reference": "1e7544c8698627b908657e5276854d52ab70087a", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6168f544827e897f708a684f75072a8c33a5e309", + "reference": "6168f544827e897f708a684f75072a8c33a5e309", "shasum": "" }, "require": { @@ -7426,7 +7506,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.2.1" + "source": "https://github.com/symfony/var-dumper/tree/v6.2.2" }, "funding": [ { @@ -7442,7 +7522,7 @@ "type": "tidelift" } ], - "time": "2022-12-03T22:32:58+00:00" + "time": "2022-12-14T16:11:27+00:00" }, { "name": "theseer/tokenizer", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index 5a2272b316..8224f0ccfa 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -14,12 +14,12 @@ "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.3", "bootstrap-select": "^1.14.0-beta3", - "chart.js": "^4.0.1", + "chart.js": "^4.1.1", "chartjs-plugin-datalabels": "^2.2.0", "ckeditor4": "^4.20.1", "clean-css-cli": "^5.6.1", "clipboard": "^2.0.11", - "jquery": "^3.6.2", + "jquery": "^3.6.3", "jquery-backstretch": "^2.1.18", "jquery-knob": "~1.2.11", "jquery-ui": "^1.13.2", @@ -81,6 +81,11 @@ "node": ">=6" } }, + "node_modules/@kurkle/color": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.1.tgz", + "integrity": "sha512-hW0GwZj06z/ZFUW2Espl7toVDjghJN+EKqyXzPSV8NV89d5BYp5rRMBJoc+aUN0x5OXDMeRQHazejr2Xmqj2tw==" + }, "node_modules/@popperjs/core": { "version": "2.11.6", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", @@ -248,9 +253,12 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "node_modules/chart.js": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.0.1.tgz", - "integrity": "sha512-5/8/9eBivwBZK81mKvmIwTb2Pmw4D/5h1RK9fBWZLLZ8mCJ+kfYNmV9rMrGoa5Hgy2/wVDBMLSUDudul2/9ihA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.1.1.tgz", + "integrity": "sha512-P0pCosNXp+LR8zO/QTkZKT6Hb7p0DPFtypEeVOf+6x06hX13NIb75R0DXUA4Ksx/+48chDQKtCCmRCviQRTqsA==", + "dependencies": { + "@kurkle/color": "^0.3.0" + }, "engines": { "pnpm": "^7.0.0" } @@ -651,9 +659,9 @@ "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==" }, "node_modules/jquery": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.2.tgz", - "integrity": "sha512-/e7ulNIEEYk1Z/l4X0vpxGt+B/dNsV8ghOPAWZaJs8pkGvsSC0tm33aMGylXcj/U7y4IcvwtMXPMyBFZn/gK9A==" + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz", + "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==" }, "node_modules/jquery-backstretch": { "version": "2.1.18", @@ -1170,6 +1178,11 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz", "integrity": "sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A==" }, + "@kurkle/color": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.1.tgz", + "integrity": "sha512-hW0GwZj06z/ZFUW2Espl7toVDjghJN+EKqyXzPSV8NV89d5BYp5rRMBJoc+aUN0x5OXDMeRQHazejr2Xmqj2tw==" + }, "@popperjs/core": { "version": "2.11.6", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", @@ -1293,9 +1306,12 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "chart.js": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.0.1.tgz", - "integrity": "sha512-5/8/9eBivwBZK81mKvmIwTb2Pmw4D/5h1RK9fBWZLLZ8mCJ+kfYNmV9rMrGoa5Hgy2/wVDBMLSUDudul2/9ihA==" + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.1.1.tgz", + "integrity": "sha512-P0pCosNXp+LR8zO/QTkZKT6Hb7p0DPFtypEeVOf+6x06hX13NIb75R0DXUA4Ksx/+48chDQKtCCmRCviQRTqsA==", + "requires": { + "@kurkle/color": "^0.3.0" + } }, "chartjs-plugin-datalabels": { "version": "2.2.0", @@ -1606,9 +1622,9 @@ "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==" }, "jquery": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.2.tgz", - "integrity": "sha512-/e7ulNIEEYk1Z/l4X0vpxGt+B/dNsV8ghOPAWZaJs8pkGvsSC0tm33aMGylXcj/U7y4IcvwtMXPMyBFZn/gK9A==" + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz", + "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==" }, "jquery-backstretch": { "version": "2.1.18", diff --git a/webroot/package.json b/webroot/package.json index fddc8ff012..f63fb46ea3 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -20,12 +20,12 @@ "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.3", "bootstrap-select": "^1.14.0-beta3", - "chart.js": "^4.0.1", + "chart.js": "^4.1.1", "chartjs-plugin-datalabels": "^2.2.0", "ckeditor4": "^4.20.1", "clean-css-cli": "^5.6.1", "clipboard": "^2.0.11", - "jquery": "^3.6.2", + "jquery": "^3.6.3", "jquery-backstretch": "^2.1.18", "jquery-knob": "~1.2.11", "jquery-ui": "^1.13.2", From 23e99896da31342840763c43b1e2921c80af4cc5 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 21 Dec 2022 16:47:39 +0100 Subject: [PATCH 452/646] removed oooh --- resources/locales/de_DE/cake.mo | Bin 524 -> 515 bytes resources/locales/de_DE/cake.po | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/locales/de_DE/cake.mo b/resources/locales/de_DE/cake.mo index 108901fdcf8903b346bad9739cb4b712fb273450..595b4cf74683184f7207844a4504a90ef574cecb 100644 GIT binary patch delta 61 zcmeBSX=a(=A|}Vcz;KF@fk6~VzXa0EK>9!9#HczRBV9uyT_ZyULo+LriBIlx80#77 N8F4YVPQJou0RV$I4d(y= delta 70 zcmZo>>0z1RBBsv3z;KF@fk6~Ve*)6XK$?STVpJWEp{{|Uu93Ndp^268#3%O!jr2_P WjJO#5^YimFGBR`&QYW8gv;Y9?8xTYQ diff --git a/resources/locales/de_DE/cake.po b/resources/locales/de_DE/cake.po index a5502801e0..1f4cfe55f6 100644 --- a/resources/locales/de_DE/cake.po +++ b/resources/locales/de_DE/cake.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "POT-Creation-Date: 2018-06-11 18:16+0200\n" -"PO-Revision-Date: 2021-01-27 14:37+0100\n" +"PO-Revision-Date: 2022-12-21 16:47+0100\n" "Last-Translator: \n" "Language-Team: EMAIL@ADDRESS\n" "Language: de_DE\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.2\n" +"X-Generator: Poedit 3.2.2\n" msgid "You are not authorized to access that location." msgstr "" @@ -28,7 +28,7 @@ msgid "Not Found" msgstr "Seite nicht gefunden." msgid "An Internal Error Has Occurred." -msgstr "Oooohhh, es ist ein Fehler aufgetreten." +msgstr "Es ist ein Fehler aufgetreten." msgid "The requested file contains `..` and will not be read." msgstr "" From e3f86c15762630e1262350f6387e11a5aa2d86a0 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 21 Dec 2022 20:03:07 +0100 Subject: [PATCH 453/646] fixed github actions badge --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6aef82b4b8..c0c5259152 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ Latest stable version - Build status + Build status + From 6b763dca15d6a627e6485c17e8c573d84e16eaa8 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 27 Dec 2022 10:26:41 +0100 Subject: [PATCH 454/646] vendor updates --- composer.lock | 24 ++++++++++++------------ webroot/package-lock.json | 14 +++++++------- webroot/package.json | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/composer.lock b/composer.lock index aad6d9ac6e..9fdcdb2fcf 100644 --- a/composer.lock +++ b/composer.lock @@ -4021,16 +4021,16 @@ }, { "name": "composer/composer", - "version": "2.5.0", + "version": "2.5.1", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "09ef0e3acbb377f28927fa6a527c251da713ebac" + "reference": "923278ad13e1621946eb76ab2882655d2cc396a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/09ef0e3acbb377f28927fa6a527c251da713ebac", - "reference": "09ef0e3acbb377f28927fa6a527c251da713ebac", + "url": "https://api.github.com/repos/composer/composer/zipball/923278ad13e1621946eb76ab2882655d2cc396a4", + "reference": "923278ad13e1621946eb76ab2882655d2cc396a4", "shasum": "" }, "require": { @@ -4114,7 +4114,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.5.0" + "source": "https://github.com/composer/composer/tree/2.5.1" }, "funding": [ { @@ -4130,7 +4130,7 @@ "type": "tidelift" } ], - "time": "2022-12-20T09:44:08+00:00" + "time": "2022-12-22T14:33:54+00:00" }, { "name": "composer/metadata-minifier", @@ -5662,16 +5662,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.9", + "version": "v0.11.10", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "1acec99d6684a54ff92f8b548a4e41b566963778" + "reference": "e9eadffbed9c9deb5426fd107faae0452bf20a36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/1acec99d6684a54ff92f8b548a4e41b566963778", - "reference": "1acec99d6684a54ff92f8b548a4e41b566963778", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e9eadffbed9c9deb5426fd107faae0452bf20a36", + "reference": "e9eadffbed9c9deb5426fd107faae0452bf20a36", "shasum": "" }, "require": { @@ -5732,9 +5732,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.9" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.10" }, - "time": "2022-11-06T15:29:46+00:00" + "time": "2022-12-23T17:47:18+00:00" }, { "name": "react/promise", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index 8224f0ccfa..004731e8a2 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -9,7 +9,7 @@ "license": "AGPL-3.0", "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.1.0", - "@ericblade/quagga2": "^1.7.7", + "@ericblade/quagga2": "^1.8.1", "@fortawesome/fontawesome-free": "^6.2.1", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.3", @@ -54,9 +54,9 @@ } }, "node_modules/@ericblade/quagga2": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.7.tgz", - "integrity": "sha512-cuTgtEgr8O86kFEAjCg5BYOiKdXVk71DYQ1SwWlyA09+JWySL5GDgSSi3Pg7jc3m8SMaKvVoVxye4mgRo9nEPw==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.8.1.tgz", + "integrity": "sha512-fsUnZu5iQQ7n9F8T3690I82Yq86Qt/GvZZ6DOIVEqBGQk8M2C+iQVVmW6Aiq7eKFcXPXEZyxbClqPHvinN8BNw==", "dependencies": { "@babel/polyfill": "^7.12.1", "get-pixels": "^3.3.3", @@ -1160,9 +1160,9 @@ } }, "@ericblade/quagga2": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.7.7.tgz", - "integrity": "sha512-cuTgtEgr8O86kFEAjCg5BYOiKdXVk71DYQ1SwWlyA09+JWySL5GDgSSi3Pg7jc3m8SMaKvVoVxye4mgRo9nEPw==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.8.1.tgz", + "integrity": "sha512-fsUnZu5iQQ7n9F8T3690I82Yq86Qt/GvZZ6DOIVEqBGQk8M2C+iQVVmW6Aiq7eKFcXPXEZyxbClqPHvinN8BNw==", "requires": { "@babel/polyfill": "^7.12.1", "fsevents": "2.3.2", diff --git a/webroot/package.json b/webroot/package.json index f63fb46ea3..85a4a4c5f6 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.1.0", - "@ericblade/quagga2": "^1.7.7", + "@ericblade/quagga2": "^1.8.1", "@fortawesome/fontawesome-free": "^6.2.1", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.3", From 4dcbd9157f0ee3a73c0ad343d824714b23513105 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 29 Dec 2022 19:27:38 +0100 Subject: [PATCH 455/646] fixed invalid selector in firefox --- plugins/Admin/webroot/js/upload.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/Admin/webroot/js/upload.js b/plugins/Admin/webroot/js/upload.js index 0181903942..57574b80b4 100644 --- a/plugins/Admin/webroot/js/upload.js +++ b/plugins/Admin/webroot/js/upload.js @@ -27,7 +27,7 @@ foodcoopshop.Upload = { if (image.length == 0) { return; } - $('body.blog_posts input[name="BlogPosts[tmp_image]"').val(image.attr('src')); + $('body.blog_posts input[name="BlogPosts[tmp_image]"]').val(image.attr('src')); var button = $('body.blog_posts a.add-image-button'); button.removeClass('uploaded').addClass('uploaded'); button.html(''); @@ -41,7 +41,7 @@ foodcoopshop.Upload = { if (image.length == 0) { return; } - $('body.manufacturers input[name="Manufacturers[tmp_image]"').val(image.attr('src')); + $('body.manufacturers input[name="Manufacturers[tmp_image]"]').val(image.attr('src')); var button = $('body.manufacturers a.add-image-button'); button.removeClass('uploaded').addClass('uploaded'); button.html(''); @@ -55,7 +55,7 @@ foodcoopshop.Upload = { if (image.length == 0) { return; } - $('body.customers input[name="Customers[tmp_image]"').val(image.attr('src')); + $('body.customers input[name="Customers[tmp_image]"]').val(image.attr('src')); var button = $('body.customers a.add-image-button'); button.removeClass('uploaded').addClass('uploaded'); button.html(''); @@ -66,7 +66,7 @@ foodcoopshop.Upload = { saveManufacturerTmpGeneralTermsAndConditionsInForm : function(modalSelector) { var filename = $(modalSelector + ' form .drop a').attr('href'); - $('body.manufacturers input[name="Manufacturers[tmp_general_terms_and_conditions]"').val(filename); + $('body.manufacturers input[name="Manufacturers[tmp_general_terms_and_conditions]"]').val(filename); var button= $('body.manufacturers a.add-general-terms-and-conditions-button'); button.removeClass('uploaded').addClass('uploaded').find('a').attr('href', filename); button.find('span').text(foodcoopshop.LocalizedJs.upload.ChangeGeneralTermsAndConditions); @@ -78,7 +78,7 @@ foodcoopshop.Upload = { if (image.length == 0) { return; } - $('body.categories input[name="Categories[tmp_image]"').val(image.attr('src')); + $('body.categories input[name="Categories[tmp_image]"]').val(image.attr('src')); var button = $('body.categories a.add-image-button'); button.removeClass('uploaded').addClass('uploaded'); button.html(''); @@ -92,7 +92,7 @@ foodcoopshop.Upload = { if (image.length == 0) { return; } - $('body.sliders input[name="Sliders[tmp_image]"').val(image.attr('src')); + $('body.sliders input[name="Sliders[tmp_image]"]').val(image.attr('src')); var button = $('body.sliders a.add-image-button'); button.removeClass('uploaded').addClass('uploaded'); button.html(''); From 5bef47d7b7c11ed87adeff94dcf455e3a1c8c402 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 1 Jan 2023 16:29:36 +0100 Subject: [PATCH 456/646] remove php 8.2 deprecation --- src/Lib/Pdf/BarCodeTcpdf.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Lib/Pdf/BarCodeTcpdf.php b/src/Lib/Pdf/BarCodeTcpdf.php index eaefbe574b..35d83d0eb1 100644 --- a/src/Lib/Pdf/BarCodeTcpdf.php +++ b/src/Lib/Pdf/BarCodeTcpdf.php @@ -36,6 +36,8 @@ class BarCodeTcpdf extends AppTcpdf 'stretchtext' => 4 ]; + public $html = ''; + public function __construct($orientation = 'P', $unit = 'mm', $format = 'A4', $unicode = true, $encoding = 'UTF-8', $diskcache = false, $pdfa = false) { parent::__construct($orientation, $unit, $format, $unicode, $encoding, $diskcache, $pdfa); From 25a0b359e31b63886000d2b56728a403445739e5 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 1 Jan 2023 16:38:38 +0100 Subject: [PATCH 457/646] fix link color --- webroot/css/global.css | 1 + 1 file changed, 1 insertion(+) diff --git a/webroot/css/global.css b/webroot/css/global.css index edcb4dacf2..c1d09c9936 100644 --- a/webroot/css/global.css +++ b/webroot/css/global.css @@ -634,6 +634,7 @@ tr.selected > td > div > i.far, table:not(.no-hover) tr:hover > td > div > i.far } .cookieConsentWrapper .cookieConsent__Left a { text-decoration: underline ! important; + color: var(--theme-color); } .cookieConsentWrapper .cookieConsent__Right { margin-top: 15px; From baa9f865d28fd041d8cc6178a99785971c071a46 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Sun, 1 Jan 2023 16:38:47 +0100 Subject: [PATCH 458/646] vendor updates --- composer.lock | 104 +++++++++++++++++++------------------- webroot/package-lock.json | 14 ++--- webroot/package.json | 2 +- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/composer.lock b/composer.lock index 9fdcdb2fcf..e222bcc6c2 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "cakephp/cakephp", - "version": "4.4.8", + "version": "4.4.9", "source": { "type": "git", "url": "https://github.com/cakephp/cakephp.git", - "reference": "ad188775dde89ad758dad9923ff558900914d59c" + "reference": "b3e6add8a6af520f15d01c80c6ed4e68e70d1302" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/cakephp/zipball/ad188775dde89ad758dad9923ff558900914d59c", - "reference": "ad188775dde89ad758dad9923ff558900914d59c", + "url": "https://api.github.com/repos/cakephp/cakephp/zipball/b3e6add8a6af520f15d01c80c6ed4e68e70d1302", + "reference": "b3e6add8a6af520f15d01c80c6ed4e68e70d1302", "shasum": "" }, "require": { @@ -108,7 +108,7 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/cakephp" }, - "time": "2022-12-02T02:29:42+00:00" + "time": "2022-12-30T02:48:54+00:00" }, { "name": "cakephp/chronos", @@ -2797,16 +2797,16 @@ }, { "name": "symfony/console", - "version": "v6.2.2", + "version": "v6.2.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "5a9bd5c543f00157c55face973c149957467db31" + "reference": "0f579613e771dba2dbb8211c382342a641f5da06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/5a9bd5c543f00157c55face973c149957467db31", - "reference": "5a9bd5c543f00157c55face973c149957467db31", + "url": "https://api.github.com/repos/symfony/console/zipball/0f579613e771dba2dbb8211c382342a641f5da06", + "reference": "0f579613e771dba2dbb8211c382342a641f5da06", "shasum": "" }, "require": { @@ -2873,7 +2873,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.2.2" + "source": "https://github.com/symfony/console/tree/v6.2.3" }, "funding": [ { @@ -2889,7 +2889,7 @@ "type": "tidelift" } ], - "time": "2022-12-16T15:08:36+00:00" + "time": "2022-12-28T14:26:22+00:00" }, { "name": "symfony/deprecation-contracts", @@ -4576,30 +4576,30 @@ }, { "name": "doctrine/instantiator", - "version": "1.4.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9", + "doctrine/coding-standard": "^9 || ^11", "ext-pdo": "*", "ext-phar": "*", "phpbench/phpbench": "^0.16 || ^1", "phpstan/phpstan": "^1.4", "phpstan/phpstan-phpunit": "^1", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.22" + "vimeo/psalm": "^4.30 || ^5.4" }, "type": "library", "autoload": { @@ -4626,7 +4626,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.1" + "source": "https://github.com/doctrine/instantiator/tree/1.5.0" }, "funding": [ { @@ -4642,7 +4642,7 @@ "type": "tidelift" } ], - "time": "2022-03-03T08:28:38+00:00" + "time": "2022-12-30T00:15:36+00:00" }, { "name": "ergebnis/phpstan-rules", @@ -5242,16 +5242,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.22", + "version": "9.2.23", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "e4bf60d2220b4baaa0572986b5d69870226b06df" + "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e4bf60d2220b4baaa0572986b5d69870226b06df", - "reference": "e4bf60d2220b4baaa0572986b5d69870226b06df", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", + "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", "shasum": "" }, "require": { @@ -5307,7 +5307,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.22" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23" }, "funding": [ { @@ -5315,7 +5315,7 @@ "type": "github" } ], - "time": "2022-12-18T16:40:55+00:00" + "time": "2022-12-28T12:41:10+00:00" }, { "name": "phpunit/php-file-iterator", @@ -7072,16 +7072,16 @@ }, { "name": "symfony/finder", - "version": "v6.2.0", + "version": "v6.2.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "eb2355f69519e4ef33f1835bca4c935f5d42e570" + "reference": "81eefbddfde282ee33b437ba5e13d7753211ae8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/eb2355f69519e4ef33f1835bca4c935f5d42e570", - "reference": "eb2355f69519e4ef33f1835bca4c935f5d42e570", + "url": "https://api.github.com/repos/symfony/finder/zipball/81eefbddfde282ee33b437ba5e13d7753211ae8e", + "reference": "81eefbddfde282ee33b437ba5e13d7753211ae8e", "shasum": "" }, "require": { @@ -7116,7 +7116,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.2.0" + "source": "https://github.com/symfony/finder/tree/v6.2.3" }, "funding": [ { @@ -7132,7 +7132,7 @@ "type": "tidelift" } ], - "time": "2022-10-09T08:55:40+00:00" + "time": "2022-12-22T17:55:15+00:00" }, { "name": "symfony/polyfill-php73", @@ -7438,16 +7438,16 @@ }, { "name": "symfony/var-dumper", - "version": "v6.2.2", + "version": "v6.2.3", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "6168f544827e897f708a684f75072a8c33a5e309" + "reference": "fdbadd4803bc3c96ef89238c9c9e2ebe424ec2e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6168f544827e897f708a684f75072a8c33a5e309", - "reference": "6168f544827e897f708a684f75072a8c33a5e309", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/fdbadd4803bc3c96ef89238c9c9e2ebe424ec2e0", + "reference": "fdbadd4803bc3c96ef89238c9c9e2ebe424ec2e0", "shasum": "" }, "require": { @@ -7506,7 +7506,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.2.2" + "source": "https://github.com/symfony/var-dumper/tree/v6.2.3" }, "funding": [ { @@ -7522,7 +7522,7 @@ "type": "tidelift" } ], - "time": "2022-12-14T16:11:27+00:00" + "time": "2022-12-22T17:55:15+00:00" }, { "name": "theseer/tokenizer", @@ -7576,16 +7576,16 @@ }, { "name": "twig/markdown-extra", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/twigphp/markdown-extra.git", - "reference": "25ed505b6ffd3b00f922ca682489dfbaf44eb1f7" + "reference": "cad864a40c914f682ff08d909e6bdebe5c5ed134" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/markdown-extra/zipball/25ed505b6ffd3b00f922ca682489dfbaf44eb1f7", - "reference": "25ed505b6ffd3b00f922ca682489dfbaf44eb1f7", + "url": "https://api.github.com/repos/twigphp/markdown-extra/zipball/cad864a40c914f682ff08d909e6bdebe5c5ed134", + "reference": "cad864a40c914f682ff08d909e6bdebe5c5ed134", "shasum": "" }, "require": { @@ -7596,13 +7596,13 @@ "erusev/parsedown": "^1.7", "league/commonmark": "^1.0|^2.0", "league/html-to-markdown": "^4.8|^5.0", - "michelf/php-markdown": "^1.8", + "michelf/php-markdown": "^1.8|^2.0", "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.5-dev" } }, "autoload": { @@ -7633,7 +7633,7 @@ "twig" ], "support": { - "source": "https://github.com/twigphp/markdown-extra/tree/v3.4.0" + "source": "https://github.com/twigphp/markdown-extra/tree/v3.5.0" }, "funding": [ { @@ -7645,20 +7645,20 @@ "type": "tidelift" } ], - "time": "2022-01-29T15:34:05+00:00" + "time": "2022-12-27T12:23:36+00:00" }, { "name": "twig/twig", - "version": "v3.4.3", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58" + "reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/c38fd6b0b7f370c198db91ffd02e23b517426b58", - "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/3ffcf4b7d890770466da3b2666f82ac054e7ec72", + "reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72", "shasum": "" }, "require": { @@ -7673,7 +7673,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "3.5-dev" } }, "autoload": { @@ -7709,7 +7709,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.4.3" + "source": "https://github.com/twigphp/Twig/tree/v3.5.0" }, "funding": [ { @@ -7721,7 +7721,7 @@ "type": "tidelift" } ], - "time": "2022-09-28T08:42:51+00:00" + "time": "2022-12-27T12:28:18+00:00" } ], "aliases": [], diff --git a/webroot/package-lock.json b/webroot/package-lock.json index 004731e8a2..01fdfae475 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -8,7 +8,7 @@ "hasInstallScript": true, "license": "AGPL-3.0", "dependencies": { - "@beyonk/gdpr-cookie-consent-banner": "^9.1.0", + "@beyonk/gdpr-cookie-consent-banner": "^9.1.1", "@ericblade/quagga2": "^1.8.1", "@fortawesome/fontawesome-free": "^6.2.1", "blueimp-file-upload": "^10.32.0", @@ -46,9 +46,9 @@ } }, "node_modules/@beyonk/gdpr-cookie-consent-banner": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/@beyonk/gdpr-cookie-consent-banner/-/gdpr-cookie-consent-banner-9.1.0.tgz", - "integrity": "sha512-Kz9OrBZBL+M1AaV1Xf60fkjhjqXLXzAzkpVZ4JzVeH1/dXsAybub1hocev7Niaqw+W9cDt0XYnRacLAaN1miKQ==", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/@beyonk/gdpr-cookie-consent-banner/-/gdpr-cookie-consent-banner-9.1.1.tgz", + "integrity": "sha512-l3ltb21B1isHzu9LOoPNiyqtWUoz3oRspzeAgSFJsK9rOBa5U7sWv0PbXJS8EenAh4aBsQiCagCTUyPJtNw9lQ==", "dependencies": { "js-cookie": "^3.0.1" } @@ -1152,9 +1152,9 @@ } }, "@beyonk/gdpr-cookie-consent-banner": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/@beyonk/gdpr-cookie-consent-banner/-/gdpr-cookie-consent-banner-9.1.0.tgz", - "integrity": "sha512-Kz9OrBZBL+M1AaV1Xf60fkjhjqXLXzAzkpVZ4JzVeH1/dXsAybub1hocev7Niaqw+W9cDt0XYnRacLAaN1miKQ==", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/@beyonk/gdpr-cookie-consent-banner/-/gdpr-cookie-consent-banner-9.1.1.tgz", + "integrity": "sha512-l3ltb21B1isHzu9LOoPNiyqtWUoz3oRspzeAgSFJsK9rOBa5U7sWv0PbXJS8EenAh4aBsQiCagCTUyPJtNw9lQ==", "requires": { "js-cookie": "^3.0.1" } diff --git a/webroot/package.json b/webroot/package.json index 85a4a4c5f6..410bc2a1f1 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -14,7 +14,7 @@ "install": "bash ../devtools/npm-post-install.sh" }, "dependencies": { - "@beyonk/gdpr-cookie-consent-banner": "^9.1.0", + "@beyonk/gdpr-cookie-consent-banner": "^9.1.1", "@ericblade/quagga2": "^1.8.1", "@fortawesome/fontawesome-free": "^6.2.1", "blueimp-file-upload": "^10.32.0", From 0bf5fdbeb949d10372510060a61a392b24c4acb8 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 5 Jan 2023 11:30:51 +0100 Subject: [PATCH 459/646] vendor updates --- composer.lock | 233 +++++++++++++++++++------------------- webroot/package-lock.json | 14 +-- webroot/package.json | 2 +- 3 files changed, 125 insertions(+), 124 deletions(-) diff --git a/composer.lock b/composer.lock index e222bcc6c2..51a8c1f34a 100644 --- a/composer.lock +++ b/composer.lock @@ -6,6 +6,55 @@ ], "content-hash": "33b9d6ab775ae3fb572162836ca3eed6", "packages": [ + { + "name": "brick/varexporter", + "version": "0.3.7", + "source": { + "type": "git", + "url": "https://github.com/brick/varexporter.git", + "reference": "3e263cd718d242594c52963760fee2059fd5833c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/brick/varexporter/zipball/3e263cd718d242594c52963760fee2059fd5833c", + "reference": "3e263cd718d242594c52963760fee2059fd5833c", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.0", + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.2", + "phpunit/phpunit": "^8.5 || ^9.0", + "vimeo/psalm": "4.23.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Brick\\VarExporter\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A powerful alternative to var_export(), which can export closures and objects without __set_state()", + "keywords": [ + "var_export" + ], + "support": { + "issues": "https://github.com/brick/varexporter/issues", + "source": "https://github.com/brick/varexporter/tree/0.3.7" + }, + "funding": [ + { + "url": "https://github.com/BenMorel", + "type": "github" + } + ], + "time": "2022-06-29T23:37:57+00:00" + }, { "name": "cakephp/cakephp", "version": "4.4.9", @@ -404,19 +453,20 @@ }, { "name": "dereuromark/cakephp-queue", - "version": "6.5.0", + "version": "6.6.0", "source": { "type": "git", "url": "https://github.com/dereuromark/cakephp-queue.git", - "reference": "3c18f31dd3cea930ed1ee37068375fea2944dcef" + "reference": "57740202aa69c4bb588c1b3604140563b8b2ab31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dereuromark/cakephp-queue/zipball/3c18f31dd3cea930ed1ee37068375fea2944dcef", - "reference": "3c18f31dd3cea930ed1ee37068375fea2944dcef", + "url": "https://api.github.com/repos/dereuromark/cakephp-queue/zipball/57740202aa69c4bb588c1b3604140563b8b2ab31", + "reference": "57740202aa69c4bb588c1b3604140563b8b2ab31", "shasum": "" }, "require": { + "brick/varexporter": "^0.3.5", "cakephp/cakephp": "^4.3.0", "php": ">=7.4" }, @@ -471,7 +521,7 @@ "issues": "https://github.com/dereuromark/cakephp-queue/issues", "source": "https://github.com/dereuromark/cakephp-queue" }, - "time": "2022-10-14T22:04:16+00:00" + "time": "2023-01-04T10:40:18+00:00" }, { "name": "ezyang/htmlpurifier", @@ -1932,6 +1982,62 @@ ], "time": "2022-08-04T09:53:51+00:00" }, + { + "name": "nikic/php-parser", + "version": "v4.15.2", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", + "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.0" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.9-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2" + }, + "time": "2022-11-12T15:38:23+00:00" + }, { "name": "phpoffice/phpspreadsheet", "version": "1.26.0", @@ -3659,55 +3765,6 @@ } ], "packages-dev": [ - { - "name": "brick/varexporter", - "version": "0.3.7", - "source": { - "type": "git", - "url": "https://github.com/brick/varexporter.git", - "reference": "3e263cd718d242594c52963760fee2059fd5833c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/brick/varexporter/zipball/3e263cd718d242594c52963760fee2059fd5833c", - "reference": "3e263cd718d242594c52963760fee2059fd5833c", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^4.0", - "php": "^7.2 || ^8.0" - }, - "require-dev": { - "php-coveralls/php-coveralls": "^2.2", - "phpunit/phpunit": "^8.5 || ^9.0", - "vimeo/psalm": "4.23.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Brick\\VarExporter\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "A powerful alternative to var_export(), which can export closures and objects without __set_state()", - "keywords": [ - "var_export" - ], - "support": { - "issues": "https://github.com/brick/varexporter/issues", - "source": "https://github.com/brick/varexporter/tree/0.3.7" - }, - "funding": [ - { - "url": "https://github.com/BenMorel", - "type": "github" - } - ], - "time": "2022-06-29T23:37:57+00:00" - }, { "name": "cakephp/bake", "version": "2.8.2", @@ -4969,62 +5026,6 @@ ], "time": "2022-03-03T13:19:32+00:00" }, - { - "name": "nikic/php-parser", - "version": "v4.15.2", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=7.0" - }, - "require-dev": { - "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" - }, - "bin": [ - "bin/php-parse" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.9-dev" - } - }, - "autoload": { - "psr-4": { - "PhpParser\\": "lib/PhpParser" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" - ], - "support": { - "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2" - }, - "time": "2022-11-12T15:38:23+00:00" - }, { "name": "phar-io/manifest", "version": "2.0.3", @@ -5183,16 +5184,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.9.4", + "version": "1.9.7", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "d03bccee595e2146b7c9d174486b84f4dc61b0f2" + "reference": "0501435cd342eac7664bd62155b1ef907fc60b6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d03bccee595e2146b7c9d174486b84f4dc61b0f2", - "reference": "d03bccee595e2146b7c9d174486b84f4dc61b0f2", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0501435cd342eac7664bd62155b1ef907fc60b6f", + "reference": "0501435cd342eac7664bd62155b1ef907fc60b6f", "shasum": "" }, "require": { @@ -5222,7 +5223,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.4" + "source": "https://github.com/phpstan/phpstan/tree/1.9.7" }, "funding": [ { @@ -5238,7 +5239,7 @@ "type": "tidelift" } ], - "time": "2022-12-17T13:33:52+00:00" + "time": "2023-01-04T21:59:57+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index 01fdfae475..746ad0831f 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -9,7 +9,7 @@ "license": "AGPL-3.0", "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.1.1", - "@ericblade/quagga2": "^1.8.1", + "@ericblade/quagga2": "^1.8.2", "@fortawesome/fontawesome-free": "^6.2.1", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.3", @@ -54,9 +54,9 @@ } }, "node_modules/@ericblade/quagga2": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.8.1.tgz", - "integrity": "sha512-fsUnZu5iQQ7n9F8T3690I82Yq86Qt/GvZZ6DOIVEqBGQk8M2C+iQVVmW6Aiq7eKFcXPXEZyxbClqPHvinN8BNw==", + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.8.2.tgz", + "integrity": "sha512-UCVC6nnE0z8sjdpJqtIHJDqRdVMdK3oJdDx0O1LhBK+eKqm01upTGEEFo2lglsAaW1cVrnxWEcwHmUnNUP0ukg==", "dependencies": { "@babel/polyfill": "^7.12.1", "get-pixels": "^3.3.3", @@ -1160,9 +1160,9 @@ } }, "@ericblade/quagga2": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.8.1.tgz", - "integrity": "sha512-fsUnZu5iQQ7n9F8T3690I82Yq86Qt/GvZZ6DOIVEqBGQk8M2C+iQVVmW6Aiq7eKFcXPXEZyxbClqPHvinN8BNw==", + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@ericblade/quagga2/-/quagga2-1.8.2.tgz", + "integrity": "sha512-UCVC6nnE0z8sjdpJqtIHJDqRdVMdK3oJdDx0O1LhBK+eKqm01upTGEEFo2lglsAaW1cVrnxWEcwHmUnNUP0ukg==", "requires": { "@babel/polyfill": "^7.12.1", "fsevents": "2.3.2", diff --git a/webroot/package.json b/webroot/package.json index 410bc2a1f1..06cd99aa88 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@beyonk/gdpr-cookie-consent-banner": "^9.1.1", - "@ericblade/quagga2": "^1.8.1", + "@ericblade/quagga2": "^1.8.2", "@fortawesome/fontawesome-free": "^6.2.1", "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.3", From 14aa6b0eeccb8921c784414ad6c34997cf2a1567 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 6 Jan 2023 18:36:11 +0100 Subject: [PATCH 460/646] invalid selector fix --- .../webroot/js/modal/modal-order-detail-pickup-day-edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Admin/webroot/js/modal/modal-order-detail-pickup-day-edit.js b/plugins/Admin/webroot/js/modal/modal-order-detail-pickup-day-edit.js index 6ec5db45ee..9032f7a46b 100644 --- a/plugins/Admin/webroot/js/modal/modal-order-detail-pickup-day-edit.js +++ b/plugins/Admin/webroot/js/modal/modal-order-detail-pickup-day-edit.js @@ -118,7 +118,7 @@ foodcoopshop.ModalOrderDetailPickupDayEdit = { new bootstrap.Modal(document.getElementById(modalSelector.replace(/#/, ''))).show(); var datepickerInput = $('#dialogChangePickupDay'); - datepickerInput.val($('.filter-container input[name="pickupDay[]"').val()); + datepickerInput.val($('.filter-container input[name="pickupDay[]"]').val()); datepickerInput.datepicker(); foodcoopshop.Helper.initCkeditor('dialogEditPickupDayReason', true); From f458d79dcf2fe94e017f43f9937f469ce043f7f3 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 6 Jan 2023 18:40:14 +0100 Subject: [PATCH 461/646] vendor updates --- composer.lock | 26 +++++++++++++------------- webroot/package-lock.json | 14 +++++++------- webroot/package.json | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/composer.lock b/composer.lock index 51a8c1f34a..dc0633509e 100644 --- a/composer.lock +++ b/composer.lock @@ -57,16 +57,16 @@ }, { "name": "cakephp/cakephp", - "version": "4.4.9", + "version": "4.4.10", "source": { "type": "git", "url": "https://github.com/cakephp/cakephp.git", - "reference": "b3e6add8a6af520f15d01c80c6ed4e68e70d1302" + "reference": "3b089816d7cae4cff0a2a4de3e1ee651f73979df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/cakephp/zipball/b3e6add8a6af520f15d01c80c6ed4e68e70d1302", - "reference": "b3e6add8a6af520f15d01c80c6ed4e68e70d1302", + "url": "https://api.github.com/repos/cakephp/cakephp/zipball/3b089816d7cae4cff0a2a4de3e1ee651f73979df", + "reference": "3b089816d7cae4cff0a2a4de3e1ee651f73979df", "shasum": "" }, "require": { @@ -157,7 +157,7 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/cakephp" }, - "time": "2022-12-30T02:48:54+00:00" + "time": "2023-01-06T03:13:27+00:00" }, { "name": "cakephp/chronos", @@ -1072,16 +1072,16 @@ }, { "name": "laminas/laminas-httphandlerrunner", - "version": "2.4.0", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-httphandlerrunner.git", - "reference": "d15af53895fd581b5a448a09fd9a4baebc4ae6e5" + "reference": "7a47834aaad7852816d2ec4fdbb0492163b039ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/d15af53895fd581b5a448a09fd9a4baebc4ae6e5", - "reference": "d15af53895fd581b5a448a09fd9a4baebc4ae6e5", + "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/7a47834aaad7852816d2ec4fdbb0492163b039ae", + "reference": "7a47834aaad7852816d2ec4fdbb0492163b039ae", "shasum": "" }, "require": { @@ -1093,9 +1093,9 @@ "require-dev": { "laminas/laminas-coding-standard": "~2.4.0", "laminas/laminas-diactoros": "^2.18", - "phpunit/phpunit": "^9.5.25", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.28" + "phpunit/phpunit": "^9.5.26", + "psalm/plugin-phpunit": "^0.18.0", + "vimeo/psalm": "^5.0.0" }, "type": "library", "extra": { @@ -1135,7 +1135,7 @@ "type": "community_bridge" } ], - "time": "2022-10-25T13:41:39+00:00" + "time": "2023-01-05T21:54:03+00:00" }, { "name": "league/climate", diff --git a/webroot/package-lock.json b/webroot/package-lock.json index 746ad0831f..cd540791b5 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -14,7 +14,7 @@ "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.3", "bootstrap-select": "^1.14.0-beta3", - "chart.js": "^4.1.1", + "chart.js": "^4.1.2", "chartjs-plugin-datalabels": "^2.2.0", "ckeditor4": "^4.20.1", "clean-css-cli": "^5.6.1", @@ -253,9 +253,9 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "node_modules/chart.js": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.1.1.tgz", - "integrity": "sha512-P0pCosNXp+LR8zO/QTkZKT6Hb7p0DPFtypEeVOf+6x06hX13NIb75R0DXUA4Ksx/+48chDQKtCCmRCviQRTqsA==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.1.2.tgz", + "integrity": "sha512-9L1w6WLPq6ztiWVVOYtDtpo0CUsBKDWPrUEdwChAyzczaikqeSwNKEv3QpJ7EO4ICcLSi6UDVhgvcnUhRJidRA==", "dependencies": { "@kurkle/color": "^0.3.0" }, @@ -1306,9 +1306,9 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "chart.js": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.1.1.tgz", - "integrity": "sha512-P0pCosNXp+LR8zO/QTkZKT6Hb7p0DPFtypEeVOf+6x06hX13NIb75R0DXUA4Ksx/+48chDQKtCCmRCviQRTqsA==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.1.2.tgz", + "integrity": "sha512-9L1w6WLPq6ztiWVVOYtDtpo0CUsBKDWPrUEdwChAyzczaikqeSwNKEv3QpJ7EO4ICcLSi6UDVhgvcnUhRJidRA==", "requires": { "@kurkle/color": "^0.3.0" } diff --git a/webroot/package.json b/webroot/package.json index 06cd99aa88..2e482c2699 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -20,7 +20,7 @@ "blueimp-file-upload": "^10.32.0", "bootstrap": "^5.2.3", "bootstrap-select": "^1.14.0-beta3", - "chart.js": "^4.1.1", + "chart.js": "^4.1.2", "chartjs-plugin-datalabels": "^2.2.0", "ckeditor4": "^4.20.1", "clean-css-cli": "^5.6.1", From 9b269571c9f5ffd4b5debbe10cb5f437a30c2f10 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 6 Jan 2023 21:37:33 +0100 Subject: [PATCH 462/646] replace mysqldump-php with better maintained fork --- composer.json | 2 +- composer.lock | 125 +++++++++++++------------- src/Command/BackupDatabaseCommand.php | 8 +- 3 files changed, 70 insertions(+), 65 deletions(-) diff --git a/composer.json b/composer.json index 4a7c8b0a95..fed503dffe 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "tecnickcom/tcpdf": "^6.4", "hisorange/browser-detect": "^4.4", "phpoffice/phpspreadsheet": "1.*", - "ifsnop/mysqldump-php": "^2.9" + "druidfi/mysqldump-php": "^1.0" }, "require-dev": { "psy/psysh": "@stable", diff --git a/composer.lock b/composer.lock index dc0633509e..be4d95eaa0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "33b9d6ab775ae3fb572162836ca3eed6", + "content-hash": "e07a28a046f1501cd103fda242e503fd", "packages": [ { "name": "brick/varexporter", @@ -523,6 +523,70 @@ }, "time": "2023-01-04T10:40:18+00:00" }, + { + "name": "druidfi/mysqldump-php", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/druidfi/mysqldump-php.git", + "reference": "15da1dd26e638674bc73fd963b33b26282c14c96" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/druidfi/mysqldump-php/zipball/15da1dd26e638674bc73fd963b33b26282c14c96", + "reference": "15da1dd26e638674bc73fd963b33b26282c14c96", + "shasum": "" + }, + "require": { + "composer-runtime-api": "^2", + "ext-pdo": "*", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^8.5.15 || ^9", + "squizlabs/php_codesniffer": "3.*" + }, + "type": "library", + "autoload": { + "psr-4": { + "Druidfi\\Mysqldump\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-3.0-or-later" + ], + "authors": [ + { + "name": "Druid.fi", + "email": "info@druid.fi" + }, + { + "name": "Diego Torres", + "homepage": "https://github.com/ifsnop", + "role": "Developer" + } + ], + "description": "PHP version of mysqldump cli that comes with MySQL", + "homepage": "https://github.com/druidfi/mysqldump-php", + "keywords": [ + "PHP7", + "database", + "mariadb", + "mysql", + "mysql-backup", + "mysqldump", + "pdo", + "php", + "php8", + "sql" + ], + "support": { + "issues": "https://github.com/druidfi/mysqldump-php/issues", + "source": "https://github.com/druidfi/mysqldump-php/tree/1.0.2" + }, + "time": "2022-12-31T09:51:45+00:00" + }, { "name": "ezyang/htmlpurifier", "version": "v4.16.0", @@ -778,65 +842,6 @@ }, "time": "2022-11-10T01:43:55+00:00" }, - { - "name": "ifsnop/mysqldump-php", - "version": "v2.9", - "source": { - "type": "git", - "url": "https://github.com/ifsnop/mysqldump-php.git", - "reference": "fc9c119fe5d70af9a685cad6a8ac612fd7589e25" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ifsnop/mysqldump-php/zipball/fc9c119fe5d70af9a685cad6a8ac612fd7589e25", - "reference": "fc9c119fe5d70af9a685cad6a8ac612fd7589e25", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "4.8.36", - "squizlabs/php_codesniffer": "1.*" - }, - "type": "library", - "autoload": { - "psr-4": { - "Ifsnop\\": "src/Ifsnop/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-3.0-or-later" - ], - "authors": [ - { - "name": "Diego Torres", - "homepage": "https://github.com/ifsnop", - "role": "Developer" - } - ], - "description": "PHP version of mysqldump cli that comes with MySQL", - "homepage": "https://github.com/ifsnop/mysqldump-php", - "keywords": [ - "PHP7", - "database", - "hhvm", - "mariadb", - "mysql", - "mysql-backup", - "mysqldump", - "pdo", - "php", - "php5", - "sql" - ], - "support": { - "issues": "https://github.com/ifsnop/mysqldump-php/issues", - "source": "https://github.com/ifsnop/mysqldump-php/tree/master" - }, - "time": "2020-04-03T14:40:40+00:00" - }, { "name": "intervention/image", "version": "2.7.2", diff --git a/src/Command/BackupDatabaseCommand.php b/src/Command/BackupDatabaseCommand.php index 6dd0989f72..ec68d26fd1 100644 --- a/src/Command/BackupDatabaseCommand.php +++ b/src/Command/BackupDatabaseCommand.php @@ -10,7 +10,7 @@ use Cake\Core\Configure; use Cake\Datasource\ConnectionManager; use Cake\I18n\Number; -use Ifsnop\Mysqldump as IMysqldump; +use Druidfi\Mysqldump; /** * FoodCoopShop - The open source software for your foodcoop @@ -60,14 +60,14 @@ public function execute(Arguments $args, ConsoleIo $io) } $settings = [ - 'default-character-set' => IMysqldump\Mysqldump::UTF8MB4, + 'default-character-set' => 'utf8mb4', 'add-drop-table' => true, - 'compress' => IMysqldump\Mysqldump::BZIP2, + 'compress' => 'Bzip2', 'exclude-tables' => [ 'queued_jobs', ], ]; - $dump = new IMysqldump\Mysqldump($dsnString, $dbConfig['username'], $dbConfig['password'], $settings); + $dump = new \Druidfi\Mysqldump\Mysqldump($dsnString, $dbConfig['username'], $dbConfig['password'], $settings); $dump->start($filename); $message = __('Database_backup_successful') . ' ('.Number::toReadableSize(filesize($filename)).').'; From 66caa01be7bc64cad761b25d06d634c046ebf084 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Mon, 9 Jan 2023 07:51:47 +0100 Subject: [PATCH 463/646] set php version to 8.2 in composer.json --- composer.json | 4 ++-- composer.lock | 42 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/composer.json b/composer.json index fed503dffe..e5c72f9dd3 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "config": { "platform": { - "php": "8.1" + "php": "8.2" }, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true, @@ -19,7 +19,7 @@ } }, "require": { - "php": ">=8.1", + "php": ">=8.2", "cakephp/cakephp": "4.4.*", "cakephp/migrations": "^3.0", "cakephp/plugin-installer": "^1.0", diff --git a/composer.lock b/composer.lock index be4d95eaa0..46d3e35e7c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e07a28a046f1501cd103fda242e503fd", + "content-hash": "1ce9015cdd9ae23147e0a5db38b7d4a7", "packages": [ { "name": "brick/varexporter", @@ -1682,21 +1682,21 @@ }, { "name": "markstory/mini-asset", - "version": "1.11.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/markstory/mini-asset.git", - "reference": "5b3f7d7876d3f7bd9377664208cc386341025e5f" + "reference": "017350eb1a546608d0aaaacf1853af2be95248fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/markstory/mini-asset/zipball/5b3f7d7876d3f7bd9377664208cc386341025e5f", - "reference": "5b3f7d7876d3f7bd9377664208cc386341025e5f", + "url": "https://api.github.com/repos/markstory/mini-asset/zipball/017350eb1a546608d0aaaacf1853af2be95248fc", + "reference": "017350eb1a546608d0aaaacf1853af2be95248fc", "shasum": "" }, "require": { "league/climate": "~3.0", - "php": ">=7.2,<8.2" + "php": ">=7.4,<8.3" }, "require-dev": { "laminas/laminas-diactoros": "~2.0", @@ -1747,7 +1747,7 @@ "issues": "https://github.com/markstory/mini-asset/issues", "source": "https://github.com/markstory/mini-asset" }, - "time": "2022-08-25T14:08:56+00:00" + "time": "2023-01-09T03:01:07+00:00" }, { "name": "matomo/device-detector", @@ -2622,16 +2622,16 @@ }, { "name": "robmorgan/phinx", - "version": "0.13.3", + "version": "0.13.4", "source": { "type": "git", "url": "https://github.com/cakephp/phinx.git", - "reference": "da741d10879bcdd235a830d589ae51659f746262" + "reference": "18e06e4a2b18947663438afd2f467e17c62e867d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/phinx/zipball/da741d10879bcdd235a830d589ae51659f746262", - "reference": "da741d10879bcdd235a830d589ae51659f746262", + "url": "https://api.github.com/repos/cakephp/phinx/zipball/18e06e4a2b18947663438afd2f467e17c62e867d", + "reference": "18e06e4a2b18947663438afd2f467e17c62e867d", "shasum": "" }, "require": { @@ -2702,9 +2702,9 @@ ], "support": { "issues": "https://github.com/cakephp/phinx/issues", - "source": "https://github.com/cakephp/phinx/tree/0.13.3" + "source": "https://github.com/cakephp/phinx/tree/0.13.4" }, - "time": "2022-12-01T16:30:23+00:00" + "time": "2023-01-07T00:42:55+00:00" }, { "name": "seld/cli-prompt", @@ -5189,16 +5189,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.9.7", + "version": "1.9.8", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "0501435cd342eac7664bd62155b1ef907fc60b6f" + "reference": "45411d15bf85a33b4a8ee9b75a6e82998c9adb97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0501435cd342eac7664bd62155b1ef907fc60b6f", - "reference": "0501435cd342eac7664bd62155b1ef907fc60b6f", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/45411d15bf85a33b4a8ee9b75a6e82998c9adb97", + "reference": "45411d15bf85a33b4a8ee9b75a6e82998c9adb97", "shasum": "" }, "require": { @@ -5228,7 +5228,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.7" + "source": "https://github.com/phpstan/phpstan/tree/1.9.8" }, "funding": [ { @@ -5244,7 +5244,7 @@ "type": "tidelift" } ], - "time": "2023-01-04T21:59:57+00:00" + "time": "2023-01-08T21:26:18+00:00" }, { "name": "phpunit/php-code-coverage", @@ -7738,11 +7738,11 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=8.1" + "php": ">=8.2" }, "platform-dev": [], "platform-overrides": { - "php": "8.1" + "php": "8.2" }, "plugin-api-version": "2.3.0" } From fc37d964a1256899a302527fd4802b74e808f552 Mon Sep 17 00:00:00 2001 From: Mario Rothauer Date: Mon, 9 Jan 2023 14:50:57 +0100 Subject: [PATCH 464/646] Feature/issue 920 edit user email checkbox (#921) * add checkbox for sending email after changing customer * layout fix * 921 * upsi --- CHANGELOG.md | 1 + config/app_config.php | 4 +-- .../src/Controller/OrderDetailsController.php | 3 ++- .../Admin/templates/Configurations/index.php | 5 ---- ...OrderDetailsControllerEditCustomerTest.php | 23 ++++++++++++------ ...odal-order-detail-product-customer-edit.js | 7 +++++- ...odal-order-detail-product-quantity-edit.js | 2 +- resources/locales/de_DE/default.mo | Bin 76021 -> 76127 bytes resources/locales/de_DE/default.po | 9 ++++--- resources/locales/default.pot | 5 +++- resources/locales/en_US/default.mo | Bin 71581 -> 71677 bytes resources/locales/en_US/default.po | 9 ++++--- src/Controller/LocalizedController.php | 1 + webroot/css/modal.css | 3 ++- 14 files changed, 46 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 511a679170..a9b5541785 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe - Bei der Umsatzstatistik kann jetzt auch nach "letzte 12 bzw. 24 Monate" gefiltert werden. [I#904](https://github.com/foodcoopshop/foodcoopshop/issues/904) / [PR#908](https://github.com/foodcoopshop/foodcoopshop/pull/908) - Bei allen Produkten kann jetzt die Anzahl der bestellten Einheiten für den nächsten Abholtag angezeigt werden. Das hilft, wenn bestimmte Gebindegrößen erreicht werden sollen. [I#909](https://github.com/foodcoopshop/foodcoopshop/issues/909) / [PR#910](https://github.com/foodcoopshop/foodcoopshop/pull/910) - Ab sofort kann auch ein dunkles Design verwendet werden. Das schont die Augen und spart bei OLED-Bildschirmen auch Strom. Einfach auf den Mond neben dem Anmelde-Link klicken. [I#873](https://github.com/foodcoopshop/foodcoopshop/issues/873) / [PR#913](https://github.com/foodcoopshop/foodcoopshop/pull/913) +- Beim Umbuchen auf ein anderes Mitglied kann jetzt über eine Checkbox ausgewählt werden, ob die betroffenen Mitglieder per Mail benachrichtigt werden sollen. [I#920](https://github.com/foodcoopshop/foodcoopshop/issues/920) / [PR#921](https://github.com/foodcoopshop/foodcoopshop/pull/921) ### For developers - New 🐳 [Docker Dev Environment](https://foodcoopshop.github.io/en/docker-dev-environment.html) and [Gitpod-Integration](https://gitpod.io/#https://github.com/foodcoopshop/foodcoopshop). [I#871](https://github.com/foodcoopshop/foodcoopshop/issues/871) / [PR#876](https://github.com/foodcoopshop/foodcoopshop/pull/876) / [PR#879](https://github.com/foodcoopshop/foodcoopshop/pull/879) / [PR#881](https://github.com/foodcoopshop/foodcoopshop/pull/881) diff --git a/config/app_config.php b/config/app_config.php index 3a1b3c3877..270e9830cd 100644 --- a/config/app_config.php +++ b/config/app_config.php @@ -180,9 +180,7 @@ 'showStatisticsForAdmins' => true, 'sendEmailWhenOrderDetailQuantityChanged' => true, - - 'sendEmailWhenOrderDetailCustomerChanged' => true, - + // if set, a paypal.me-link is added to the invoice-to-customer email 'paypalMeUsername' => '', diff --git a/plugins/Admin/src/Controller/OrderDetailsController.php b/plugins/Admin/src/Controller/OrderDetailsController.php index 5cfdc0c33e..b7fe93f951 100644 --- a/plugins/Admin/src/Controller/OrderDetailsController.php +++ b/plugins/Admin/src/Controller/OrderDetailsController.php @@ -865,6 +865,7 @@ public function editCustomer() $customerId = (int) $this->getRequest()->getData('customerId'); $editCustomerReason = strip_tags(html_entity_decode($this->getRequest()->getData('editCustomerReason'))); $amount = (int) $this->getRequest()->getData('amount'); + $sendEmailToCustomers = (bool) $this->getRequest()->getData('sendEmailToCustomers'); $this->OrderDetail = $this->getTableLocator()->get('OrderDetails'); $oldOrderDetail = $this->OrderDetail->find('all', [ @@ -996,7 +997,7 @@ public function editCustomer() $message .= ' '.__d('admin', 'Reason').': "' . $editCustomerReason . '"'; - if (Configure::read('app.sendEmailWhenOrderDetailCustomerChanged')) { + if ($sendEmailToCustomers) { $recipients = [ [ 'email' => $newCustomer->email, diff --git a/plugins/Admin/templates/Configurations/index.php b/plugins/Admin/templates/Configurations/index.php index d0dcf4ab39..5bcfe6f8cf 100644 --- a/plugins/Admin/templates/Configurations/index.php +++ b/plugins/Admin/templates/Configurations/index.php @@ -318,11 +318,6 @@ - - app.sendEmailWhenOrderDetailCustomerChanged - - - app.showTaxSumTableOnOrderDetailPdf diff --git a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditCustomerTest.php b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditCustomerTest.php index 4852ffc9f4..a2e53ac934 100644 --- a/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditCustomerTest.php +++ b/plugins/Admin/tests/TestCase/src/Controller/OrderDetails/OrderDetailsControllerEditCustomerTest.php @@ -28,13 +28,13 @@ class OrderDetailsControllerEditCustomerTest extends OrderDetailsControllerTestC public function testEditOrderDetailCustomerAsManufacturer() { $this->loginAsVegetableManufacturer(); - $this->editOrderDetailCustomer($this->orderDetailIdA, $this->newCustomerId, $this->editCustomerReason, $this->editCustomerAmount); + $this->editOrderDetailCustomer($this->orderDetailIdA, $this->newCustomerId, $this->editCustomerReason, $this->editCustomerAmount, true); $this->assertNotPerfectlyImplementedAccessRestricted(); } public function testEditOrderDetailCustomerAsSuperadminNotParted() { $this->loginAsSuperadmin(); - $this->editOrderDetailCustomer($this->orderDetailIdA, $this->newCustomerId, $this->editCustomerReason, $this->editCustomerAmount); + $this->editOrderDetailCustomer($this->orderDetailIdA, $this->newCustomerId, $this->editCustomerReason, $this->editCustomerAmount, true); $changedOrderDetails = $this->getOrderDetailsFromDatabase([$this->orderDetailIdA]); $this->assertEquals($this->newCustomerId, $changedOrderDetails[0]->id_customer); $this->assertEquals($this->editCustomerAmount, $changedOrderDetails[0]->product_amount); @@ -66,7 +66,7 @@ public function testEditOrderDetailCustomerAsSuperadminPartedIn2And5WithUnits() $cart = $this->getCartById($cartId); $orderDetailId = $cart->cart_products[0]->order_detail->id_order_detail; - $this->editOrderDetailCustomer($orderDetailId, $this->newCustomerId, $this->editCustomerReason, $this->editCustomerAmount); + $this->editOrderDetailCustomer($orderDetailId, $this->newCustomerId, $this->editCustomerReason, $this->editCustomerAmount, true); $changedOrderDetails = $this->getOrderDetailsFromDatabase([$orderDetailId, 5]); $this->assertEquals(Configure::read('test.superadminId'), $changedOrderDetails[0]->id_customer); @@ -102,7 +102,7 @@ public function testEditOrderDetailCustomerAsSuperadminPartedIn2And5WithUnitsAnd $cart = $this->getCartById($cartId); $orderDetailId = $cart->cart_products[0]->order_detail->id_order_detail; - $this->editOrderDetailCustomer($orderDetailId, $this->newCustomerId, $this->editCustomerReason, 3); + $this->editOrderDetailCustomer($orderDetailId, $this->newCustomerId, $this->editCustomerReason, 3, true); $changedOrderDetails = $this->getOrderDetailsFromDatabase([$orderDetailId, 5]); $changedOrderDetails = $this->OrderDetail->find('all', [ @@ -146,7 +146,7 @@ public function testEditOrderDetailCustomerAsSuperadminPartedIn2And5() $cart = $this->getCartById($cartId); $orderDetailId = $cart->cart_products[0]->order_detail->id_order_detail; - $this->editOrderDetailCustomer($orderDetailId, $this->newCustomerId, $this->editCustomerReason, $this->editCustomerAmount); + $this->editOrderDetailCustomer($orderDetailId, $this->newCustomerId, $this->editCustomerReason, $this->editCustomerAmount, true); $changedOrderDetails = $this->getOrderDetailsFromDatabase([$orderDetailId, 5]); $this->assertEquals(Configure::read('test.superadminId'), $changedOrderDetails[0]->id_customer); @@ -173,7 +173,15 @@ public function testEditOrderDetailCustomerAsSuperadminPartedIn2And5() } - private function editOrderDetailCustomer($orderDetailId, $customerId, $editCustomerReason, $amount) + public function testEditOrderDetailCustomerAsSuperadminNoEmailsSent() + { + $this->loginAsSuperadmin(); + $this->editOrderDetailCustomer($this->orderDetailIdA, $this->newCustomerId, $this->editCustomerReason, $this->editCustomerAmount, false); + $this->runAndAssertQueue(); + $this->assertNoMailSent(); + } + + private function editOrderDetailCustomer($orderDetailId, $customerId, $editCustomerReason, $amount, $sendEmailToCustomers) { $this->post( '/admin/order-details/editCustomer/', @@ -181,7 +189,8 @@ private function editOrderDetailCustomer($orderDetailId, $customerId, $editCusto 'orderDetailId' => $orderDetailId, 'customerId' => $customerId, 'editCustomerReason' => $editCustomerReason, - 'amount' => $amount + 'amount' => $amount, + 'sendEmailToCustomers' => $sendEmailToCustomers, ] ); } diff --git a/plugins/Admin/webroot/js/modal/modal-order-detail-product-customer-edit.js b/plugins/Admin/webroot/js/modal/modal-order-detail-product-customer-edit.js index d9811e4f0c..2e2cce568b 100644 --- a/plugins/Admin/webroot/js/modal/modal-order-detail-product-customer-edit.js +++ b/plugins/Admin/webroot/js/modal/modal-order-detail-product-customer-edit.js @@ -48,6 +48,10 @@ foodcoopshop.ModalOrderDetailProductCustomerEdit = { html += ''; html += ''; html += '

'; + html += ''; html += ''; return html; }, @@ -64,7 +68,8 @@ foodcoopshop.ModalOrderDetailProductCustomerEdit = { orderDetailId: $('#dialogOrderDetailEditCustomerOrderDetailId').val(), customerId: $('#dialogOrderDetailEditCustomerId').val(), editCustomerReason: CKEDITOR.instances['dialogEditCustomerReason'].getData().trim(), - amount: $('#dialogOrderDetailEditCustomerAmount').val() + amount: $('#dialogOrderDetailEditCustomerAmount').val(), + sendEmailToCustomers: $('#dialogEditCustomerSendEmailToCustomers:checked').length > 0 ? 1 : 0, }, { onOk: function (data) { diff --git a/plugins/Admin/webroot/js/modal/modal-order-detail-product-quantity-edit.js b/plugins/Admin/webroot/js/modal/modal-order-detail-product-quantity-edit.js index ff8c2f2a47..49256f0b07 100644 --- a/plugins/Admin/webroot/js/modal/modal-order-detail-product-quantity-edit.js +++ b/plugins/Admin/webroot/js/modal/modal-order-detail-product-quantity-edit.js @@ -43,7 +43,7 @@ foodcoopshop.ModalOrderDetailProductQuantityEdit = { html += ''; html += '
'; html += ''; - html += '