From f4d68ae74cdcd77e40de63fdbe5ee8ab4c63920c Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Sat, 13 Aug 2016 13:40:36 +0000 Subject: - Bestellansicht Umbau der Moduleinbindung in Reiter git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5720 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/form/text.phtml | 21 +- views/admin/form/textarea.phtml | 10 +- views/css/admin.css | 3 + views/js/editable.js | 43 +- views/mods/mod_export/profil.phtml | 2 +- views/mods/mod_ordervars/ov_list.phtml | 220 ++++---- views/mods/mod_rechnungen/order_view.phtml | 399 +++++++------- .../wpsg_order_view_customerdata.phtml | 121 +++-- views/order/orderlog.phtml | 32 -- views/order/view.phtml | 596 ++------------------- views/order/view_customerdata.phtml | 112 ++++ views/order/view_dev.phtml | 32 ++ views/order/view_general.phtml | 32 ++ views/order/view_orderdata.phtml | 144 +++++ views/order/view_orderlog.phtml | 28 + views/order/view_shippay.phtml | 31 ++ views/produkt/addedit.phtml | 2 +- 17 files changed, 869 insertions(+), 959 deletions(-) delete mode 100644 views/order/orderlog.phtml create mode 100644 views/order/view_customerdata.phtml create mode 100644 views/order/view_dev.phtml create mode 100644 views/order/view_general.phtml create mode 100644 views/order/view_orderdata.phtml create mode 100644 views/order/view_orderlog.phtml create mode 100644 views/order/view_shippay.phtml diff --git a/views/admin/form/text.phtml b/views/admin/form/text.phtml index a9eb9fd..450c2ea 100644 --- a/views/admin/form/text.phtml +++ b/views/admin/form/text.phtml @@ -6,9 +6,9 @@
view['field_config']['noP'])) { ?> - view['field_value']; ?> + view['field_id']))?' id="'.$this->view['field_id'].'" ':''); ?>>view['field_value']; ?> -

view['field_value']; ?>

+

view['field_id']))?' id="'.$this->view['field_id'].'" ':''); ?> class="form-control-static" style="padding-left:0px;">view['field_value']; ?>

view['field_config']['help'])) { ?> @@ -16,5 +16,22 @@
+ + view['field_config']['inlineEdit']) && $this->view['field_config']['inlineEdit']) { ?> + + \ No newline at end of file diff --git a/views/admin/form/textarea.phtml b/views/admin/form/textarea.phtml index fabe0de..d016766 100644 --- a/views/admin/form/textarea.phtml +++ b/views/admin/form/textarea.phtml @@ -1,8 +1,14 @@
+ view['field_config']['noLabel']) || $this->view['field_config']['noLabel'] != true) { ?> - -
+ + + view['field_config']['noLabel']) && $this->view['field_config']['noLabel'] == true) { ?> +
+ +
+
diff --git a/views/css/admin.css b/views/css/admin.css index 0cefd82..139d3c2 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -132,6 +132,9 @@ .wpsg_order .col_nr .glyphicon.admincomment { color:red; } .wpsg_order .wpsg-order-tab { padding-top:15px; padding-bottom:15px; } +#wpsg-bs.wpsg_order_view .editableform textarea { height:150px;} +.wpsg_order_view .wpsg_cell_gesamtpreis { text-align:right; } + /* Modulverwaltung */ .wpsg_admin_submenu .list-group-item.modul_akt { color:#3c763d; font-weight:bold; } .wpsg_admin_submenu .list-group-item.modul_akt .glyphicon { position:absolute; right:5px; top:5px; color:#3c763d; } diff --git a/views/js/editable.js b/views/js/editable.js index 280730b..c9ccda8 100644 --- a/views/js/editable.js +++ b/views/js/editable.js @@ -25,11 +25,46 @@ if (typeof options.type == "string") opt['type'] = options.type; - if (options.type == 'string' && typeof options.data == "string") { - + if (options.type == "select" && typeof options.data == "string") + { + + // Normale Übergabe eines JSON Strings + opt.source = jQuery.parseJSON(options.data); + opt.type = 'select'; + + } + else if (options.type == 'multiarray') + { + + var ar = []; + var arData = jQuery.parseJSON(options.data); + + for (var i in arData) + { + + objData = { 'text': arData[i].name, 'children': [] }; + + for (var j in arData[i]['fields']) + { + + objData['children'].push( { 'value': j, 'text': arData[i]['fields'][j] } ); + + } + + ar.push(objData); + + } + + opt.source = ar; + opt.type = 'select'; + + } + else if (options.type == 'string' && typeof options.data == "string") + { + var ar = []; var arData = jQuery.parseJSON(options.data); - + for (var i in arData) { @@ -48,7 +83,7 @@ } else { - + opt.display = function(value, sourceData) { jQuery(this).html(sourceData); diff --git a/views/mods/mod_export/profil.phtml b/views/mods/mod_export/profil.phtml index 0d525b1..c07daed 100644 --- a/views/mods/mod_export/profil.phtml +++ b/views/mods/mod_export/profil.phtml @@ -258,7 +258,7 @@ }, submit: '', data: 'view['fields']); ?>', - type: 'select', + type: 'multiarray', placeholder: '', indicator: '', tooltip: '' diff --git a/views/mods/mod_ordervars/ov_list.phtml b/views/mods/mod_ordervars/ov_list.phtml index 8ce1830..1cd4655 100644 --- a/views/mods/mod_ordervars/ov_list.phtml +++ b/views/mods/mod_ordervars/ov_list.phtml @@ -6,114 +6,118 @@ ?> view['data']) && sizeof($this->view['data']) > 0) { ?> - - - - - - - - +
+ + + + + + + + + view['data'] as $ov) { $i ++; ?> - - - - - - - - - - - + + + + + + + + + + + + +
mod->arTypen[$ov['typ']]; ?> id="wpsg_ov_pflicht_" /> - - - - - -
- : - - -
mod->arTypen[$ov['typ']]; ?> id="wpsg_ov_pflicht_" /> + + + + + +
+ : + + +

@@ -124,7 +128,7 @@ jQuery('.wpsg_ov_table').sortable( { helper: wpsg_Tablefix, - items: 'tr.wpsg_tablerow', + items: 'tbody', handler: '.wpsg_id', update: function(event, ui) { diff --git a/views/mods/mod_rechnungen/order_view.phtml b/views/mods/mod_rechnungen/order_view.phtml index 9551099..3b68a39 100644 --- a/views/mods/mod_rechnungen/order_view.phtml +++ b/views/mods/mod_rechnungen/order_view.phtml @@ -74,205 +74,200 @@ -

-

-
- -

-
- - view['mod_rechnungen']['arRechnungen']) == 0 && sizeof($this->view['mod_rechnungen']['arRechnungen_storno']) == 0) { ?> -

- - - view['mod_rechnungen']['arRechnungen_gesamt'] as $r) { ?> - - - - - -
# - - - - - - - - - - - - - - callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'], true)).'R'.$r['rnr'].'.pdf'; - } - else if ($r['gnr'] != "") - { - $rfile = $this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'], true)).'G'.$r['gnr'].'.pdf'; - } - - ?> - -   - - -
-
- - - view['mod_rechnungen']['arRechnungen']) > 0 && sizeof($this->view['mod_rechnungen']['arRechnungen_gesamt']) != sizeof($this->view['mod_rechnungen']['arRechnungen_storno'])) { ?> -
- -
-
- - - -
-
-
- - - -

- - " style="float:right;" /> - - - - -
-
-
-
-
- - -
- -
- -
- - - - - -
- - - get_option("wpsg_rechnungen_faelligkeit") * 86400)); ?>" /> -
- - - -
- - -
- - - " /> -
- - - - get_option("wpsg_rechnungen_footer"); - if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = unserialize($this->get_option("wpsg_rechnungen_footer")); - if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = Array(); - - ?> - - 0) { ?> - - - -
-
-
- - - - " /> - " /> - -
- -
-
-
- - - -
-
\ No newline at end of file + + + view['mod_rechnungen']['arRechnungen']) == 0 && sizeof($this->view['mod_rechnungen']['arRechnungen_storno']) == 0) { ?> +

+ + + view['mod_rechnungen']['arRechnungen_gesamt'] as $r) { ?> + + + + + +
# + + + + + + + + + + + + + + callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'], true)).'R'.$r['rnr'].'.pdf'; + } + else if ($r['gnr'] != "") + { + $rfile = $this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'], true)).'G'.$r['gnr'].'.pdf'; + } + + ?> + +   + + +
+
+ + + view['mod_rechnungen']['arRechnungen']) > 0 && sizeof($this->view['mod_rechnungen']['arRechnungen_gesamt']) != sizeof($this->view['mod_rechnungen']['arRechnungen_storno'])) { ?> +
+ +
+
+ + + +
+
+
+ + + +

+ + " style="float:right;" /> + + + + +
+
+
+
+
+ + +
+ + +
+ +
+ + + + + +
+ + + get_option("wpsg_rechnungen_faelligkeit") * 86400)); ?>" /> +
+ + + +
+ + +
+ + + " /> +
+ + + + get_option("wpsg_rechnungen_footer"); + if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = unserialize($this->get_option("wpsg_rechnungen_footer")); + if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = Array(); + + ?> + + 0) { ?> + + + +
+
+
+ + + + " /> + " /> + +
+ +
+
+
+ + + + \ No newline at end of file diff --git a/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml b/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml index 6301aba..ff3723c 100644 --- a/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml +++ b/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml @@ -8,70 +8,75 @@ -
-
- : - -
-
-

- view['wpsg_mod_shippingadress']['shipping_firma']) != '') { ?> - view['wpsg_mod_shippingadress']['shipping_firma']); ?>
- - view['wpsg_mod_shippingadress']['shipping_title']); ?> view['wpsg_mod_shippingadress']['shipping_vname']); ?> view['wpsg_mod_shippingadress']['shipping_name']); ?>
- view['wpsg_mod_shippingadress']['shipping_strasse']); ?>
- view['wpsg_mod_shippingadress']['shipping_plz']); ?> view['wpsg_mod_shippingadress']['shipping_ort']); ?> view['shipping_country']['kuerzel']); ?>
-

-
- - - + -
+ + + + view['wpsg_mod_shippingadress']['shipping_firma']) != '') { ?> + view['wpsg_mod_shippingadress']['shipping_firma']); ?>
+ + view['wpsg_mod_shippingadress']['shipping_title']) && $this->view['wpsg_mod_shippingadress']['shipping_title'] != '-1') + echo $this->view['arTitles'][$this->view['wpsg_mod_shippingadress']['shipping_title']]; + + ?> view['wpsg_mod_shippingadress']['shipping_vname']); ?> view['wpsg_mod_shippingadress']['shipping_name']); ?>
+ view['wpsg_mod_shippingadress']['shipping_strasse']); ?>
+ view['wpsg_mod_shippingadress']['shipping_plz']); ?> view['wpsg_mod_shippingadress']['shipping_ort']); ?> view['shipping_country']['kuerzel']); ?>
+ + + + + + + diff --git a/views/order/orderlog.phtml b/views/order/orderlog.phtml deleted file mode 100644 index df51721..0000000 --- a/views/order/orderlog.phtml +++ /dev/null @@ -1,32 +0,0 @@ - -view['log']) && sizeof($this->view['log']) > 0) { ?> - - - - - - - view['log'] as $l) { ?> - - - - - - - - - -
- -
- - - \ No newline at end of file diff --git a/views/order/view.phtml b/views/order/view.phtml index b96f42b..3275360 100644 --- a/views/order/view.phtml +++ b/views/order/view.phtml @@ -5,575 +5,73 @@ */ ?> - - -
-

-

- view['data']['onr']); ?> -

-
- writeBackendMessage(); ?> - -
- -
-
- -
-

-
- -

-
- -
-
- : -
-
-

- view['data']['knr']); ?> - hasMod('wpsg_mod_kundenverwaltung')) { ?> - [  ] - -

-
-
-
- -
-
- : - -
-
-

- view['data']['firma']) != '') { ?> - view['data']['firma']); ?>
- - view['data']['title'] != '' && $this->view['data']['title'] != '-1')?wpsg_hspc($this->view['data']['title']).' ':''); ?>view['data']['vname']); ?> view['data']['name']); ?>
- view['data']['strasse']); ?>
- view['data']['plz']); ?> view['data']['ort']); ?> view['country']['kuerzel']); ?>
-

-
-
-
- - - - view['data']['geb']) > 0) { ?> - view['data']['geb']), array('text' => true)); ?> - - - view['data']['fax']) > 0) { ?> - view['data']['fax'], array('text' => true)); ?> - - - view['data']['tel']) > 0) { ?> - view['data']['tel'], array('text' => true)); ?> - - - view['data']['ustidnr']) > 0) { ?> - view['data']['ustidnr'], array('text' => true)); ?> - - -
-
- : -
-
-

- view['data']['email']; ?> -

-
-
-
- - callMods('wpsg_order_view_customerdata', array(&$this->view['data']['id'])); ?> - -
-
- -
-

-
- -

-
- -
-
- : -
-
-

- view['oOrder']->getShippingLabel()); ?> - view['basket']['sum']['preis_shipping']) && $this->view['basket']['sum']['preis_shipping'] > 0) { ?> - (view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?>) - -

-
-
-
- -
-
- : -
-
-

- - view['arPayment'][$this->view['data']['type_payment']]['name'], 'wpsg'); ?> - view['basket']['sum']['preis_payment']) && $this->view['basket']['sum']['preis_payment'] > 0) { ?> - (view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?>) - - -

-
-
-
- callMods('order_view_afterpayment', array(&$this->view['data']['id'])); ?> - -
-
- - view['data']['order_comment']) != '') { ?> -
-

-
- -

-
- view['data']['order_comment']); ?> -
-
- - -
-

-
- -

-
-
- - -
-
-
- - callMods('order_view_sidebar', array(&$this->view['data']['id'])); ?> - -
-
- -
-
-
-

-
- -

-
- -
-
- : -
-
-

- view['data']['onr']); ?> [arStatus[$this->view['data']['status']]); ?>] -

-
-
-
- - view['data']['language']) && $this->view['data']['language'] != $this->getCurrentLanguage()) { $arLang = $this->getStoreLanguages(); $lang = $arLang[$this->view['data']['language']]; ?> -
-
- : -
-
-

- <?php echo wpsg_translate(__('Produkt für Sprache #1# bearbeiten.', 'wpsg'), $lang['name']); ?> - -

-
-
-
- - -
-
- : -
-
-

- view['data']['cdate'])); ?> -

-
-
-
- -
-
-
- : -
-
- -   -
- -
-
-
- callMods('order_view_switchStatus', array(&$this->view['data']['id'])); ?> -
- - get_option('wpsg_debugModus'))) { ?> -
-
- : -
-
- -
-
-
-
-
-
- - view['basket']); ?> - - -
-
-
- - -
-
- -
-

-
- -

-
- - - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - - - - view['basket']['produkte'] as $produkt_key => $p) { $i ++; ?> - - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - - - - - - - - - - callMods('order_view_row', array(&$p, $i)); ?> - - view['basket']['gs'])) { ?> - - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - - - - - view['basket']['sum']['preis_rabatt']) && $this->view['basket']['sum']['preis_rabatt'] > 0) { ?> - - - - - - - - - - view['basket']['sum']['preis_shipping'] != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?> - - - - - - view['basket']['sum']['preis_payment'] != 0 || $this->get_option('wpsg_hideemptypayment') != '1') { ?> - - - - - - get_option('wpsg_preisangaben') == '1' && $this->get_option('wpsg_kleinunternehmer') != '1') { ?> - view['basket']['mwst'] as $mwst_id => $mwst) { ?> - - - - - - - - - - - get_option('wpsg_kleinunternehmer') == '1' || $this->get_option('wpsg_preisangaben') != '1') { ?> - view['basket']['mwst'] as $mwst_id => $mwst) { ?> - - - - - - -
- - getProductName($this->getProduktID($p['id']))); ?> - - get_option('wpsg_currency'); ?> % get_option('wpsg_currency'); ?>
- : - - - getShippingName($shipping); ?>, - -
view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>1view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
- - - view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?> -
- get_option('wpsg_kleinunternehmer') == '1') { ?> - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').''); ?> - - getFrontendTaxview() == WPSG_NETTO) { ?> - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').''); ?> - - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').''); ?> - - - - view['basket']['sum']['preis']); ?> get_option('wpsg_currency'); ?> -
- - - view['basket']['sum']['preis_shipping']); ?> get_option('wpsg_currency'); ?> -
- - - view['basket']['sum']['preis_payment']); ?> get_option('wpsg_currency'); ?> -
- - - get_option('wpsg_currency'); ?> -
- - - view['basket']['sum']['preis_gesamt_brutto']); ?> get_option('wpsg_currency'); ?> -
- get_option('wpsg_kleinunternehmer') == '1') { ?> - get_option('wpsg_kleinunternehmer_text'); ?> - - - - - get_option('wpsg_currency'); ?> -
- -
-
- - callMods('order_view_content', array($this->view['data']['id'])); ?> - -
-

-
- -

-
- view['orderLog']; ?> -
-
- -
- -
- -
- -
\ No newline at end of file diff --git a/views/order/view_customerdata.phtml b/views/order/view_customerdata.phtml new file mode 100644 index 0000000..97ba056 --- /dev/null +++ b/views/order/view_customerdata.phtml @@ -0,0 +1,112 @@ + + + + + + + + view['oOrder']->getCustomer()->getNr(); ?> + hasMod('wpsg_mod_kundenverwaltung')) { ?> + [  ] + + + + + view['data']['firma']) != '') { ?> + view['data']['firma']); ?>
+ + view['data']['title'] != '' && $this->view['data']['title'] != '-1')?wpsg_hspc($this->view['arTitles'][$this->view['data']['title']]).' ':''); ?>view['data']['vname']); ?> view['data']['name']); ?>
+ view['data']['strasse']); ?>
+ view['data']['plz']); ?> view['data']['ort']); ?> view['country']['kuerzel']); ?>
+ + + + + + + + view['data']['geb']) > 0) { ?> + view['data']['geb']), array('text' => true)); ?> + + + view['data']['fax']) > 0) { ?> + view['data']['fax'], array('text' => true)); ?> + + + view['data']['tel']) > 0) { ?> + view['data']['tel'], array('text' => true)); ?> + + + view['data']['ustidnr']) > 0) { ?> + view['data']['ustidnr'], array('text' => true)); ?> + + + callMods('wpsg_order_view_customerdata', array(&$this->view['data']['id'])); ?> + + + view['data']['email']; ?> + + + + + diff --git a/views/order/view_dev.phtml b/views/order/view_dev.phtml new file mode 100644 index 0000000..5fc864c --- /dev/null +++ b/views/order/view_dev.phtml @@ -0,0 +1,32 @@ + + + + +
+
+
+
+
+ +
+ +
+
+

+
+
+
+ 
view['basket']); ?>
+
+
+
+ + \ No newline at end of file diff --git a/views/order/view_general.phtml b/views/order/view_general.phtml new file mode 100644 index 0000000..750dc88 --- /dev/null +++ b/views/order/view_general.phtml @@ -0,0 +1,32 @@ + + + + view['oOrder']->getNr().' ['.$this->view['oOrder']->getStateLabel().']'); ?> + view['oOrder']->cdate)); ?> + view['oOrder']->getAmount(), $this->get_option('wpsg_currency'))); ?> + view['data']['admincomment'], 'wpsg_order_admincomment', array('inlineEdit' => true, 'inlineEdit_type' => 'textarea', 'inlineEdit_url' => WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&noheader=1&action=setAdminComment&edit_id='.$this->view['data']['id'])); ?> + + + + +
+ + arStatus, $this->view['data']['status']); ?> + + +
+ + + + + +
+ diff --git a/views/order/view_orderdata.phtml b/views/order/view_orderdata.phtml new file mode 100644 index 0000000..0ea8f1a --- /dev/null +++ b/views/order/view_orderdata.phtml @@ -0,0 +1,144 @@ + + + + + + + + view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> + + + + + + view['basket']['produkte'] as $produkt_key => $p) { $i ++; ?> + + + + view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> + + + + + + + + + + + + callMods('order_view_row', array(&$p, $i)); ?> + + view['basket']['gs'])) { ?> + + + + view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> + + + + + + + view['basket']['sum']['preis_rabatt']) && $this->view['basket']['sum']['preis_rabatt'] > 0) { ?> + + + + + + + + + + view['basket']['sum']['preis_shipping'] != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?> + + + + + + view['basket']['sum']['preis_payment'] != 0 || $this->get_option('wpsg_hideemptypayment') != '1') { ?> + + + + + + get_option('wpsg_preisangaben') == '1' && $this->get_option('wpsg_kleinunternehmer') != '1') { ?> + view['basket']['mwst'] as $mwst_id => $mwst) { ?> + + + + + + + + + + + get_option('wpsg_kleinunternehmer') == '1' || $this->get_option('wpsg_preisangaben') != '1') { ?> + view['basket']['mwst'] as $mwst_id => $mwst) { ?> + + + + + + +
+ + getProductName($this->getProduktID($p['id']))); ?> + + get_option('wpsg_currency'); ?> % get_option('wpsg_currency'); ?>
+ : + + + getShippingName($shipping); ?>, + +
view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>1view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
+ + + view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?> +
+ get_option('wpsg_kleinunternehmer') == '1') { ?> + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').''); ?> + + getFrontendTaxview() == WPSG_NETTO) { ?> + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').''); ?> + + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').''); ?> + + + + view['basket']['sum']['preis']); ?> get_option('wpsg_currency'); ?> +
+ + + view['basket']['sum']['preis_shipping']); ?> get_option('wpsg_currency'); ?> +
+ + + view['basket']['sum']['preis_payment']); ?> get_option('wpsg_currency'); ?> +
+ + + get_option('wpsg_currency'); ?> +
+ + + view['basket']['sum']['preis_gesamt_brutto']); ?> get_option('wpsg_currency'); ?> +
+ get_option('wpsg_kleinunternehmer') == '1') { ?> + get_option('wpsg_kleinunternehmer_text'); ?> + + + + + get_option('wpsg_currency'); ?> +
+ \ No newline at end of file diff --git a/views/order/view_orderlog.phtml b/views/order/view_orderlog.phtml new file mode 100644 index 0000000..79cd65d --- /dev/null +++ b/views/order/view_orderlog.phtml @@ -0,0 +1,28 @@ + + + +
+ view['oOrder']->getLog() as $k => $ol) { ?> +
+
+

+

+
+
+
+
+
+
+
+ +
+ + diff --git a/views/order/view_shippay.phtml b/views/order/view_shippay.phtml new file mode 100644 index 0000000..50c1388 --- /dev/null +++ b/views/order/view_shippay.phtml @@ -0,0 +1,31 @@ + + + + + + view['oOrder']->getShippingLabel()); ?> + view['oOrder']->getShippingAmount($this->getBackendTaxview()); ?> + 0) { ?> + (get_option('wpsg_currency')); ?>) + + + + + view['oOrder']->getPaymentLabel()); ?> + view['oOrder']->getPaymentAmount($this->getBackendTaxview()); ?> + 0) { ?> + (get_option('wpsg_currency')); ?>) + + + + callMods('order_view_afterpayment', array(&$this->view['data']['id'])); ?> + + \ No newline at end of file diff --git a/views/produkt/addedit.phtml b/views/produkt/addedit.phtml index 22c4495..1758b6e 100644 --- a/views/produkt/addedit.phtml +++ b/views/produkt/addedit.phtml @@ -32,7 +32,7 @@
view['data']['id'])) { ?> - ', 'wpsg'), $this->view['data']['id'], $this->view['oProduct']->getProductURL()); ?> + ', 'wpsg'), $this->view['data']['id'], $this->view['oProduct']->getProductURL()); ?> -- cgit v1.2.3