1.6.12

mage2pro · Aug 5, 2017 · 4ef08e1 · 4ef08e1
1 parent af7f27c
commit 4ef08e1
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 83 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "mage2pro/allpay"
-	,"version": "1.6.11"
+	,"version": "1.6.12"
 	,"description": "The «歐付寶 allPay» payment extension for Magento 2."
 	,"type": "magento2-module"
 	,"homepage": "https://mage2.pro/c/extensions/allpay"
@@ -11,7 +11,7 @@
 		"homepage": "https://mage2.pro/users/dmitry_fedyuk",
 		"role": "Developer"
 	}]
-	,"require": {"mage2pro/core": ">=2.9.24"}
+	,"require": {"mage2pro/core": ">=2.10.3"}
 	,"autoload": {"files": ["registration.php"], "psr-4": {"Dfe\\AllPay\\": ""}}
 	,"keywords": [
 		"allPay"

diff --git a/...nhtml/layout/sales_order_invoice_view.xml → view/base/layout/df_payment_info.xml b/...nhtml/layout/sales_order_invoice_view.xml → view/base/layout/df_payment_info.xml
@@ -4,7 +4,10 @@
 	xsi:noNamespaceSchemaLocation='urn:magento:framework:View/Layout/etc/page_configuration.xsd'>
 	<body>
 		<referenceBlock name='invoice_totals'>
-			<block class='Dfe\AllPay\Block\Total' name='dfe_allpay_total'/>
+			<block class='Dfe\AllPay\Block\Total' name='dfe_allpay_total_1'/>
+		</referenceBlock>
+		<referenceBlock name='order_totals'>
+			<block class='Dfe\AllPay\Block\Total' name='dfe_allpay_total_2'/>
 		</referenceBlock>
 	</body>
 </page>
diff --git a/view/base/layout/sales_order_view.xml b/view/base/layout/sales_order_view.xml
diff --git a/view/frontend/layout/sales_guest_invoice.xml b/view/frontend/layout/sales_guest_invoice.xml
diff --git a/view/frontend/layout/sales_guest_print.xml b/view/frontend/layout/sales_guest_print.xml
diff --git a/view/frontend/layout/sales_guest_printinvoice.xml b/view/frontend/layout/sales_guest_printinvoice.xml
diff --git a/view/frontend/layout/sales_guest_view.xml b/view/frontend/layout/sales_guest_view.xml
diff --git a/view/frontend/layout/sales_order_invoice.xml b/view/frontend/layout/sales_order_invoice.xml
diff --git a/view/frontend/layout/sales_order_print.xml b/view/frontend/layout/sales_order_print.xml
diff --git a/view/frontend/layout/sales_order_printinvoice.xml b/view/frontend/layout/sales_order_printinvoice.xml