From 4eb159da9b6d9463c31cf5c6a452a05259add785 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Fri, 22 Jan 2021 07:53:33 +0000 Subject: #4.2.10 - Feature: Abo Modul überarbeitet (Abos je Produkt / Vorverlängerungsaktionen) - Feature: Mehrzeilige Produktvariablen - Feature: Mehrere Tempaltes für Downloadplus PDF Anpassungen - Feature: Zentrale Dokumente für Downloadplus - Feature: Template je Variante für Downloadplus anpassbar - Feature: parallele Erstellung eines Dokumentes ohne Vorlage (Briefbogenfunktion) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7824 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/mods/mod_downloadplus/filelist.phtml | 26 +- .../mods/mod_downloadplus/order_view_sidebar.phtml | 37 ++- .../order_view_sidebar_renderlist.phtml | 29 +- .../mod_downloadplus/produkt_addedit_sidebar.phtml | 153 +++++++-- views/mods/mod_downloadplus/settings_edit.phtml | 107 +------ .../mod_downloadplus/settings_edit_templates.phtml | 343 +++++++++++++++++++++ views/mods/mod_productvars/basket_row.phtml | 12 +- views/mods/mod_productvars/order_view_row.phtml | 15 +- views/mods/mod_productvars/overview_row.phtml | 2 + views/mods/mod_productvars/renderTemplate.phtml | 4 +- 10 files changed, 561 insertions(+), 167 deletions(-) create mode 100644 views/mods/mod_downloadplus/settings_edit_templates.phtml (limited to 'views/mods') diff --git a/views/mods/mod_downloadplus/filelist.phtml b/views/mods/mod_downloadplus/filelist.phtml index b151177..7cce569 100644 --- a/views/mods/mod_downloadplus/filelist.phtml +++ b/views/mods/mod_downloadplus/filelist.phtml @@ -5,17 +5,25 @@ */ ?> + view['files'])) { ?> -

+ +

+ + + \ No newline at end of file diff --git a/views/mods/mod_downloadplus/order_view_sidebar.phtml b/views/mods/mod_downloadplus/order_view_sidebar.phtml index d100189..c829451 100644 --- a/views/mods/mod_downloadplus/order_view_sidebar.phtml +++ b/views/mods/mod_downloadplus/order_view_sidebar.phtml @@ -6,8 +6,7 @@ */ ?> - -
-

-
- -

-
- callMod('wpsg_mod_downloadplus', 'order_view_sidebar_renderList', array($this->view['order_id'])); ?> +
+
+

+ +

-
\ No newline at end of file +
+ +
+ callMod('wpsg_mod_downloadplus', 'order_view_sidebar_renderList', array($this->view['order_id'])); ?> +
+ +

+ + + +
+
diff --git a/views/mods/mod_downloadplus/order_view_sidebar_renderlist.phtml b/views/mods/mod_downloadplus/order_view_sidebar_renderlist.phtml index 834c7c6..95f43dc 100644 --- a/views/mods/mod_downloadplus/order_view_sidebar_renderlist.phtml +++ b/views/mods/mod_downloadplus/order_view_sidebar_renderlist.phtml @@ -25,11 +25,13 @@ view['arFiles'] as $f) { ?> - + 0) { ?> - + + + - + @@ -39,6 +41,17 @@ 0) { ?> + + + +
+ + + + + + + @@ -53,14 +66,16 @@ - 0 && strtotime($f[3]['done']) <= 0) { ?> + 0 && strtotime($f[3]['done']) <= 0) { ?> +
-
- - \ No newline at end of file + + + + \ No newline at end of file diff --git a/views/mods/mod_downloadplus/produkt_addedit_sidebar.phtml b/views/mods/mod_downloadplus/produkt_addedit_sidebar.phtml index 81214ff..61735ee 100644 --- a/views/mods/mod_downloadplus/produkt_addedit_sidebar.phtml +++ b/views/mods/mod_downloadplus/produkt_addedit_sidebar.phtml @@ -5,12 +5,12 @@ * sollte nicht verändert werden */ + $view = $this->view['wpsg_mod_downloadplus']??[]; + ?> -
@@ -81,31 +80,121 @@
-
view['filesList']; ?>
- - get_option('wpsg_classicupload') == '1') { ?> - - - " type="text" style="text-align:center;" size="10" id="wpsg_mod_downloadplus_upload" /> - - -

-
-
- -
-
-

- -

-
-
-
- -

- - - + + + + + + +
\ No newline at end of file diff --git a/views/mods/mod_downloadplus/settings_edit.phtml b/views/mods/mod_downloadplus/settings_edit.phtml index c59f635..f30f3ff 100644 --- a/views/mods/mod_downloadplus/settings_edit.phtml +++ b/views/mods/mod_downloadplus/settings_edit.phtml @@ -9,7 +9,8 @@
@@ -67,102 +68,10 @@
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - view['arTexte'][$i]['align'] == '1')?'checked="checked"':''); ?> /> - - - view['arTexte'][$i]['bg'] == '1')?'checked="checked"':''); ?> /> - - - - - - - - - - view['arTexte'][$i]['aktiv'] == 1)?'checked="checked"':''); ?> />  -
: - - - -
- -
-
get_option('wpsg_mod_downloadplus_memorylimit'), array('help' => 'wpsg_mod_downloadplus_memorylimit')); ?> + get_option('wpsg_mod_downloadplus_emptypdf'), ['help' => 'wpsg_mod_downloadplus_emptypdf']); ?> get_option('wpsg_mod_downloadplus_timelimit'), array('help' => 'wpsg_mod_downloadplus_timelimit')); ?> get_option('wpsg_mod_downloadplus_numberformat'), array('help' => 'wpsg_mod_downloadplus_numberformat')); ?> get_option('wpsg_mod_downloadplus_startnumber'), array('help' => 'wpsg_mod_downloadplus_startnumber')); ?> @@ -170,6 +79,12 @@
+
+ + render(WPSG_PATH_VIEW.'/mods/mod_downloadplus/settings_edit_templates.phtml'); ?> + +
+

@@ -195,7 +110,7 @@

- \ No newline at end of file + \ No newline at end of file diff --git a/views/mods/mod_downloadplus/settings_edit_templates.phtml b/views/mods/mod_downloadplus/settings_edit_templates.phtml new file mode 100644 index 0000000..498aed4 --- /dev/null +++ b/views/mods/mod_downloadplus/settings_edit_templates.phtml @@ -0,0 +1,343 @@ +callMod('wpsg_mod_downloadplus', 'getTemplate')); + + $arFontVue = []; + foreach ($this->view['wpsg_mod_downloadplus']['arFonts'] as $font_code => $font_label) { + + $arFontVue[] = ['code' => $font_code, 'label' => $font_label]; + + } + +?> + +
+ +
+ + + + + +
+ + + +
+
+ + + +
+ + + + + +
+ +
+ +
+ +
+
+ +
+ + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
#{{field_index + 1}} + + + + + + + + + + + + + + + + + +
+ + + + : + + + + + + + +
+ +
+ +
+ + +
+ +
+ {{template.file}} + + + +
+ +
+ +
+ + + +
+ +
+ + + + + diff --git a/views/mods/mod_productvars/basket_row.phtml b/views/mods/mod_productvars/basket_row.phtml index dead306..95cbd8e 100644 --- a/views/mods/mod_productvars/basket_row.phtml +++ b/views/mods/mod_productvars/basket_row.phtml @@ -25,11 +25,13 @@ view['wpsg_mod_productvars']['p']['wpsg_mod_productvars'][$pv['id']]) == '1')?'checked="checked"':''); ?> class="view['wpsg_mod_productvars']['p']['product_index'], (array)$this->view['error']))?'wpsg_error':''); ?>" type="checkbox" value="1" name="wpsg_mod_productvars[][view['wpsg_mod_productvars']['p']['product_index']; ?>]" /> - + + + -
- -
- + \ No newline at end of file diff --git a/views/mods/mod_productvars/order_view_row.phtml b/views/mods/mod_productvars/order_view_row.phtml index b4a22a4..4abda08 100644 --- a/views/mods/mod_productvars/order_view_row.phtml +++ b/views/mods/mod_productvars/order_view_row.phtml @@ -56,7 +56,20 @@ indicator: '', tooltip: '' }); - + + jQuery('#wpsg_productvar_').wpsg_editable('wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_productvars&do=inlinedit&noheader=1', { + submitdata: { + order_id: , + pv_id: '', + p_id: 'view['wpsg_mod_productvars']['p']['product_index']; ?>' + }, + submit: '', + type: 'textarea', + placeholder: '', + indicator: '', + tooltip: '' + }); + diff --git a/views/mods/mod_productvars/overview_row.phtml b/views/mods/mod_productvars/overview_row.phtml index 7499b5a..99d020f 100644 --- a/views/mods/mod_productvars/overview_row.phtml +++ b/views/mods/mod_productvars/overview_row.phtml @@ -28,6 +28,8 @@ + + view['wpsg_mod_productvars']['p']['wpsg_mod_productvars'][$pv['id']])); ?>
diff --git a/views/mods/mod_productvars/renderTemplate.phtml b/views/mods/mod_productvars/renderTemplate.phtml index 871e6a9..bea2820 100644 --- a/views/mods/mod_productvars/renderTemplate.phtml +++ b/views/mods/mod_productvars/renderTemplate.phtml @@ -25,7 +25,9 @@ type="checkbox" value="1" name="wpsg_mod_productvars[]" /> - + + +
-- cgit v1.2.3