From 9c0342412d70ad17212b4d0a8b0c2df438859823 Mon Sep 17 00:00:00 2001
From: Dmitry Fedyuk <admin@dmitry-fedyuk.com>
Date: Mon, 11 Sep 2017 08:07:04 +0300
Subject: [PATCH] 1.12.4

---
 composer.json  | 4 ++--
 etc/config.xml | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index b4694b0..2a0a4cf 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "mage2pro/stripe"
-	,"version": "1.12.3"
+	,"version": "1.12.4"
 	,"description": "The «Stripe» payment extension for Magento 2."
 	,"type": "magento2-module"
 	,"homepage": "https://mage2.pro/c/extensions/stripe"
@@ -11,7 +11,7 @@
 		"homepage": "https://mage2.pro/users/dmitry_fedyuk",
 		"role": "Developer"
 	}]
-	,"require": {"mage2pro/core": ">=2.11.35", "stripe/stripe-php": "3.*"}
+	,"require": {"mage2pro/core": ">=2.11.36", "stripe/stripe-php": "3.*"}
 	,"autoload": {"files": ["registration.php"], "psr-4": {"Dfe\\Stripe\\": ""}}
 	,"keywords": [
 		"API"
diff --git a/etc/config.xml b/etc/config.xml
index 33bd66f..b444ad9 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -27,6 +27,11 @@ your receipt emails will include the description of the charge(s) that they are
 -->
 				<description>{order.id}</description>
 				<description_rules>
+					<locations>
+						<merchant>
+							<shown>1</shown>
+						</merchant>
+					</locations>
 					<maxLength>
 						<title>The Stripe API reference: «CORE RESOURCES» → «Charges» → «Create a charge». See the «description» parameter.</title>
 						<url>https://stripe.com/docs/api/php#create_charge-description</url>