Skip to content

Commit 334ca14

Browse files
ccondraolysenko
ccondra
authored and
olysenko
committed
MAGETWO-89538: 2.2.4 modal
1 parent a6ed46a commit 334ca14

File tree

5 files changed

+167
-75
lines changed

5 files changed

+167
-75
lines changed

‎app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml

Lines changed: 41 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<state>true</state>
4444
<options>
4545
<option name="modalClass" xsi:type="string">release-notification-modal</option>
46-
<option name="title" xsi:type="string" translate="true">What's new with Magento 2.2.2</option>
46+
<option name="title" xsi:type="string" translate="true">What's new with Magento 2.2.4</option>
4747
<option name="type" xsi:type="string">popup</option>
4848
<option name="responsive" xsi:type="boolean">true</option>
4949
<option name="innerScroll" xsi:type="boolean">true</option>
@@ -60,26 +60,21 @@
6060
<item name="label" xsi:type="string"/>
6161
<item name="additionalClasses" xsi:type="string">release-notification-text</item>
6262
<item name="text" xsi:type="string" translate="true"><![CDATA[
63-
<p>Magento 2.2.2 offers advanced new features, including:</p>
63+
<p>Magento 2.2.4 provides powerful new tools to help reduce cart abandonment and simplify store operations:</p>
6464
<br />
65-
<div class="analytics-highlight">
66-
<h3>Advanced Reporting</h3>
67-
<p>Gain valuable insights through a dynamic suite of product, order, and customer reports,
68-
powered by Magento Business Intelligence.</p>
65+
<div class="trusted-payments-highlight">
66+
<h3>Trusted Payment Options</h3>
67+
<p>Online or on the go, your shoppers can easily purchase in a familiar, trusted way with Amazon Pay.</p>
6968
</div>
70-
<div class="instant-purchase-highlight">
71-
<h3>Instant Purchase</h3>
72-
<p>Simplify ordering and boost conversion rates by allowing your customers to use stored
73-
payment and shipping information to skip tedious checkout steps.</p>
69+
<div class="flexible-payments-highlight">
70+
<h3>Flexible Payment Terms</h3>
71+
<p>Increase sales by providing shoppers with the flexibility to pay now, later, or in installments using Klarna&#8217;s integrated payment option.</p>
7472
</div>
75-
<div class="email-marketing-highlight">
76-
<h3>Email Marketing Automation</h3>
77-
<p>Send smarter, faster email campaigns with marketing automation from dotmailer, powered by
78-
your Magento store's live data.</p>
73+
<div class="tax-automation-highlight">
74+
<h3>Sales and Use Tax Automation</h3>
75+
<p>Merchants can now automatically perform instant and accurate sales tax calculations on shopping cart items with Vertex Cloud.</p>
7976
</div>
80-
<p>Release notes and additional details can be found at
81-
<a href="http://devdocs.magento.com/" target="_blank">Magento DevDocs</a>.
82-
</p>]]>
77+
<p>To learn more, see the <a href="http://devdocs.magento.com/guides/v2.2/release-notes/bk-release-notes.html" target="_blank">Release Notes</a> and the <a href="http://docs.magento.com/m2/ce/user_guide/getting-started.html" target="_blank">Magento User Guide</a>.</p>]]>
8378
</item>
8479
</item>
8580
</argument>
@@ -114,12 +109,12 @@
114109
</container>
115110
</fieldset>
116111
</modal>
117-
<modal name="analytics_modal" component="Magento_ReleaseNotification/js/modal/component">
112+
<modal name="trusted_payments_modal" component="Magento_ReleaseNotification/js/modal/component">
118113
<settings>
119114
<onCancel>actionCancel</onCancel>
120115
<options>
121-
<option name="modalClass" xsi:type="string">analytics-subscription-modal</option>
122-
<option name="title" xsi:type="string" translate="true">Advanced Reporting</option>
116+
<option name="modalClass" xsi:type="string">trusted-payments-modal</option>
117+
<option name="title" xsi:type="string" translate="true">Trusted Payment Options</option>
123118
<option name="type" xsi:type="string">popup</option>
124119
<option name="responsive" xsi:type="boolean">true</option>
125120
<option name="innerScroll" xsi:type="boolean">true</option>
@@ -135,14 +130,13 @@
135130
<item name="config" xsi:type="array">
136131
<item name="label" xsi:type="string"/>
137132
<item name="additionalClasses" xsi:type="string">release-notification-text</item>
138-
<item name="text" xsi:type="string" translate="true"><![CDATA[<p>Advanced Reporting
139-
provides you with a dynamic suite of reports with rich insights about the health of your
140-
business.</p><br /><p>As part of the Advanced Reporting service, we may also use your customer
141-
data for such purposes as benchmarking, improving our products and services, and providing you
142-
with new and improved analytics.</p><br /><p>By using Magento 2.2.2, you agree to the Advanced
143-
Reporting <a href="https://magento.com/legal/terms/privacy" target="_blank">Privacy Policy</a>
144-
and <a href="https://magento.com/legal/terms/cloud-terms" target="_blank">Terms
145-
of Service</a>. You may opt out at any time from the Stores Configuration page.</p>]]>
133+
<item name="text" xsi:type="string" translate="true"><![CDATA[<p>With <a href="http://docs.magento.com/m2/ce/user_guide/payment/amazon-pay.html" target="_blank">Amazon Pay</a>, we make it simple for the hundreds of millions of Amazon customers worldwide to easily login and purchase from your store using information already stored their Amazon account. With easy set up in Magento 2.2.4, Amazon Pay provides your customers with a trusted and familiar checkout experience. In just a few taps, they can complete a transaction without ever leaving your site.</p>
134+
<ul>
135+
<li><span>Your customers use one familiar login to identify themselves and transact anywhere Amazon Pay is offered.</span></li>
136+
<li><span>Checkout experience is covered by the Amazon A-to-z Guarantee at no additional cost.</span></li>
137+
<li><span>Built on years of Amazon eCommerce innovation and trusted by merchants and buyers alike.</span></li>
138+
<li><span>Available across platforms and devices, in the home and on the go.</span></li>
139+
</ul>]]>
146140
</item>
147141
</item>
148142
</argument>
@@ -198,12 +192,12 @@
198192
</container>
199193
</fieldset>
200194
</modal>
201-
<modal name="instant_purchase_modal" component="Magento_ReleaseNotification/js/modal/component">
195+
<modal name="flexible_payments_modal" component="Magento_ReleaseNotification/js/modal/component">
202196
<settings>
203197
<onCancel>actionCancel</onCancel>
204198
<options>
205-
<option name="modalClass" xsi:type="string">instant-purchase-modal</option>
206-
<option name="title" xsi:type="string" translate="true">Instant Purchase</option>
199+
<option name="modalClass" xsi:type="string">flexible-payments-modal</option>
200+
<option name="title" xsi:type="string" translate="true">Flexible Payment Terms</option>
207201
<option name="type" xsi:type="string">popup</option>
208202
<option name="responsive" xsi:type="boolean">true</option>
209203
<option name="innerScroll" xsi:type="boolean">true</option>
@@ -220,19 +214,13 @@
220214
<item name="label" xsi:type="string"/>
221215
<item name="additionalClasses" xsi:type="string">release-notification-text</item>
222216
<item name="text" xsi:type="string" translate="true"><![CDATA[
223-
<p>Now you can deliver an Amazon-like experience with a new, streamlined checkout option.
224-
Logged-in customers can use previously-stored payment credentials and shipping information
225-
to skip steps, making the process faster and easier, especially for mobile shoppers. Key
226-
features include:
227-
</p>
217+
<p>With <a href="http://docs.magento.com/m2/ce/user_guide/payment/klarna.html" target="_blank">Klarna</a>, reduce purchase stress and improve your shopping experience with several retail finance and direct payment options that are easily integrated into your existing buying journey. Shoppers can choose to pay now via an online payment or direct debit, pay later via an invoice, or pay in installments.</p>
228218
<ul>
229-
<li><span>Configurable “Instant Purchase” button to place orders.</span></li>
230-
<li><span>Support for all payment solutions using Braintree Vault, including Braintree Credit
231-
Card, Braintree PayPal, and PayPal Payflow Pro.</span></li>
232-
<li><span>Shipping to the customer’s default address using the lowest cost, available shipping
233-
method.</span></li>
234-
<li><span>Ability for developers to customize the Instant Purchase business logic to meet
235-
merchant needs.</span></li>
219+
<li><span>Customers never leave your site resulting in a smoother shopping experience.</span></li>
220+
<li><span>Easy application process with the ability to pay over time increases average order value and conversion rates.</span></li>
221+
<li><span>Assumes all credit and fraud risk and ensures you are paid for ordered goods.</span></li>
222+
<li><span>Ready for all devices and supports one click repeat purchases across all Klarna merchant sites.</span></li>
223+
<li><span>Fast and easy setup, right from the Magento Admin.</span></li>
236224
</ul>]]>
237225
</item>
238226
</item>
@@ -289,12 +277,12 @@
289277
</container>
290278
</fieldset>
291279
</modal>
292-
<modal name="email_marketing_modal" component="Magento_ReleaseNotification/js/modal/component">
280+
<modal name="tax_automation_modal" component="Magento_ReleaseNotification/js/modal/component">
293281
<settings>
294282
<onCancel>actionCancel</onCancel>
295283
<options>
296-
<option name="modalClass" xsi:type="string">email-marketing-modal</option>
297-
<option name="title" xsi:type="string" translate="true">Email Marketing Automation</option>
284+
<option name="modalClass" xsi:type="string">tax-automation-modal</option>
285+
<option name="title" xsi:type="string" translate="true">Sales and Use Tax Automation</option>
298286
<option name="type" xsi:type="string">popup</option>
299287
<option name="responsive" xsi:type="boolean">true</option>
300288
<option name="innerScroll" xsi:type="boolean">true</option>
@@ -311,17 +299,14 @@
311299
<item name="label" xsi:type="string"/>
312300
<item name="additionalClasses" xsi:type="string">release-notification-text</item>
313301
<item name="text" xsi:type="string" translate="true"><![CDATA[
314-
<p>Unlock an unparalleled level of insight and control of your eCommerce marketing with
315-
dotmailer Email Marketing Automation. Included with Magento 2.2.2 for easy set-up, dotmailer
316-
ensures every customer’s journey is captured, segmented, and personalized, enabling you to
317-
deliver customer-centric campaigns that beat your results over and over again. Benefits include:
318-
</p>
302+
<p><a href="http://docs.magento.com/m2/ce/user_guide/tax/vertex.html" target="_blank">Vertex Cloud</a> combines sophisticated software and an exceptional team of tax experts to help Magento merchants simplify their sales tax process, while complying and staying up-to-date with ever-changing tax laws. Included with Magento 2.2.4, merchants can easily access and configure Vertex Cloud directly within their Magento Admin to meet the complicated tax challenges faced when selling online.</p>
319303
<ul>
320-
<li><span>No obligation 14-day trial.</span></li>
321-
<li><span>Automation campaigns using your live Magento store data that drive revenue,
322-
including abandoned cart, abandoned browse, product replenishment, and many more.</span></li>
323-
<li><span>Built-in solution for transactional emails.</span></li>
324-
<li><span>Telephone support and advice from marketing experts included.</span></li>
304+
<li><span>Seamless integration with Magento with support for simple to the most complex tax needs.</span></li>
305+
<li><span>Automatically comply with the latest tax rules for each product and every jurisdiction.</span></li>
306+
<li><span>Perform tax calculations and generate signature-ready PDF returns in one solution.</span></li>
307+
<li><span>No penalty to merchants for tax estimates from abandoned carts.</span></li>
308+
<li><span>Flexible deployment options that fit your organization&#8217;s needs, whether in the cloud or on-premise.</span></li>
309+
<li><span>Award-winning customer support specialists are available to answer questions and assist customers.</span></li>
325310
</ul>]]>
326311
</item>
327312
</item>

‎app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/css/source/_module.less

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Magento_ReleaseNotification Modal on dashboard
88
// ---------------------------------------------
99

10-
.release-notification-modal, .analytics-subscription-modal, .instant-purchase-modal, .email-marketing-modal {
10+
.release-notification-modal, .trusted-payments-modal, .flexible-payments-modal, .tax-automation-modal {
1111
-webkit-transition: visibility 0s .5s, opacity .5s ease;
1212
transition: visibility 0s .5s, opacity .5s ease;
1313

@@ -74,24 +74,25 @@
7474
right: 4rem;
7575
}
7676

77-
.analytics-highlight {
78-
background: url("Magento_ReleaseNotification::images/analytics-icon.svg") no-repeat;
77+
.trusted-payments-highlight {
78+
background: url("Magento_ReleaseNotification::images/trusted-payments-icon.svg") no-repeat;
7979
background-size: 65px 58px;
8080
}
8181

82-
.email-marketing-highlight {
83-
background: url("Magento_ReleaseNotification::images/email-marketing-icon.svg") no-repeat;
84-
background-size: 65px 53.37px;
82+
.flexible-payments-highlight {
83+
background: url("Magento_ReleaseNotification::images/flexible-payments-icon.svg") no-repeat;
84+
background-size: 65px 58px;
8585
}
8686

87-
.instant-purchase-highlight {
88-
background: url("Magento_ReleaseNotification::images/instant-purchase-icon.svg") no-repeat;
89-
background-size: 65px 59px;
87+
.tax-automation-highlight {
88+
background: url("Magento_ReleaseNotification::images/tax-automation-icon.svg") no-repeat;
89+
background-size: 65px 58px;
9090
}
9191

92-
.analytics-highlight, .email-marketing-highlight, .instant-purchase-highlight {
92+
.trusted-payments-highlight, .flexible-payments-highlight, .tax-automation-highlight {
9393
padding: 0 0 2rem 8.5rem;
9494
margin-left: 1rem;
95+
9596

9697
h3 {
9798
margin: 0;
@@ -104,26 +105,27 @@
104105
}
105106
}
106107

107-
.analytics-subscription-modal {
108+
.trusted-payments-modal {
108109
h1:first-of-type {
109-
background: url("Magento_ReleaseNotification::images/analytics-icon.svg") no-repeat;
110-
background-size: 55px 49.08px;
110+
background: url("Magento_ReleaseNotification::images/trusted-payments-icon.svg") no-repeat;
111+
background-size: 55px 49px;
111112
padding: 1.5rem 0 2rem 7rem;
112113
}
113114
}
114115

115-
.email-marketing-modal {
116+
.flexible-payments-modal {
116117
h1:first-of-type {
117-
background: url("Magento_ReleaseNotification::images/email-marketing-icon.svg") no-repeat;
118-
background-size: 55px 49.92px;
118+
background: url("Magento_ReleaseNotification::images/flexible-payments-icon.svg") no-repeat;
119+
background-size: 55px 49px;
119120
padding: 1.5rem 0 2rem 7rem;
120121
}
121122
}
122123

123-
.instant-purchase-modal {
124+
.tax-automation-modal {
124125
h1:first-of-type {
125-
background: url("Magento_ReleaseNotification::images/instant-purchase-icon.svg") no-repeat;
126-
background-size: 55px 46px;
126+
background: url("Magento_ReleaseNotification::images/tax-automation-icon.svg") no-repeat;
127+
background-size: 55px 49px;
127128
padding: 1.5rem 0 2rem 7rem;
128129
}
129130
}
131+

0 commit comments

Comments
 (0)