Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/issue 391 product feedback #536

Merged
merged 25 commits into from Jun 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -10,9 +10,11 @@ Das Format basiert auf [keepachangelog.com](http://keepachangelog.com) und verwe
* <img src="https://github.com/dpakach.png" width="20"> [dpakach](https://github.com/dpakach)
* <img src="https://github.com/mrothauer.png" width="20"> [mrothauer](https://github.com/mrothauer)
* <img src="https://github.com/swoichha.png" width="20"> [swoichha](https://github.com/swoichha)
* <img src="https://github.com/vmvbruck.png" width="20"> [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) <a href="https://github.com/mrothauer"><img src="https://github.com/mrothauer.png" width="20"></a>
- 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) <a href="https://github.com/mrothauer"><img src="https://github.com/mrothauer.png" width="20"></a> <a href="https://github.com/vmvbruck"><img src="https://github.com/vmvbruck.png" width="20"></a>
- 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) <a href="https://github.com/mrothauer"><img src="https://github.com/mrothauer.png" width="20"></a>
- 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) <a href="https://github.com/mrothauer"><img src="https://github.com/mrothauer.png" width="20"></a>
- 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) <a href="https://github.com/mrothauer"><img src="https://github.com/mrothauer.png" width="20"></a>
Expand Down
40 changes: 40 additions & 0 deletions config/Migrations/20200618063024_AddProductFeedback.php
@@ -0,0 +1,40 @@
<?php
declare(strict_types=1);

use Cake\I18n\I18n;
use Migrations\AbstractMigration;

class AddProductFeedback extends AbstractMigration
{
public function change()
{
$this->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?<br /><div class="small">Mitglieder können Feedback zu bestellten Produkte verfassen.</div>';
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);

}
}
Binary file modified config/Migrations/schema-dump-default.lock
Binary file not shown.
1 change: 1 addition & 0 deletions config/asset_compress.ini
Expand Up @@ -84,6 +84,7 @@ files[] = plugin:Admin:js/modal/modal-customer-group-edit.js
files[] = plugin:Admin:js/modal/modal-customer-status-edit.js
files[] = plugin:Admin:js/modal/modal-upload-form.js
files[] = plugin:Admin:js/modal/modal-instant-order-add.js
files[] = plugin:Admin:js/modal/modal-order-detail-feedback-add.js
files[] = plugin:Admin:js/modal/modal-order-detail-delete.js
files[] = plugin:Admin:js/modal/modal-order-detail-product-quantity-edit.js
files[] = plugin:Admin:js/modal/modal-order-detail-product-price-edit.js
Expand Down
10 changes: 8 additions & 2 deletions config/sql/_installation/clean-db-data-de_DE.sql
Expand Up @@ -30,6 +30,7 @@ TRUNCATE TABLE `fcs_images`;
TRUNCATE TABLE `fcs_invoices`;
TRUNCATE TABLE `fcs_manufacturer`;
TRUNCATE TABLE `fcs_order_detail`;
TRUNCATE TABLE `fcs_order_detail_feedbacks`;
TRUNCATE TABLE `fcs_order_detail_tax`;
TRUNCATE TABLE `fcs_order_detail_units`;
TRUNCATE TABLE `fcs_pages`;
Expand Down Expand Up @@ -126,7 +127,8 @@ INSERT INTO `fcs_configuration` VALUES
(585,1,'FCS_APP_ADDITIONAL_DATA','Zusätzliche Infos zur Foodcoop<br /><div class=\"small\">Z.B. ZVR-Zahl</div>','','textarea',8,'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?<br /><div class=\"small\">Keine Verlinkung im Haupt-Menü und bei Lagerprodukten.</div>','0','boolean',310,'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<br /><div class=\"small\">Wie gelangen die Guthaben-Aufladungen vom Bankkonto in den FoodCoopShop?</div>','manual','dropdown',145,'de_DE','2020-02-11 10:12:57','2020-02-11 10:12:57'),
(588,1,'FCS_SHOW_NEW_PRODUCTS_ON_HOME','Neue Produkte auch auf der Startseite anzeigen?','1','boolean',22,'de_DE','2020-04-15 09:41:54','2020-04-15 09:41:54');
(588,1,'FCS_SHOW_NEW_PRODUCTS_ON_HOME','Neue Produkte auch auf der Startseite anzeigen?','1','boolean',22,'de_DE','2020-04-15 09:41:54','2020-04-15 09:41:54'),
(589,1,'FCS_FEEDBACK_TO_PRODUCTS_ENABLED','Feedback-Funktion für Produkte aktiviert?<br /><div class=\"small\">Mitglieder können Feedback zu bestellten Produkte verfassen.</div>','1','boolean',320,'de_DE','2020-06-19 09:02:46','2020-06-19 09:02:46');
/*!40000 ALTER TABLE `fcs_configuration` ENABLE KEYS */;

/*!40000 ALTER TABLE `fcs_cronjob_logs` DISABLE KEYS */;
Expand Down Expand Up @@ -163,6 +165,9 @@ INSERT INTO `fcs_cronjobs` VALUES
/*!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_tax` DISABLE KEYS */;
/*!40000 ALTER TABLE `fcs_order_detail_tax` ENABLE KEYS */;

Expand Down Expand Up @@ -221,7 +226,8 @@ INSERT INTO `fcs_tax` VALUES
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);
(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);
/*!40000 ALTER TABLE `phinxlog` ENABLE KEYS */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

Expand Down
10 changes: 8 additions & 2 deletions config/sql/_installation/clean-db-data-en_US.sql
Expand Up @@ -30,6 +30,7 @@ TRUNCATE TABLE `fcs_images`;
TRUNCATE TABLE `fcs_invoices`;
TRUNCATE TABLE `fcs_manufacturer`;
TRUNCATE TABLE `fcs_order_detail`;
TRUNCATE TABLE `fcs_order_detail_feedbacks`;
TRUNCATE TABLE `fcs_order_detail_tax`;
TRUNCATE TABLE `fcs_order_detail_units`;
TRUNCATE TABLE `fcs_pages`;
Expand Down Expand Up @@ -126,7 +127,8 @@ INSERT INTO `fcs_configuration` VALUES
(585,1,'FCS_APP_ADDITIONAL_DATA','Additional food-coop infos','','textarea',8,'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?<br /><div class=\"small\">Does not add links to main menu and to stock products.</div>','0','boolean',310,'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<br /><div class=\"small\">How do the payment addings get into FoodCoopShop?</div>','manual','dropdown',145,'en_US','2020-02-11 10:13:01','2020-02-11 10:13:01'),
(588,1,'FCS_SHOW_NEW_PRODUCTS_ON_HOME','Show new products on home?','1','boolean',22,'en_US','2020-04-15 09:41:58','2020-04-15 09:41:58');
(588,1,'FCS_SHOW_NEW_PRODUCTS_ON_HOME','Show new products on home?','1','boolean',22,'en_US','2020-04-15 09:41:58','2020-04-15 09:41:58'),
(589,1,'FCS_FEEDBACK_TO_PRODUCTS_ENABLED','Are members allowed to write feedback to products?','1','boolean',320,'en_US','2020-06-19 09:02:50','2020-06-19 09:02:50');
/*!40000 ALTER TABLE `fcs_configuration` ENABLE KEYS */;

/*!40000 ALTER TABLE `fcs_cronjob_logs` DISABLE KEYS */;
Expand Down Expand Up @@ -163,6 +165,9 @@ INSERT INTO `fcs_cronjobs` VALUES
/*!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_tax` DISABLE KEYS */;
/*!40000 ALTER TABLE `fcs_order_detail_tax` ENABLE KEYS */;

Expand Down Expand Up @@ -221,7 +226,8 @@ INSERT INTO `fcs_tax` VALUES
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);
(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);
/*!40000 ALTER TABLE `phinxlog` ENABLE KEYS */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

Expand Down
10 changes: 8 additions & 2 deletions config/sql/_installation/clean-db-data-pl_PL.sql
Expand Up @@ -30,6 +30,7 @@ TRUNCATE TABLE `fcs_images`;
TRUNCATE TABLE `fcs_invoices`;
TRUNCATE TABLE `fcs_manufacturer`;
TRUNCATE TABLE `fcs_order_detail`;
TRUNCATE TABLE `fcs_order_detail_feedbacks`;
TRUNCATE TABLE `fcs_order_detail_tax`;
TRUNCATE TABLE `fcs_order_detail_units`;
TRUNCATE TABLE `fcs_pages`;
Expand Down Expand Up @@ -126,7 +127,8 @@ INSERT INTO `fcs_configuration` VALUES
(585,1,'FCS_APP_ADDITIONAL_DATA','Additional food-coop infos','','textarea',8,'pl_PL','2019-08-03 20:07:12','2019-08-03 20:07:12'),
(586,1,'FCS_SELF_SERVICE_MODE_TEST_MODE_ENABLED','Run self-service mode in test mode?<br /><div class=\"small\">Does not add links to main menu and to stock products.</div>','0','boolean',310,'pl_PL','2019-12-09 13:46:37','2019-12-09 13:46:37'),
(587,1,'FCS_CASHLESS_PAYMENT_ADD_TYPE','Type of adding the payments<br /><div class=\"small\">How do the payment addings get into FoodCoopShop?</div>','manual','dropdown',145,'pl_PL','2020-02-11 10:13:06','2020-02-11 10:13:06'),
(588,1,'FCS_SHOW_NEW_PRODUCTS_ON_HOME','Show new products on home?','1','boolean',22,'pl_PL','2020-04-15 09:42:02','2020-04-15 09:42:02');
(588,1,'FCS_SHOW_NEW_PRODUCTS_ON_HOME','Show new products on home?','1','boolean',22,'pl_PL','2020-04-15 09:42:02','2020-04-15 09:42:02'),
(589,1,'FCS_FEEDBACK_TO_PRODUCTS_ENABLED','Are members allowed to write feedback to products?','1','boolean',320,'pl_PL','2020-06-19 09:02:55','2020-06-19 09:02:55');
/*!40000 ALTER TABLE `fcs_configuration` ENABLE KEYS */;

/*!40000 ALTER TABLE `fcs_cronjob_logs` DISABLE KEYS */;
Expand Down Expand Up @@ -163,6 +165,9 @@ INSERT INTO `fcs_cronjobs` VALUES
/*!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_tax` DISABLE KEYS */;
/*!40000 ALTER TABLE `fcs_order_detail_tax` ENABLE KEYS */;

Expand Down Expand Up @@ -221,7 +226,8 @@ INSERT INTO `fcs_tax` VALUES
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);
(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);
/*!40000 ALTER TABLE `phinxlog` ENABLE KEYS */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

Expand Down
10 changes: 10 additions & 0 deletions config/sql/_installation/clean-db-structure.sql
Expand Up @@ -331,6 +331,16 @@ CREATE TABLE `fcs_order_detail` (
KEY `product_name` (`product_name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `fcs_order_detail_feedbacks`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `fcs_order_detail_feedbacks` (
`id_order_detail` int(10) unsigned NOT NULL DEFAULT '0',
`text` text NOT NULL,
`customer_id` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`id_order_detail`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `fcs_order_detail_tax`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
Expand Down
Binary file modified plugins/Admin/resources/locales/de_DE/admin.mo
Binary file not shown.
33 changes: 28 additions & 5 deletions plugins/Admin/resources/locales/de_DE/admin.po
Expand Up @@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2020-06-17 12:05+0200\n"
"PO-Revision-Date: 2020-06-17 12:07+0200\n"
"POT-Creation-Date: 2020-06-19 08:39+0200\n"
"PO-Revision-Date: 2020-06-18 11:45+0200\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
"Language: de_DE\n"
Expand Down Expand Up @@ -318,6 +318,12 @@ msgstr "Der Abholtag deiner Bestellung wurde geändert auf"
msgid "The_pickup_day_of_{0,plural,=1{1_product} other{#_products}}_was_changed_successfully_to_{1}_and_{2,plural,=1{1_customer} other{#_customers}}_were_notified."
msgstr "Der Abholtag von {0,plural,=1{einem Produkt} other{# Produkten}} wurde erfolgreich auf {1} geändert und {2,plural,=1{ein Mitglied wurde} other{# Mitglieder wurden}} darüber per E-Mail informiert."

msgid "{0}_has_written_a_feedback_to_product_{1}."
msgstr "{0} hat ein Feedback zum Produkt {1} verfasst."

msgid "The_feedback_was_saved_successfully_and_sent_to_{0}."
msgstr "Danke für dein Feedback! Es wurde erfolgreich gespeichert und an {0} verschickt."

msgid "The_pickup_day_comment_of_{0}_was_changed:"
msgstr "Der Abholtag-Kommentar des Mitglieds {0} wurde geändert: "

Expand Down Expand Up @@ -1695,6 +1701,9 @@ msgstr "Zum Stornieren des Produktes anklicken"
msgid "Click_to_change_member"
msgstr "Zum Umbuchen auf ein anderes Mitglied anklicken"

msgid "Add_product_feedback"
msgstr "Gib dem Hersteller Feedback zum Produkt"

msgid "Show_all_ordered_products_from_{0}"
msgstr "Alle bestellten Produkte von {0} anzeigen"

Expand Down Expand Up @@ -1917,6 +1926,15 @@ msgstr "Unsere Produzenten können leider ab und zu die bestellte Ware nicht lie
msgid "Thanks_for_respecting_that!"
msgstr "Vielen Dank für dein Verständnis!"

msgid "Hello"
msgstr "Hallo"

msgid "Feedback"
msgstr "Feedback"

msgid "If_you_want_to_answer_please_write_an_email_to_{0}_and_do_not_reply_to_this_email!"
msgstr "Zum Antworten schreibe bitte eine E-Mail an {0} und <b>antworte nicht auf diese E-Mail</b>!"

msgid "New_pickup_day"
msgstr "Neuer Abholtag "

Expand Down Expand Up @@ -1971,9 +1989,6 @@ msgstr "bitte vergiss nicht, dass am {0} folgende Produkte zum Abholen bereit si
msgid "As_your_order_is_longer_than_{0}_days_ago_you_get_this_reminder."
msgstr "Du bekommst diese E-Mail, weil deine Bestellung länger als {0} Tage her ist."

msgid "Hello"
msgstr "Hallo"

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."

Expand Down Expand Up @@ -2064,6 +2079,14 @@ msgstr "Das tatsächlich gelieferte Gewicht wird evtl. noch angepasst, d. h. der
msgid "Product_ID"
msgstr "Produkt-Nr."

#, fuzzy
#~ msgid "Feedback_to_product"
#~ msgstr "produkte"

#, fuzzy
#~ msgid "Delivery_date"
#~ msgstr "Liefertag"

#~ msgid "Quantity"
#~ msgstr "Verfügbare Menge"

Expand Down
23 changes: 19 additions & 4 deletions plugins/Admin/resources/locales/default.pot
Expand Up @@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"POT-Creation-Date: 2020-06-17 12:05+0200\n"
"POT-Creation-Date: 2020-06-19 08:39+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
Expand Down Expand Up @@ -317,6 +317,12 @@ msgstr ""
msgid "The_pickup_day_of_{0,plural,=1{1_product} other{#_products}}_was_changed_successfully_to_{1}_and_{2,plural,=1{1_customer} other{#_customers}}_were_notified."
msgstr ""

msgid "{0}_has_written_a_feedback_to_product_{1}."
msgstr ""

msgid "The_feedback_was_saved_successfully_and_sent_to_{0}."
msgstr ""

msgid "The_pickup_day_comment_of_{0}_was_changed:"
msgstr ""

Expand Down Expand Up @@ -1694,6 +1700,9 @@ msgstr ""
msgid "Click_to_change_member"
msgstr ""

msgid "Add_product_feedback"
msgstr ""

msgid "Show_all_ordered_products_from_{0}"
msgstr ""

Expand Down Expand Up @@ -1916,6 +1925,15 @@ msgstr ""
msgid "Thanks_for_respecting_that!"
msgstr ""

msgid "Hello"
msgstr ""

msgid "Feedback"
msgstr ""

msgid "If_you_want_to_answer_please_write_an_email_to_{0}_and_do_not_reply_to_this_email!"
msgstr ""

msgid "New_pickup_day"
msgstr ""

Expand Down Expand Up @@ -1970,9 +1988,6 @@ msgstr ""
msgid "As_your_order_is_longer_than_{0}_days_ago_you_get_this_reminder."
msgstr ""

msgid "Hello"
msgstr ""

msgid "this_invoice_contains_all_products_that_have_been_delivered_in_{0}."
msgstr ""

Expand Down
Binary file modified plugins/Admin/resources/locales/en_US/admin.mo
Binary file not shown.