From 6cfdc4f806651c18ab97a742eae41eca11cfa176 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Mon, 16 Nov 2020 10:45:53 +0000 Subject: - Abo Punkt "Aboverwaltung: neue Spalte "Status" (laufend, in Verlängerung, abgelaufen) -> bei Ablauf auto. Statuswechsel auf "abgelaufen"" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7807 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/form/text.phtml | 2 +- views/css/admin.css | 3 ++ views/mailtemplates/html/status.phtml | 3 +- views/mailtemplates/status.phtml | 2 +- views/mods/mod_abo/index.phtml | 63 +++++++++++++++++++---------------- views/mods/mod_abo/order_view.phtml | 25 ++++++++++++-- 6 files changed, 63 insertions(+), 35 deletions(-) (limited to 'views') diff --git a/views/admin/form/text.phtml b/views/admin/form/text.phtml index 94011be..d104b9b 100644 --- a/views/admin/form/text.phtml +++ b/views/admin/form/text.phtml @@ -1,5 +1,5 @@
- +
diff --git a/views/css/admin.css b/views/css/admin.css index 6dbf6ca..43af405 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -349,6 +349,9 @@ /* Modul AboProdukte */ .wpsg_mod_abo_expired { color:red; } .wpsg_mod_abo_future_expire { color:green; } +.wpsg_abo_state_class_1 { color:green; } +.wpsg_abo_state_class_2 { color:orange; } +.wpsg_abo_state_class_3 { color:red; } /* Modul Produktbilder (wpsg_mod_produktbilder) */ #produktbilder_target img { } diff --git a/views/mailtemplates/html/status.phtml b/views/mailtemplates/html/status.phtml index a238fb4..c7699a5 100644 --- a/views/mailtemplates/html/status.phtml +++ b/views/mailtemplates/html/status.phtml @@ -20,8 +20,7 @@ include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); __('Der Status Ihrer Bestellung mit der Bestellnummer #1# hat sich von "#2#" auf "#3#" geändert.', 'wpsg'), $this->view['order']['onr'], __($this->view['status_alt'], 'wpsg'), - __($this->view['status_neu'], 'wpsg'), - __($this->view['state_new_id'], 'wpsg')); ?>

+ __($this->view['status_neu'], 'wpsg')); ?>

callMods('mail_status', array(&$this->view['order'], &$this->view['kunde'])); ?> diff --git a/views/mailtemplates/status.phtml b/views/mailtemplates/status.phtml index b2232f6..490de01 100644 --- a/views/mailtemplates/status.phtml +++ b/views/mailtemplates/status.phtml @@ -30,7 +30,7 @@ ?> view['order']['onr'], __($this->view['status_alt'], 'wpsg'), __($this->view['status_neu'], 'wpsg'), diff --git a/views/mods/mod_abo/index.phtml b/views/mods/mod_abo/index.phtml index ec73c52..aaf9cb3 100644 --- a/views/mods/mod_abo/index.phtml +++ b/views/mods/mod_abo/index.phtml @@ -36,7 +36,13 @@ view['arFilter']['s'])); ?> view['arFilter']['k_id'])); ?> - __('Alle', 'wpsg')), $this->arStatus), @$this->view['arFilter']['status']); ?> + + view['arState'] as $state_key => $state_data) $arStateSelect[$state_key] = $state_data['label']; + + echo wpsg_drawForm_Select('filter[status]', __('Abostatus', 'wpsg'), wpsg_array_merge(array('-1' => __('Alle', 'wpsg')), $arStateSelect), @$this->view['arFilter']['state']); ?>
@@ -96,8 +102,8 @@
@@ -122,64 +128,55 @@ - + + - view['arData'] as $oOrder) { ?> + view['arData'] as $oAbo) { $oOrder = $oAbo->getOrder(); ?> - + - getNr(); ?> cdate), false); ?>
+ getNr(); ?> __get('cdate')), false); ?>
+ " href=" $oOrder->id]); ?>"> | - view['arFilter']['status'] != wpsg_ShopController::STATUS_GEKUENDIGTEABOS) { ?> - " href=" $oOrder->id], ['noheader' => '1']); - - ?>"> - | */ ?> - +
- admincomment) != "") { ?> - admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign admincomment" href="#"> + getOrder()->admincomment) != "") { ?> + getOrder()->admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign admincomment" href="#"> - comment) != "") { ?> - comment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign customercomment" href="#"> - - - hasShippingAdress()) { ?> - " onclick="return false;" class="glyphicon glyphicon-map-marker shippingadress" href="#"> - + getOrder()->comment) != "") { ?> + getOrder()->comment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign customercomment" href="#"> + - getInvoiceCompany(); if (wpsg_isSizedString($firma)) { ?> + getOrder()->getInvoiceCompany(); if (wpsg_isSizedString($firma)) { ?>
- getInvoiceTitle(); ?> getInvoiceFirstname(); ?> getInvoiceName(); ?> + getOrder()->getInvoiceTitle(); ?> getInvoiceFirstname(); ?> getOrder()->getInvoiceName(); ?>
- getInvoiceStreet(); ?>
- getInvoiceZip().' '.$oOrder->getInvoiceCity()); ?> getInvoiceCountryKuerzel(); ?> + getOrder()->getInvoiceStreet(); ?>
+ getOrder()->getInvoiceZip().' '.$oAbo->getOrder()->getInvoiceCity()); ?> getOrder()->getInvoiceCountryKuerzel(); ?> @@ -255,6 +252,16 @@ + + + + getState(); ?> + + getStateLabel(); ?> + getStateLabel(); ?> + getStateLabel(); ?> + + diff --git a/views/mods/mod_abo/order_view.phtml b/views/mods/mod_abo/order_view.phtml index 8ae6340..52ea434 100644 --- a/views/mods/mod_abo/order_view.phtml +++ b/views/mods/mod_abo/order_view.phtml @@ -8,12 +8,16 @@ ?> -view['arOrderedAboProducts'] as $oOrderProduct) { ?> +view['arOrderedAboProducts'] as $oOrderProduct) { + + $oAbo = wpsg_abo::getFromOrderAndProduct($view['oOrder']->getId(), $oOrderProduct->getId()); + + ?> getProduct()->getProductName()); ?> callMod('wpsg_mod_abo', 'getOrderAboExpiration', Array($_REQUEST['edit_id'], $oOrderProduct->getProductKey()))); ?> - (($tExpire > time())?'wpsg_mod_abo_future_expire':'wpsg_mod_abo_expired'))); ?> + 'wpsg_abo_state wpsg_abo_state_class_'.$oAbo->getState())); ?> getProduct()->wpsg_mod_abo_durration), wpsg_ff($oOrderProduct->getProduct()->wpsg_mod_abo_price, $this->get_option('wpsg_currency'))); ?> + callMod('wpsg_mod_abo', 'getRebuyLink', [$view['oOrder']->getId(), $oOrderProduct->getProductKey()]); + $strURL = ''.$strURL.''; + + echo wpsg_drawForm_Text(__('URL für den Kauf einer Verlängerung', 'wpsg'), $strURL); + + ?> -- cgit v1.2.3