From ff9d7b7273b5c17449a09cd63d691eba17e2efd2 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Mon, 19 Oct 2020 13:00:52 +0000
Subject: - Feature: Erinnerungsmail bei Unvollständigen Bestellungen - Amazon
 V2 Commit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7787 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/order/backendEdit/addVoucher.phtml |  2 +-
 views/order/index.phtml                  | 50 +++++++++++++++++---------------
 views/order/view_customerdata.phtml      |  2 +-
 views/order/view_dev.phtml               |  7 +++--
 views/order/view_general.phtml           |  2 +-
 views/order/view_orderlog.phtml          |  2 +-
 views/order/view_shippay.phtml           |  2 +-
 7 files changed, 36 insertions(+), 31 deletions(-)

(limited to 'views/order')

diff --git a/views/order/backendEdit/addVoucher.phtml b/views/order/backendEdit/addVoucher.phtml
index 497b4c4..1dec8ac 100644
--- a/views/order/backendEdit/addVoucher.phtml
+++ b/views/order/backendEdit/addVoucher.phtml
@@ -1,7 +1,7 @@
 <?php
 	
 	/**
-	 * User: Daschmi (daschmi@daschmi.de)
+	 * User: Daschmi (https://daschmi.de)
 	 * Date: 05.10.2018
 	 * Time: 08:24
 	 */
diff --git a/views/order/index.phtml b/views/order/index.phtml
index 23ab703..ee56a66 100644
--- a/views/order/index.phtml
+++ b/views/order/index.phtml
@@ -83,26 +83,28 @@
                         </div>
                         <?php echo wpsg_drawForm_TextEnd(__('Bestelldatum (Monat/Jahr)', 'wpsg'), array('noP' => true)); ?>
 
-                        <?php echo wpsg_drawForm_TextStart(); ?>
-                        <div class="row">
-                            <div class="col-lg-6">
-                                <select name="filter[invoicedate_m]" class="form-control input-sm">
-                                    <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
-                                    <?php for ($i = 1; $i <= 12; $i ++) { ?>
-                                    <option <?php echo ((wpsg_getStr($this->view['arFilter']['invoicedate_m']) == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo strftime("%B", mktime(0, 0, 0, $i, 1, 2000)); ?></option>
-                                    <?php } ?>
-                                </select>
-                            </div>
-                            <div class="col-lg-6">
-                                <select name="filter[invoicedate_y]" class="form-control input-sm">
-                                    <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
-                                    <?php foreach ($this->view['invoicedate_years'] as $y) { ?>
-                                    <option <?php echo ((wpsg_getStr($this->view['arFilter']['invoicedate_y']) == $y)?'selected="selected"':''); ?> value="<?php echo $y; ?>"><?php echo $y; ?></option>
-                                    <?php } ?>
-                                </select>
-                            </div>
-                        </div>
-                        <?php echo wpsg_drawForm_TextEnd(__('Rechnungsdatum (Monat/Jahr)', 'wpsg'), array('noP' => true)); ?>
+						<?php if ($this->hasMod('wpsg_mod_rechnungen')) { ?>
+							<?php echo wpsg_drawForm_TextStart(); ?>
+							<div class="row">
+								<div class="col-lg-6">
+									<select name="filter[invoicedate_m]" class="form-control input-sm">
+										<option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
+										<?php for ($i = 1; $i <= 12; $i ++) { ?>
+										<option <?php echo ((wpsg_getStr($this->view['arFilter']['invoicedate_m']) == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo strftime("%B", mktime(0, 0, 0, $i, 1, 2000)); ?></option>
+										<?php } ?>
+									</select>
+								</div>
+								<div class="col-lg-6">
+									<select name="filter[invoicedate_y]" class="form-control input-sm">
+										<option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
+										<?php foreach ($this->view['invoicedate_years'] as $y) { ?>
+										<option <?php echo ((wpsg_getStr($this->view['arFilter']['invoicedate_y']) == $y)?'selected="selected"':''); ?> value="<?php echo $y; ?>"><?php echo $y; ?></option>
+										<?php } ?>
+									</select>
+								</div>
+							</div>
+							<?php echo wpsg_drawForm_TextEnd(__('Rechnungsdatum (Monat/Jahr)', 'wpsg'), array('noP' => true)); ?>
+						<?php } ?>
 
     					<br />
                         
@@ -131,15 +133,15 @@
 							                            
                             <br />
                             
-                            <?php echo wpsg_drawForm_Input('search_customer',__('Kunde (E-Mail oder Kundennummer)', 'wpsg'), @$_REQUEST['search_customer']); ?>
+                            <?php echo wpsg_drawForm_Input('search_customer',__('Kunde (E-Mail oder Kundennummer)', 'wpsg'), wpsg_getStr($_REQUEST['search_customer'])); ?>
                             
                             <br />
 							
                             <?php $arShippingSelect = []; foreach ($this->arShipping as $shipping_id => $shipping) if (!isset($shipping['active']) || $shipping['active'] === '1') $arShippingSelect[$shipping_id] = $shipping['name'].' ('.wpsg_ff(@$shipping['price']).')'; ?>
-                            <?php echo wpsg_drawForm_Select('add_shipping', __('Versandart', 'wpsg'), $arShippingSelect, @$_REQUEST['add_shipping']); ?>
+                            <?php echo wpsg_drawForm_Select('add_shipping', __('Versandart', 'wpsg'), $arShippingSelect, wpsg_getStr($_REQUEST['add_shipping'])); ?>
 
-                            <?php $arPaymentSelect = []; foreach ($this->arPayment as $payment_id => $payment) if (!isset($payment['active']) || $payment['active'] === '1')  $arPaymentSelect[$payment_id] = $payment['name'].' ('.wpsg_ff(@$payment['price']).')'; ?>
-                            <?php echo wpsg_drawForm_Select('add_payment', __('Zahlungsart', 'wpsg'), $arPaymentSelect, @$_REQUEST['add_payment']); ?>
+                            <?php $arPaymentSelect = []; foreach ($this->arPayment as $payment_id => $payment) if (!isset($payment['active']) || $payment['active'] === '1')  $arPaymentSelect[$payment_id] = $payment['name'].' ('.wpsg_ff(wpsg_getStr($payment['price'])).')'; ?>
+                            <?php echo wpsg_drawForm_Select('add_payment', __('Zahlungsart', 'wpsg'), $arPaymentSelect, wpsg_getStr($_REQUEST['add_payment'])); ?>
                             
                             <br /><?php echo wpsg_drawForm_SubmitButton(__('Bestellung anlegen')); ?><br />
                             
diff --git a/views/order/view_customerdata.phtml b/views/order/view_customerdata.phtml
index 11c65a2..66d7d76 100644
--- a/views/order/view_customerdata.phtml
+++ b/views/order/view_customerdata.phtml
@@ -1,7 +1,7 @@
 <?php
 
     /**
-     * User: Daschmi (daschmi@daschmi.de)
+     * User: Daschmi (https://daschmi.de)
      * Date: 07.08.2016
      * Time: 10:40
      */
diff --git a/views/order/view_dev.phtml b/views/order/view_dev.phtml
index 13e6315..abf0e60 100644
--- a/views/order/view_dev.phtml
+++ b/views/order/view_dev.phtml
@@ -1,11 +1,14 @@
 <?php
 
     /**
-     * User: Daschmi (daschmi@daschmi.de)
+     * User: Daschmi (https://daschmi.de)
      * Date: 07.08.2016
      * Time: 10:51
      */
 
+    /** @var \wpsg_order $oOrder */
+    $oOrder = wpsg_order::getInstance(intval($this->view['data']['id']));
+    
 ?>
 
 <?php echo wpsg_drawForm_AdminboxStart(__('Entwickleroptionen', 'wpsg')); ?>
@@ -28,7 +31,7 @@
             </div>
         </div>
     </div>
-
+ 
 <?php echo wpsg_drawForm_AdminboxEnd(); ?>
 
 <?php echo wpsg_drawForm_AdminboxStart(__('Technische Einstellungen', 'wüsg')); ?>
diff --git a/views/order/view_general.phtml b/views/order/view_general.phtml
index 69e06bf..28d3018 100644
--- a/views/order/view_general.phtml
+++ b/views/order/view_general.phtml
@@ -1,7 +1,7 @@
 <?php
 
     /**
-     * User: Daschmi (daschmi@daschmi.de)
+     * User: Daschmi (https://daschmi.de)
      * Date: 06.08.2016
      * Time: 11:22
      */
diff --git a/views/order/view_orderlog.phtml b/views/order/view_orderlog.phtml
index d68ae85..035fed7 100644
--- a/views/order/view_orderlog.phtml
+++ b/views/order/view_orderlog.phtml
@@ -1,7 +1,7 @@
 <?php
 
     /**
-     * User: Daschmi (daschmi@daschmi.de)
+     * User: Daschmi (https://daschmi.de)
      * Date: 06.08.2016
      * Time: 11:24
      */ 
diff --git a/views/order/view_shippay.phtml b/views/order/view_shippay.phtml
index b562146..95ce5a9 100644
--- a/views/order/view_shippay.phtml
+++ b/views/order/view_shippay.phtml
@@ -1,7 +1,7 @@
 <?php
 
     /**
-     * User: Daschmi (daschmi@daschmi.de)
+     * User: Daschmi (https://daschmi.de)
      * Date: 07.08.2016
      * Time: 10:52
      */
-- 
cgit v1.2.3