From 1c88b6f69cd87a436073be9cdf05eee6c3757f42 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Mon, 28 Aug 2017 12:31:04 +0000 Subject: - Exportprofile auf Produkte ausgeweitet - git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6425 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/konfiguration.phtml | 54 +------------------------ views/css/admin.css | 1 + views/mods/mod_export/product_index_tab.phtml | 57 +++++++++++++++++++++++++++ views/mods/mod_export/profil.phtml | 45 +++++++++++++++++---- views/mods/mod_export/profillist.phtml | 11 +++++- views/mods/mod_export/settings_edit.phtml | 15 +++++-- views/order/index.phtml | 15 +++---- views/produkt/index.phtml | 18 +++++++-- 8 files changed, 141 insertions(+), 75 deletions(-) create mode 100644 views/mods/mod_export/product_index_tab.phtml (limited to 'views') diff --git a/views/admin/konfiguration.phtml b/views/admin/konfiguration.phtml index 02fd09b..518d2a7 100644 --- a/views/admin/konfiguration.phtml +++ b/views/admin/konfiguration.phtml @@ -23,59 +23,7 @@

-
- hasMod('wpsg_mod_core')) { ?> - - arLizenz['l'] == 0) { ?> - getDemoDays() < 0) - { - $strText = wpsg_translate(__('Vor #1# Tage(n) abgelaufen.', 'wpsg'), abs($this->getDemoDays())); - - } else { - - $strText = wpsg_translate(__('#1# Tage verbleibend.', 'wpsg'), $this->getDemoDays()); - - } - - echo wpsg_drawForm_Text(__('Lizenzende', 'wpsg'), $strText, '', array('help' => 'DemoMode')); - - ?> - - - - arLizenz['l']) - { - - case '1': $strText = __('Light Version', 'wpsg'); break; - case '2': $strText = __('Pro Version', 'wpsg'); break; - case '3': $strText = __('Enterprise Version', 'wpsg'); break; - default: die(); - - } - - echo wpsg_drawForm_Text(__('Lizenzstatus', 'wpsg'), $strText); - - ?> - - -
-
 
-
- Weitere Funktionen in der Vollversion.
[ Vollversion kaufen ] [ Weitere Infos ]', 'wpsg'), - 'http://shop.maennchen1.de/produkte/wpshopgermany-lizenzkey/', - 'http://wpshopgermany.de/' - ); ?> -
-
-
- - +
get_option("wpsg_version_installed", true) != WPSG_VERSION) { ?>
diff --git a/views/css/admin.css b/views/css/admin.css index 2598235..1265c70 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -11,6 +11,7 @@ #wpsg-bs nav.navbar li { margin-bottom:0px; } #wpsg-bs nav.navbar .active { margin-right:2px; } #wpsg-bs nav.navbar .glyphicon { margin-right:10px; } +#wpsg-bs .wpsg-export, #wpsg-bs .wpsg-filter-tab, #wpsg-bs .wpsg-filter { border-top:1px solid #E0E0E0; padding:15px; } #wpsg-bs .pagination_wrap { text-align:right; padding-right:20px; } diff --git a/views/mods/mod_export/product_index_tab.phtml b/views/mods/mod_export/product_index_tab.phtml new file mode 100644 index 0000000..493198d --- /dev/null +++ b/views/mods/mod_export/product_index_tab.phtml @@ -0,0 +1,57 @@ +callMod('wpsg_mod_export', 'getProfile', array(wpsg_mod_export::TYPE_PRODUCT)); + +?> + + + + + + \ No newline at end of file diff --git a/views/mods/mod_export/profil.phtml b/views/mods/mod_export/profil.phtml index b0375ec..b703055 100644 --- a/views/mods/mod_export/profil.phtml +++ b/views/mods/mod_export/profil.phtml @@ -38,8 +38,12 @@
view['profil']['xml_roottag'], 'xml_roottag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?> - view['profil']['xml_ordertag'], 'xml_ordertag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?> - view['profil']['xml_productroottag'], 'xml_productroottag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?> + + view['profil']['export_type'] === wpsg_mod_export::TYPE_ORDER) { ?> + view['profil']['xml_ordertag'], 'xml_ordertag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?> + view['profil']['xml_productroottag'], 'xml_productroottag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?> + + view['profil']['xml_producttag'], 'xml_producttag', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?>
@@ -49,12 +53,16 @@

- - view['profil']['order_onetime'], array('label' => __('Optionen', 'wpsg'), 'inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?> -
- view['profil']['order_online'], array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?> -
+ view['profil']['export_type'] === wpsg_mod_export::TYPE_ORDER) { ?> + + view['profil']['order_onetime'], array('label' => __('Optionen', 'wpsg'), 'inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?> + +
+ view['profil']['order_online'], array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?> +
+ +
@@ -81,6 +89,7 @@ false)); ?> '.WPSG_PLUGIN_URL.'wpshopgermany/cron.php', false, array('noP' => false)); ?> + view['profil']['export_type'] === wpsg_mod_export::TYPE_ORDER) { ?>
@@ -173,6 +182,28 @@
+ view['profil']['export_type'] === wpsg_mod_export::TYPE_PRODUCT) { ?> +
+ +
+ +
+ + view['profil']['orderfilter']['s']), 'orderfilter_s', array('inlineEdit' => true, 'inlineEdit_url' => $inlineEdit_url)); ?> + + hasMod('wpsg_mod_productgroups')) { $arProductGroupSelect = array('-1' => __('Alle Produktgruppen', 'wpsg')) + wpsg_productgroup::getProductgroupSelect(); ?> + view['profil']['orderfilter']['productgroup_ids'], '-1')], 'orderfilter_productgroup_ids', array('inlineEdit' => true, 'inlineEdit_type' => 'select', 'inlineEdit_url' => $inlineEdit_url, 'inlineEdit_source' => $arProductGroupSelect)); ?> + + + hasMod('wpsg_mod_produktartikel')) { $temp = $this->callMod('wpsg_mod_produktartikel', 'getProductcategorySelect', array()); ?> + $v) $arProductCategorySelect[$v['term_id']] = $v['label']; ?> + view['profil']['orderfilter']['productcategory_ids'], '-1')], 'orderfilter_productcategory_ids', array('inlineEdit' => true, 'inlineEdit_type' => 'select', 'inlineEdit_url' => $inlineEdit_url, 'inlineEdit_source' => $arProductCategorySelect)); ?> + + +
+ +
+
diff --git a/views/mods/mod_export/profillist.phtml b/views/mods/mod_export/profillist.phtml index f73903f..4f5e039 100644 --- a/views/mods/mod_export/profillist.phtml +++ b/views/mods/mod_export/profillist.phtml @@ -5,7 +5,16 @@ */ $arProfilSelect = array(); - foreach ($this->view['arProfile'] as $p) $arProfilSelect[$p['id']] = $p['name']; + + foreach ($this->view['arProfile'] as $p) + { + + $arProfilSelect[$p['id']] = $p['name']; + + if ($p['export_type'] === wpsg_mod_export::TYPE_ORDER) $arProfilSelect[$p['id']] .= ' ('.__('Bestellexport', 'wpsg').')'; + else if ($p['export_type'] === wpsg_mod_export::TYPE_PRODUCT) $arProfilSelect[$p['id']] .= ' ('.__('Produktexport', 'wpsg').')'; + + } ?> diff --git a/views/mods/mod_export/settings_edit.phtml b/views/mods/mod_export/settings_edit.phtml index 1c8fa18..39c0c16 100644 --- a/views/mods/mod_export/settings_edit.phtml +++ b/views/mods/mod_export/settings_edit.phtml @@ -96,15 +96,20 @@ } // function wpsg_mod_export_removeProfil(profil_id) - function wpsg_mod_export_addProfil() + function wpsg_mod_export_addProfil(type) { jQuery('#wpsg_profil_list').html('<?php echo __('Bitte warten ...', 'wpsg'); ?>'); jQuery.ajax( { - url: 'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_export&do=wpsg_mod_export_addProfil&noheader=1', + url: 'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_export&do=wpsg_mod_export_addProfil&noheader=1', + data: { + type: type + }, success: function(data) { + jQuery("#wpsg_profil_list").html(data); + } } ); @@ -126,7 +131,7 @@ }, success: function(data) { - if (data != '1') + if (data != '1' && data != '0') { alert(data); @@ -140,7 +145,9 @@ - +
+ +

callMod('wpsg_mod_export', 'profilList'); ?>
\ No newline at end of file diff --git a/views/order/index.phtml b/views/order/index.phtml index 95a6486..b6b55dc 100644 --- a/views/order/index.phtml +++ b/views/order/index.phtml @@ -32,12 +32,6 @@
- view['tabs'] as $tab_positions) { ?> - $tab) { ?> - - - -
@@ -99,7 +93,14 @@
- + + view['tabs'] as $tab_positions) { ?> + $tab) { ?> + + + + +
diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml index a1e7a2c..d862d08 100644 --- a/views/produkt/index.phtml +++ b/views/produkt/index.phtml @@ -21,18 +21,27 @@ + + + hasMod('wpsg_mod_export')) { $arProfile = $this->callMod('wpsg_mod_export', 'getProfile', array(wpsg_mod_export::TYPE_PRODUCT)); ?> + + + + +
    - + view['arData'])) { ?> - + hasMod('wpsg_mod_produktbilder')) { ?> - +
+
@@ -73,6 +82,9 @@
+ + callMod('wpsg_mod_export', 'product_index_tab'); ?> + hasMod('wpsg_mod_productgroups')) { $arProductgroupSelect = wpsg_productgroup::getProductgroupSelect($this->view['arFilter']); ?> -- cgit v1.2.3