From fdfe75e0f8777b4c2bb81af19fd0e31fe59bf29b Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Thu, 2 Jul 2020 08:04:18 +0000 Subject: #4.2.5 - Feature: Gutenberg Block zur Produktanzeige - Bugfix: Bestellen ohne Kundenverwaltung führt nicht mehr zum Fehler (Bug durch 4.2.4) - Bugfix: Lieferschein: Warnungen entfernt - Bugfix: Lieferschein: Vorschau beachtet nun wieder die Produktauswahl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7753 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/form/input.phtml | 6 + views/css/gutenberg.css | 4 + views/js/wpsg-block-product.js | 1 + views/mods/mod_deliverynote/deliverynote_pdf.phtml | 3 +- .../mod_micropayment_paywindow/gfx/bank2pay.png | Bin 0 -> 7310 bytes .../mod_micropayment_paywindow/gfx/call2pay.png | Bin 0 -> 7265 bytes views/mods/mod_micropayment_paywindow/gfx/chip.png | Bin 0 -> 5996 bytes .../mod_micropayment_paywindow/gfx/creditcard.png | Bin 0 -> 8798 bytes .../mod_micropayment_paywindow/gfx/directdebit.png | Bin 0 -> 7554 bytes .../mod_micropayment_paywindow/gfx/handypay.png | Bin 0 -> 7874 bytes .../mod_micropayment_paywindow/gfx/logo_100x25.png | Bin 0 -> 2888 bytes .../mod_micropayment_paywindow/gfx/prepayment.png | Bin 0 -> 8602 bytes .../mod_micropayment_paywindow/order_done.phtml | 139 +++++++++++++++++++++ .../mod_micropayment_paywindow/settings_edit.phtml | 36 ++++++ 14 files changed, 187 insertions(+), 2 deletions(-) create mode 100644 views/css/gutenberg.css create mode 100644 views/js/wpsg-block-product.js create mode 100644 views/mods/mod_micropayment_paywindow/gfx/bank2pay.png create mode 100644 views/mods/mod_micropayment_paywindow/gfx/call2pay.png create mode 100644 views/mods/mod_micropayment_paywindow/gfx/chip.png create mode 100644 views/mods/mod_micropayment_paywindow/gfx/creditcard.png create mode 100644 views/mods/mod_micropayment_paywindow/gfx/directdebit.png create mode 100644 views/mods/mod_micropayment_paywindow/gfx/handypay.png create mode 100644 views/mods/mod_micropayment_paywindow/gfx/logo_100x25.png create mode 100644 views/mods/mod_micropayment_paywindow/gfx/prepayment.png create mode 100644 views/mods/mod_micropayment_paywindow/order_done.phtml create mode 100644 views/mods/mod_micropayment_paywindow/settings_edit.phtml diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml index b6f3dee..cfceb2e 100644 --- a/views/admin/form/input.phtml +++ b/views/admin/form/input.phtml @@ -38,6 +38,7 @@ maxlength="view['field_config']['maxlength']; ?>" /> + view['field_config']['help'])) { ?> view['field_config']['rAlign'])) { ?> + + view['field_config']['hint'])) { ?> + view['field_config']['hint']; ?> + + diff --git a/views/css/gutenberg.css b/views/css/gutenberg.css new file mode 100644 index 0000000..c626b70 --- /dev/null +++ b/views/css/gutenberg.css @@ -0,0 +1,4 @@ +.wp-block-wpsg-product { background-color:#C4D100; color:#003C6A; margin:-5px; padding:10px; } +.wp-block-wpsg-product .components-base-control__field { width:100%; display:flex; justify-content:flex-start; align-items:center; margin-bottom:0; } +.wp-block-wpsg-product .components-base-control__field label { width:150px; } +.wp-block-wpsg-product .components-base-control+.components-base-control { margin-bottom:0; } \ No newline at end of file diff --git a/views/js/wpsg-block-product.js b/views/js/wpsg-block-product.js new file mode 100644 index 0000000..7124bd0 --- /dev/null +++ b/views/js/wpsg-block-product.js @@ -0,0 +1 @@ +!function(e){var t={};function r(l){if(t[l])return t[l].exports;var n=t[l]={i:l,l:!1,exports:{}};return e[l].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.m=e,r.c=t,r.d=function(e,t,l){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:l})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var l=Object.create(null);if(r.r(l),Object.defineProperty(l,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)r.d(l,n,function(t){return e[t]}.bind(null,n));return l},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=2)}([function(e,t){!function(){e.exports=this.wp.element}()},function(e,t){!function(){e.exports=this.wp.components}()},function(e,t,r){"use strict";r.r(t);var l=r(0),n=r(1);(0,wp.blocks.registerBlockType)("wpsg/product",{title:"Produkt(e)",attributes:{product:{type:"string",default:"0"},template:{type:"string",default:"standard.phtml"},hide_title:{type:"string",default:"0"}},icon:Object(l.createElement)("svg",{xmlns:"http://www.w3.org/2000/svg",width:"200",height:"200",x:"0",y:"0",version:"1.1",viewBox:"0 0 200 200",xmlSpace:"preserve"},Object(l.createElement)("path",{fill:"#C4D00C",d:"M105.023 9.465c-50.1 0-90.71 40.613-90.71 90.706 0 50.096 40.61 90.708 90.71 90.708 50.101 0 90.703-40.612 90.703-90.708.001-50.093-40.602-90.706-90.703-90.706zm-.07 157.155c-36.734 0-66.518-29.778-66.518-66.512s29.783-66.521 66.518-66.521c36.733 0 66.516 29.786 66.516 66.521 0 36.734-29.782 66.512-66.516 66.512z"}),Object(l.createElement)("path",{fill:"#153C67",d:"M102.003 142.499c0 8.349-6.771 15.122-15.122 15.122-8.349 0-15.117-6.773-15.117-15.122 0-8.346 6.769-15.114 15.117-15.114 8.35 0 15.122 6.768 15.122 15.114zM138.28 142.499c0 8.349-6.767 15.122-15.115 15.122-8.352 0-15.12-6.773-15.12-15.122 0-8.346 6.769-15.114 15.12-15.114 8.349 0 15.115 6.768 15.115 15.114zM141.306 57.846H98.975c-8.349 0-15.115 6.767-15.115 15.114 0 8.354 6.767 15.122 15.115 15.122h21.352l-2.011 6.046h-32.52l-3.953-5.864-.005-.012c-.006-.001-.009-.008-.011-.014l-8.436-12.499c-.005-.004-.005-.013-.014-.017 0-.007-.004-.01-.01-.019l-8.431-12.5c-.006-.007-.01-.011-.013-.018-.004 0-.004-.006-.012-.01l-8.432-12.498c0-.008-.009-.01-.011-.018-.003-.006-.007-.012-.01-.012L48.02 38.144c-.005-.01-.005-.015-.011-.023a15.112 15.112 0 00-12.533-6.659H20.361c-8.35 0-15.118 6.768-15.118 15.116 0 8.351 6.769 15.118 15.118 15.118h7.085l3.961 5.874 8.455 12.532 8.456 12.528v.009l8.452 12.52v.006h.002l8.46 12.532.027-.021c2.718 4.03 7.324 6.683 12.551 6.683h51.399c6.807 0 12.558-4.495 14.451-10.686l11.821-35.466c.608-1.635.938-3.403.938-5.25.001-8.345-6.766-15.111-15.113-15.111z"})),category:"layout",edit:function(e){var t=e.attributes,r=e.setAttributes,o=e.className,c=t.product,u=t.template,i=t.hide_title;return Object(l.createElement)("div",{className:o},Object(l.createElement)(n.SelectControl,{value:c,label:wpsg_block_product.label.product,onChange:function(e){r({product:e})},options:wpsg_block_product.arProductSelect}),Object(l.createElement)(n.SelectControl,{value:u,label:wpsg_block_product.label.template,onChange:function(e){r({template:e})},options:wpsg_block_product.arTemplateSelect}),Object(l.createElement)(n.SelectControl,{value:i,label:wpsg_block_product.label.hide_title,onChange:function(e){r({hide_title:e})},options:wpsg_block_product.arHideTitleSelect}))},save:function(e){return null}})}]); \ No newline at end of file diff --git a/views/mods/mod_deliverynote/deliverynote_pdf.phtml b/views/mods/mod_deliverynote/deliverynote_pdf.phtml index 8fda0d2..ed038c0 100644 --- a/views/mods/mod_deliverynote/deliverynote_pdf.phtml +++ b/views/mods/mod_deliverynote/deliverynote_pdf.phtml @@ -390,8 +390,7 @@ $pdf->Output($this->callMod('wpsg_mod_deliverynote', 'getFilePath', array($this->view['order']['id'])).$this->view['filename'], 'F'); - if ($this->view['output'] === true) $pdf->Output($filename, 'I'); + if (wpsg_isTrue($this->view['output'])) $pdf->Output($filename, 'I'); } -?> \ No newline at end of file diff --git a/views/mods/mod_micropayment_paywindow/gfx/bank2pay.png b/views/mods/mod_micropayment_paywindow/gfx/bank2pay.png new file mode 100644 index 0000000..097f834 Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/bank2pay.png differ diff --git a/views/mods/mod_micropayment_paywindow/gfx/call2pay.png b/views/mods/mod_micropayment_paywindow/gfx/call2pay.png new file mode 100644 index 0000000..7e2ba85 Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/call2pay.png differ diff --git a/views/mods/mod_micropayment_paywindow/gfx/chip.png b/views/mods/mod_micropayment_paywindow/gfx/chip.png new file mode 100644 index 0000000..38e656f Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/chip.png differ diff --git a/views/mods/mod_micropayment_paywindow/gfx/creditcard.png b/views/mods/mod_micropayment_paywindow/gfx/creditcard.png new file mode 100644 index 0000000..5ebac0c Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/creditcard.png differ diff --git a/views/mods/mod_micropayment_paywindow/gfx/directdebit.png b/views/mods/mod_micropayment_paywindow/gfx/directdebit.png new file mode 100644 index 0000000..9951453 Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/directdebit.png differ diff --git a/views/mods/mod_micropayment_paywindow/gfx/handypay.png b/views/mods/mod_micropayment_paywindow/gfx/handypay.png new file mode 100644 index 0000000..8dcd83f Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/handypay.png differ diff --git a/views/mods/mod_micropayment_paywindow/gfx/logo_100x25.png b/views/mods/mod_micropayment_paywindow/gfx/logo_100x25.png new file mode 100644 index 0000000..2e06ab9 Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/logo_100x25.png differ diff --git a/views/mods/mod_micropayment_paywindow/gfx/prepayment.png b/views/mods/mod_micropayment_paywindow/gfx/prepayment.png new file mode 100644 index 0000000..2668837 Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/prepayment.png differ diff --git a/views/mods/mod_micropayment_paywindow/order_done.phtml b/views/mods/mod_micropayment_paywindow/order_done.phtml new file mode 100644 index 0000000..89381ae --- /dev/null +++ b/views/mods/mod_micropayment_paywindow/order_done.phtml @@ -0,0 +1,139 @@ +view['wpsg_mod_micropayment_paywindow']; + +?> + +
+ +

+ +

+ +
+ + + <?php echo $view['title']; ?> + + +
+ +view['wpsg_mod_micropayment']['payLink'])) { ?> + +

+ +<?php echo $this->view['wpsg_mod_micropayment']['title']; ?> + + get_option('wpsg_mod_micropayment_paystart') == '1') { ?> + + + + + +

+ +
+ +
+
+
+
+
+
+
:
+
+ + / + +
+
+ +
+
+
+
+
+
+
+ + + +
+ +
+ + + + \ No newline at end of file diff --git a/views/mods/mod_micropayment_paywindow/settings_edit.phtml b/views/mods/mod_micropayment_paywindow/settings_edit.phtml new file mode 100644 index 0000000..3af2e6c --- /dev/null +++ b/views/mods/mod_micropayment_paywindow/settings_edit.phtml @@ -0,0 +1,36 @@ +view['wpsg_mod_micropayment_paywindow']; + +?> +get_option('wpsg_mod_micropayment_paywindow_accesskey'), array('help' => 'wpsg_mod_micropayment_paywindow_accesskey')); ?> +get_option('wpsg_mod_micropayment_paywindow_projectid'), array('help' => 'wpsg_mod_micropayment_paywindow_projectid')); ?> + true]); ?> +get_option('wpsg_mod_micropayment_paywindow_paytitle'), ['placeholder' => $view['default_pay_title'], 'hint' => __('Maximal 150 Zeichen', 'wpsg')]); ?> +get_option('wpsg_mod_micropayment_paywindow_paytext'), ['placeholder' => $view['default_pay_text'], 'hint' => __('Maximal 250 Zeichen', 'wpsg')]); ?> +get_option('wpsg_mod_micropayment_paywindow_sandbox')); ?> + +
+ + $pw) { ?> + + + + get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_activ'), []); ?> + get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_title'), [ + 'help' => 'wpsg_mod_micropayment_paywindow_name', + 'placeholder' => __($pw['title'], 'wpsg') + ]); ?> + get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_hint'), array('help' => 'wpsg_mod_micropayment_paywindow_hint')); ?> + get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_logo'), array('help' => 'wpsg_mod_micropayment_paywindow_logo')); ?> + get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_mod_micropayment_paywindow_gebuehr')); ?> + get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_mwst'), array('help' => 'wpsg_mod_micropayment_paywindow_mwst')); ?> + get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_mwstland'), array('help' => 'wpsg_mod_micropayment_paywindow_mwstland')); ?> + + + + -- cgit v1.2.3