woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-08-31 04:58:28 +08:00
Code Issues Projects Packages Wiki Activity Actions 18

Add soft descriptor to PurchaseUnitFactory PCP-1709

Browse source
This commit is contained in:
carmenmaymo 2023-05-30 15:11:13 +02:00
parent 71f669070d
commit f812d043af
No known key found for this signature in database
GPG key ID: 6023F686B0F3102E
3 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/ppcp-api-client/services.php
View file

@ -298,6 +298,7 @@ return array(
$shipping_factory = $container->get( 'api.factory.shipping' ); $shipping_factory = $container->get( 'api.factory.shipping' );
$payments_factory = $container->get( 'api.factory.payments' ); $payments_factory = $container->get( 'api.factory.payments' );
$prefix = $container->get( 'api.prefix' ); $prefix = $container->get( 'api.prefix' );
$soft_descriptor = $container->get( 'wcgateway.soft-descriptor' );
return new PurchaseUnitFactory( return new PurchaseUnitFactory(
$amount_factory, $amount_factory,
@ -306,7 +307,8 @@ return array(
$item_factory, $item_factory,
$shipping_factory, $shipping_factory,
$payments_factory, $payments_factory,
$prefix $prefix,
$soft_descriptor
); );
}, },
'api.factory.patch-collection-factory' => static function ( ContainerInterface $container ): PatchCollectionFactory { 'api.factory.patch-collection-factory' => static function ( ContainerInterface $container ): PatchCollectionFactory {

18
modules/ppcp-api-client/src/Factory/PurchaseUnitFactory.php
View file

@ -68,6 +68,13 @@ class PurchaseUnitFactory {
*/ */
private $prefix; private $prefix;
/**
* The Soft Descriptor.
*
* @var string
*/
private $soft_descriptor;
/** /**
* PurchaseUnitFactory constructor. * PurchaseUnitFactory constructor.
* *
@ -78,6 +85,7 @@ class PurchaseUnitFactory {
* @param ShippingFactory $shipping_factory The shipping factory. * @param ShippingFactory $shipping_factory The shipping factory.
* @param PaymentsFactory $payments_factory The payments factory. * @param PaymentsFactory $payments_factory The payments factory.
* @param string $prefix The prefix. * @param string $prefix The prefix.
* @param string $soft_descriptor The soft descriptor.
*/ */
public function __construct( public function __construct(
AmountFactory $amount_factory, AmountFactory $amount_factory,
@ -86,7 +94,8 @@ class PurchaseUnitFactory {
ItemFactory $item_factory, ItemFactory $item_factory,
ShippingFactory $shipping_factory, ShippingFactory $shipping_factory,
PaymentsFactory $payments_factory, PaymentsFactory $payments_factory,
string $prefix = 'WC-' string $prefix = 'WC-',
string $soft_descriptor = ''
) { ) {
$this->amount_factory = $amount_factory; $this->amount_factory = $amount_factory;
@ -96,6 +105,7 @@ class PurchaseUnitFactory {
$this->shipping_factory = $shipping_factory; $this->shipping_factory = $shipping_factory;
$this->payments_factory = $payments_factory; $this->payments_factory = $payments_factory;
$this->prefix = $prefix; $this->prefix = $prefix;
$this->soft_descriptor = $soft_descriptor;
} }
/** /**
@ -126,7 +136,7 @@ class PurchaseUnitFactory {
$payee = $this->payee_repository->payee(); $payee = $this->payee_repository->payee();
$custom_id = (string) $order->get_id(); $custom_id = (string) $order->get_id();
$invoice_id = $this->prefix . $order->get_order_number(); $invoice_id = $this->prefix . $order->get_order_number();
$soft_descriptor = ''; $soft_descriptor = $this->soft_descriptor;
$purchase_unit = new PurchaseUnit( $purchase_unit = new PurchaseUnit(
$amount, $amount,
@ -189,7 +199,7 @@ class PurchaseUnitFactory {
$custom_id = ''; $custom_id = '';
$invoice_id = ''; $invoice_id = '';
$soft_descriptor = ''; $soft_descriptor = $this->soft_descriptor;
$purchase_unit = new PurchaseUnit( $purchase_unit = new PurchaseUnit(
$amount, $amount,
$items, $items,
@ -224,7 +234,7 @@ class PurchaseUnitFactory {
$description = ( isset( $data->description ) ) ? $data->description : ''; $description = ( isset( $data->description ) ) ? $data->description : '';
$custom_id = ( isset( $data->custom_id ) ) ? $data->custom_id : ''; $custom_id = ( isset( $data->custom_id ) ) ? $data->custom_id : '';
$invoice_id = ( isset( $data->invoice_id ) ) ? $data->invoice_id : ''; $invoice_id = ( isset( $data->invoice_id ) ) ? $data->invoice_id : '';
$soft_descriptor = ( isset( $data->soft_descriptor ) ) ? $data->soft_descriptor : ''; $soft_descriptor = ( isset( $data->soft_descriptor ) ) ? $data->soft_descriptor : $this->soft_descriptor;
$items = array(); $items = array();
if ( isset( $data->items ) && is_array( $data->items ) ) { if ( isset( $data->items ) && is_array( $data->items ) ) {
$items = array_map( $items = array_map(

4
modules/ppcp-wc-gateway/services.php
View file

@ -955,6 +955,10 @@ return array(
return 'https://www.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=%s'; return 'https://www.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=%s';
}, },
'wcgateway.soft-descriptor' => static function ( ContainerInterface $container ): string {
return 'soft descriptor test';
},
'wcgateway.transaction-url-provider' => static function ( ContainerInterface $container ): TransactionUrlProvider { 'wcgateway.transaction-url-provider' => static function ( ContainerInterface $container ): TransactionUrlProvider {
$sandbox_url_base = $container->get( 'wcgateway.transaction-url-sandbox' ); $sandbox_url_base = $container->get( 'wcgateway.transaction-url-sandbox' );
$live_url_base = $container->get( 'wcgateway.transaction-url-live' ); $live_url_base = $container->get( 'wcgateway.transaction-url-live' );