From d5e3a1f4c0afbb8e7987e8116a60bbac6fab261e Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Mon, 9 Sep 2019 12:12:40 +0000 Subject: - Nounce Bestellverwaltung / Produktgruppen / Produktverwaltung / Konfigurtion git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7561 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/mailtemplates/adminmail.phtml | 3 +- views/mailtemplates/html/adminmail.phtml | 2 +- views/mods/mod_kundenverwaltung/index.phtml | 2 + views/mods/mod_productgroups/index.phtml | 16 ++++++-- views/order/backendEdit/addProduct.phtml | 14 +++++-- views/order/index.phtml | 26 ++++++++++--- views/order/view.phtml | 1 + views/order/view_orderdata.phtml | 38 +++++++++++++++---- views/produkt/addedit.phtml | 2 + views/produkt/import.phtml | 2 + views/produkt/index.phtml | 59 +++++++++++++++++++++++------ 11 files changed, 132 insertions(+), 33 deletions(-) (limited to 'views') diff --git a/views/mailtemplates/adminmail.phtml b/views/mailtemplates/adminmail.phtml index 361dfed..2c4e00e 100644 --- a/views/mailtemplates/adminmail.phtml +++ b/views/mailtemplates/adminmail.phtml @@ -70,8 +70,7 @@ arShipping[$this->view['basket']['checkout']['shipping']]['name']; ?> arPayment[$this->view['basket']['checkout']['payment']]['name']; ?> callMods('mail_payment'); ?> - -view['o_id']; ?> + render(WPSG_PATH_VIEW.'/mailtemplates/order.phtml'); ?> view['basket']['checkout']['comment'] != '') { ?> diff --git a/views/mailtemplates/html/adminmail.phtml b/views/mailtemplates/html/adminmail.phtml index c7dbf5f..ca04f8c 100644 --- a/views/mailtemplates/html/adminmail.phtml +++ b/views/mailtemplates/html/adminmail.phtml @@ -15,7 +15,7 @@
-

:

+

:

render(WPSG_PATH_VIEW.'/mailtemplates/html/order.phtml'); ?> diff --git a/views/mods/mod_kundenverwaltung/index.phtml b/views/mods/mod_kundenverwaltung/index.phtml index aa89735..afaf4a6 100644 --- a/views/mods/mod_kundenverwaltung/index.phtml +++ b/views/mods/mod_kundenverwaltung/index.phtml @@ -41,6 +41,8 @@
+ + diff --git a/views/mods/mod_productgroups/index.phtml b/views/mods/mod_productgroups/index.phtml index 6336955..09b7662 100644 --- a/views/mods/mod_productgroups/index.phtml +++ b/views/mods/mod_productgroups/index.phtml @@ -18,7 +18,11 @@ @@ -30,6 +34,8 @@
+ + @@ -85,11 +91,15 @@ " href="wp-admin/admin.php?page=wpsg-Productgroups&wpsg_mod_action=edit&edit_id=id; ?>" class="row-title">name; ?>
- " href="wp-admin/admin.php?page=wpsg-Productgroups&wpsg_mod_action=edit&edit_id=id; ?>"> + " href=" 'edit', 'edit_id' => $pg->id]); + + ?>"> | ')) return false;" title="" href="id, 'wpsg-productgroup-del-'.$pg->id); + echo wpsg_admin_url('Productgroups', '', ['wpsg_mod_action' => 'del', 'edit_id' => $pg->id], ['noheader' => '1']); ?>"> countProducts() > 0) { ?> diff --git a/views/order/backendEdit/addProduct.phtml b/views/order/backendEdit/addProduct.phtml index afd946b..3511e60 100644 --- a/views/order/backendEdit/addProduct.phtml +++ b/views/order/backendEdit/addProduct.phtml @@ -25,7 +25,7 @@
- +