Skip to content

Commit b68cabb

Browse files
fascinosumfascinosum
committed
Merge branch 'MC-41705-paylater-cartpage' into paypal-paylater-4
2 parents 051ccfd + 9e9bec5 commit b68cabb

File tree

11 files changed

+251
-18
lines changed

11 files changed

+251
-18
lines changed

‎app/code/Magento/Paypal/Model/System/Config/Source/PayLater/Position.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,17 @@ public function getPositionsCategoryPage(): array
6262
'sidebar' => __('Sidebar'),
6363
];
6464
}
65+
66+
/**
67+
* PayLater positions source getter for Checkout Cart Page
68+
*
69+
* @return array
70+
*/
71+
public function getPositionsCart(): array
72+
{
73+
return [
74+
'header' => __('Header (center)'),
75+
'near_pp_button' => __('Near PayPal Credit checkout button')
76+
];
77+
}
6578
}

‎app/code/Magento/Paypal/Setup/Patch/Data/UpdateBmltoPayLater.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class UpdateBmltoPayLater implements DataPatchInterface
3030
*/
3131
private $bmlToPayLater = [
3232
[
33-
'pages' => ['productpage'],
33+
'pages' => ['productpage', 'checkout'],
3434
'data' => [
3535
'position' => [
3636
'name' =>'position',
@@ -136,7 +136,8 @@ public function apply()
136136
$settingParts = explode('_', $setting);
137137
$page = $settingParts[0];
138138
$setting = $settingParts[1];
139-
$payLaterPath = self::PAYLATERPATH . $page;
139+
$payLaterPage = $page === 'checkout' ? 'cartpage' : $page;
140+
$payLaterPath = self::PAYLATERPATH . $payLaterPage;
140141

141142
if (array_key_exists(self::BMLPATH . $page . '_display', $bmlSettings)
142143
&& $bmlSettings[self::BMLPATH . $page . '_display'] === '0'

‎app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml

Lines changed: 92 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,98 @@
523523
</depends>
524524
</field>
525525
</group>
526-
<group id="settings_paylater_checkout_payment" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
526+
<group id="settings_paylater_cartpage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
527+
<label>Checkout Cart Page</label>
528+
<depends>
529+
<field id="paylater_enabled">1</field>
530+
</depends>
531+
<field id="paylater_cartpage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
532+
<label>Display</label>
533+
<config_path>payment/paypal_paylater/cartpage_display</config_path>
534+
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
535+
<attribute type="shared">1</attribute>
536+
</field>
537+
<field id="paylater_cartpage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
538+
<label>Position</label>
539+
<config_path>payment/paypal_paylater/cartpage_position</config_path>
540+
<source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCart</source_model>
541+
<attribute type="shared">1</attribute>
542+
<depends>
543+
<field id="paylater_cartpage_display">1</field>
544+
</depends>
545+
</field>
546+
<field id="paylater_cartpage_stylelayout" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
547+
<label>Style Layout</label>
548+
<config_path>payment/paypal_paylater/cartpage_stylelayout</config_path>
549+
<source_model>Magento\Paypal\Model\System\Config\Source\PayLater\StyleLayout</source_model>
550+
<attribute type="shared">1</attribute>
551+
<depends>
552+
<field id="paylater_cartpage_display">1</field>
553+
</depends>
554+
</field>
555+
<field id="paylater_cartpage_logotype" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="40">
556+
<label>Logo Type</label>
557+
<config_path>payment/paypal_paylater/cartpage_logotype</config_path>
558+
<source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoType</source_model>
559+
<attribute type="shared">1</attribute>
560+
<depends>
561+
<field id="paylater_cartpage_display">1</field>
562+
<field id="paylater_cartpage_stylelayout">text</field>
563+
</depends>
564+
</field>
565+
<field id="paylater_cartpage_logoposition" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="50">
566+
<label>Logo Position</label>
567+
<config_path>payment/paypal_paylater/cartpage_logoposition</config_path>
568+
<source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoPosition</source_model>
569+
<attribute type="shared">1</attribute>
570+
<depends>
571+
<field id="paylater_cartpage_display">1</field>
572+
<field id="paylater_cartpage_stylelayout">text</field>
573+
<field id="paylater_cartpage_logotype" separator=",">primary,alternative</field>
574+
</depends>
575+
</field>
576+
<field id="paylater_cartpage_textcolor" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="60">
577+
<label>Text Color</label>
578+
<config_path>payment/paypal_paylater/cartpage_textcolor</config_path>
579+
<source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextColor</source_model>
580+
<attribute type="shared">1</attribute>
581+
<depends>
582+
<field id="paylater_cartpage_display">1</field>
583+
<field id="paylater_cartpage_stylelayout">text</field>
584+
</depends>
585+
</field>
586+
<field id="paylater_cartpage_textsize" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="70">
587+
<label>Text Size</label>
588+
<config_path>payment/paypal_paylater/cartpage_textsize</config_path>
589+
<source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextSize</source_model>
590+
<attribute type="shared">1</attribute>
591+
<depends>
592+
<field id="paylater_cartpage_display">1</field>
593+
<field id="paylater_cartpage_stylelayout">text</field>
594+
</depends>
595+
</field>
596+
<field id="paylater_cartpage_ratio" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="80">
597+
<label>Ratio</label>
598+
<config_path>payment/paypal_paylater/cartpage_ratio</config_path>
599+
<source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Ratio</source_model>
600+
<attribute type="shared">1</attribute>
601+
<depends>
602+
<field id="paylater_cartpage_display">1</field>
603+
<field id="paylater_cartpage_stylelayout">flex</field>
604+
</depends>
605+
</field>
606+
<field id="paylater_cartpage_color" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="90">
607+
<label>Color</label>
608+
<config_path>payment/paypal_paylater/cartpage_color</config_path>
609+
<source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Color</source_model>
610+
<attribute type="shared">1</attribute>
611+
<depends>
612+
<field id="paylater_cartpage_display">1</field>
613+
<field id="paylater_cartpage_stylelayout">flex</field>
614+
</depends>
615+
</field>
616+
</group>
617+
<group id="settings_paylater_checkout_payment" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
527618
<label>Checkout Payment Step</label>
528619
<depends>
529620
<field id="paylater_enabled">1</field>

‎app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,22 @@
252252
<field id="paylater_productpage_ratio" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_productpage/paylater_productpage_ratio"/>
253253
<field id="paylater_productpage_color" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_productpage/paylater_productpage_color"/>
254254
</group>
255-
<group id="advanced_settings_paylater_checkout_payment" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
255+
<group id="advanced_settings_paylater_cartpage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
256+
<label>Checkout Cart Page</label>
257+
<depends>
258+
<field id="paylater_enabled">1</field>
259+
</depends>
260+
<field id="paylater_cartpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_display"/>
261+
<field id="paylater_cartpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_position"/>
262+
<field id="paylater_cartpage_stylelayout" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_stylelayout"/>
263+
<field id="paylater_cartpage_logotype" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_logotype"/>
264+
<field id="paylater_cartpage_logoposition" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_logoposition"/>
265+
<field id="paylater_cartpage_textcolor" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_textcolor"/>
266+
<field id="paylater_cartpage_textsize" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_textsize"/>
267+
<field id="paylater_cartpage_ratio" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_ratio"/>
268+
<field id="paylater_cartpage_color" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_color"/>
269+
</group>
270+
<group id="advanced_settings_paylater_checkout_payment" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
256271
<label>Checkout Payment Step</label>
257272
<depends>
258273
<field id="paylater_enabled">1</field>

‎app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,22 @@
261261
<field id="paylater_productpage_ratio" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_productpage/paylater_productpage_ratio"/>
262262
<field id="paylater_productpage_color" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_productpage/paylater_productpage_color"/>
263263
</group>
264-
<group id="payflow_link_settings_paylater_checkout_payment" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
264+
<group id="payflow_link_settings_paylater_cartpage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
265+
<label>Checkout Cart Page</label>
266+
<depends>
267+
<field id="paylater_enabled">1</field>
268+
</depends>
269+
<field id="paylater_cartpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_display"/>
270+
<field id="paylater_cartpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_position"/>
271+
<field id="paylater_cartpage_stylelayout" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_stylelayout"/>
272+
<field id="paylater_cartpage_logotype" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_logotype"/>
273+
<field id="paylater_cartpage_logoposition" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_logoposition"/>
274+
<field id="paylater_cartpage_textcolor" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_textcolor"/>
275+
<field id="paylater_cartpage_textsize" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_textsize"/>
276+
<field id="paylater_cartpage_ratio" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_ratio"/>
277+
<field id="paylater_cartpage_color" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_color"/>
278+
</group>
279+
<group id="payflow_link_settings_paylater_checkout_payment" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
265280
<label>Checkout Payment Step</label>
266281
<depends>
267282
<field id="paylater_enabled">1</field>

‎app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,22 @@
189189
<field id="paylater_productpage_ratio" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_productpage/paylater_productpage_ratio"/>
190190
<field id="paylater_productpage_color" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_productpage/paylater_productpage_color"/>
191191
</group>
192-
<group id="pphs_settings_paylater_checkout_payment" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
192+
<group id="pphs_settings_paylater_cartpage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
193+
<label>Checkout Cart Page</label>
194+
<depends>
195+
<field id="paylater_enabled">1</field>
196+
</depends>
197+
<field id="paylater_cartpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_display"/>
198+
<field id="paylater_cartpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_position"/>
199+
<field id="paylater_cartpage_stylelayout" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_stylelayout"/>
200+
<field id="paylater_cartpage_logotype" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_logotype"/>
201+
<field id="paylater_cartpage_logoposition" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_logoposition"/>
202+
<field id="paylater_cartpage_textcolor" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_textcolor"/>
203+
<field id="paylater_cartpage_textsize" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_textsize"/>
204+
<field id="paylater_cartpage_ratio" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_ratio"/>
205+
<field id="paylater_cartpage_color" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_color"/>
206+
</group>
207+
<group id="pphs_settings_paylater_checkout_payment" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
193208
<label>Checkout Payment Step</label>
194209
<depends>
195210
<field id="paylater_enabled">1</field>

0 commit comments

Comments
 (0)