', $pieces ); - - $source = $this->get_source(); - - $text = apply_filters( 'pronamic_payment_source_text_' . $source, $text, $this ); - $text = apply_filters( 'pronamic_payment_source_text', $text, $this ); - - return $text; - } - /** * Get the payment description. * @@ -366,7 +341,7 @@ public function get_transaction_id() { /** * Get total amount. * - * @return TaxedMoney + * @return Money */ public function get_total_amount() { return $this->total_amount; @@ -375,10 +350,10 @@ public function get_total_amount() { /** * Set total amount. * - * @param TaxedMoney $total_amount Total amount. + * @param Money $total_amount Total amount. * @return void */ - public function set_total_amount( TaxedMoney $total_amount ) { + public function set_total_amount( Money $total_amount ) { $this->total_amount = $total_amount; } @@ -576,7 +551,15 @@ public function set_expiry_date( $expiry_date ) { public function get_return_redirect_url() { $url = home_url( '/' ); - $url = apply_filters( 'pronamic_payment_redirect_url', $url, $this ); + $payment = $this; + + /** + * Filters the payment return redirect URL. + * + * @param string $text Redirect URL. + * @param Payment $payment Payment. + */ + $url = apply_filters( 'pronamic_payment_redirect_url', $url, $payment ); return $url; } @@ -613,16 +596,75 @@ public function get_edit_payment_url() { return $url; } + /** + * Get the source text of this payment. + * + * @return string + */ + public function get_source_text() { + $pieces = array( + $this->get_source(), + $this->get_source_id(), + ); + + $pieces = array_filter( $pieces ); + + $text = implode( '
', $pieces ); + + $source = $this->get_source(); + + $payment = $this; + + if ( null !== $source ) { + /** + * Filters the payment source text by plugin integration source. + * + * @param string $text Source text. + * @param Payment $payment Payment. + */ + $text = apply_filters( 'pronamic_payment_source_text_' . $source, $text, $payment ); + } + + /** + * Filters the payment source text. + * + * @param string $text Source text. + * @param Payment $payment Payment. + */ + $text = apply_filters( 'pronamic_payment_source_text', $text, $payment ); + + return $text; + } + /** * Get source description. * * @return string|null */ public function get_source_description() { - $description = $this->source; + $payment = $this; + + $source = $payment->get_source(); - $description = apply_filters( 'pronamic_payment_source_description', $description, $this ); - $description = apply_filters( 'pronamic_payment_source_description_' . $this->source, $description, $this ); + $description = $source; + + /** + * Filters the payment source description. + * + * @param string $description Source description. + * @param Payment $payment Payment. + */ + $description = apply_filters( 'pronamic_payment_source_description', $description, $payment ); + + if ( null !== $source ) { + /** + * Filters the payment source description by plugin integration source. + * + * @param string $description Source description. + * @param Payment $payment Payment. + */ + $description = apply_filters( 'pronamic_payment_source_description_' . $source, $description, $payment ); + } return $description; } @@ -635,8 +677,27 @@ public function get_source_description() { public function get_source_link() { $url = null; - $url = apply_filters( 'pronamic_payment_source_url', $url, $this ); - $url = apply_filters( 'pronamic_payment_source_url_' . $this->source, $url, $this ); + $payment = $this; + + $source = $payment->get_source(); + + /** + * Filters the payment source URL. + * + * @param null|string $url Source URL. + * @param Payment $payment Payment. + */ + $url = apply_filters( 'pronamic_payment_source_url', $url, $payment ); + + if ( null !== $source ) { + /** + * Filters the payment source URL by plugin integration source. + * + * @param null|string $url Source URL. + * @param Payment $payment Payment. + */ + $url = apply_filters( 'pronamic_payment_source_url_' . $source, $url, $payment ); + } return $url; } @@ -649,7 +710,15 @@ public function get_source_link() { public function get_provider_link() { $url = null; - $url = apply_filters( 'pronamic_payment_provider_url', $url, $this ); + $payment = $this; + + /** + * Filters the payment provider URL. + * + * @param null|string $url Provider URL. + * @param Payment $payment Payment. + */ + $url = apply_filters( 'pronamic_payment_provider_url', $url, $payment ); if ( null === $this->id ) { return $url; @@ -663,12 +732,16 @@ public function get_provider_link() { $gateway_id = get_post_meta( intval( $config_id ), '_pronamic_gateway_id', true ); - if ( empty( $gateway_id ) ) { - return $url; + if ( ! empty( $gateway_id ) ) { + /** + * Filters the payment provider URL by gateway identifier. + * + * @param null|string $url Provider URL. + * @param Payment $payment Payment. + */ + $url = apply_filters( 'pronamic_payment_provider_url_' . $gateway_id, $url, $payment ); } - $url = apply_filters( 'pronamic_payment_provider_url_' . $gateway_id, $url, $this ); - return $url; } @@ -836,7 +909,7 @@ public static function from_json( $json, $payment = null ) { PaymentInfoHelper::from_json( $json, $payment ); if ( isset( $json->total_amount ) ) { - $payment->set_total_amount( TaxedMoneyJsonTransformer::from_json( $json->total_amount ) ); + $payment->set_total_amount( MoneyJsonTransformer::from_json( $json->total_amount ) ); } if ( isset( $json->refunded_amount ) ) { @@ -874,6 +947,10 @@ public static function from_json( $json, $payment = null ) { $payment->set_origin_id( $json->origin_id ); } + if ( isset( $json->transaction_id ) ) { + $payment->set_transaction_id( $json->transaction_id ); + } + return $payment; } @@ -898,14 +975,14 @@ public function get_json() { $total_amount = $this->get_total_amount(); if ( null !== $total_amount ) { - $properties['total_amount'] = TaxedMoneyJsonTransformer::to_json( $total_amount ); + $properties['total_amount'] = $total_amount->jsonSerialize(); } // Refunded amount. $refunded_amount = $this->get_refunded_amount(); if ( null !== $refunded_amount ) { - $properties['refunded_amount'] = MoneyJsonTransformer::to_json( $refunded_amount ); + $properties['refunded_amount'] = $refunded_amount->jsonSerialize(); } // Periods. @@ -941,6 +1018,13 @@ public function get_json() { $properties['origin_id'] = $origin_id; } + // Transaction ID. + $transaction_id = $this->get_transaction_id(); + + if ( null !== $transaction_id ) { + $properties['transaction_id'] = $transaction_id; + } + $object = (object) $properties; return $object; diff --git a/src/Payments/PaymentInfoHelper.php b/src/Payments/PaymentInfoHelper.php index bf60f5d2..569a2cb0 100644 --- a/src/Payments/PaymentInfoHelper.php +++ b/src/Payments/PaymentInfoHelper.php @@ -16,7 +16,6 @@ use Pronamic\WordPress\Pay\Address; use Pronamic\WordPress\Pay\Customer; use Pronamic\WordPress\Pay\MoneyJsonTransformer; -use Pronamic\WordPress\Pay\TaxedMoneyJsonTransformer; /** * Payment info helper @@ -48,7 +47,7 @@ public static function to_json( PaymentInfo $payment_info ) { $shipping_amount = $payment_info->get_shipping_amount(); if ( null !== $shipping_amount ) { - $object->shipping_amount = MoneyJsonTransformer::to_json( $shipping_amount ); + $object->shipping_amount = $shipping_amount->jsonSerialize(); } $customer = $payment_info->get_customer(); diff --git a/src/Payments/PaymentLine.php b/src/Payments/PaymentLine.php index 2070f462..24f06390 100644 --- a/src/Payments/PaymentLine.php +++ b/src/Payments/PaymentLine.php @@ -14,7 +14,6 @@ use Pronamic\WordPress\Money\Money; use Pronamic\WordPress\Money\TaxedMoney; use Pronamic\WordPress\Pay\MoneyJsonTransformer; -use Pronamic\WordPress\Pay\TaxedMoneyJsonTransformer; /** * Payment line. @@ -71,7 +70,7 @@ class PaymentLine { /** * The unit price of this payment line. * - * @var TaxedMoney|null + * @var Money|null */ private $unit_price; @@ -85,7 +84,7 @@ class PaymentLine { /** * Total amount of this payment line. * - * @var TaxedMoney + * @var Money */ private $total_amount; @@ -121,7 +120,7 @@ class PaymentLine { * Payment line constructor. */ public function __construct() { - $this->set_total_amount( new TaxedMoney() ); + $this->set_total_amount( new Money() ); } /** @@ -241,7 +240,7 @@ public function set_quantity( $quantity ) { /** * Get unit price. * - * @return TaxedMoney|null + * @return Money|null */ public function get_unit_price() { return $this->unit_price; @@ -250,10 +249,10 @@ public function get_unit_price() { /** * Set unit price. * - * @param TaxedMoney|null $price Unit price. + * @param Money|null $price Unit price. * @return void */ - public function set_unit_price( TaxedMoney $price = null ) { + public function set_unit_price( Money $price = null ) { $this->unit_price = ( null === $price ? null : $price ); } @@ -282,7 +281,11 @@ public function set_discount_amount( Money $discount_amount = null ) { * @return Money|null */ public function get_tax_amount() { - $tax_value = $this->get_total_amount()->get_tax_value(); + if ( ! $this->total_amount instanceof TaxedMoney ) { + return null; + } + + $tax_value = $this->total_amount->get_tax_value(); if ( null === $tax_value ) { return null; @@ -297,7 +300,7 @@ public function get_tax_amount() { /** * Get total amount. * - * @return TaxedMoney + * @return Money */ public function get_total_amount() { return $this->total_amount; @@ -306,10 +309,10 @@ public function get_total_amount() { /** * Set total amount. * - * @param TaxedMoney $total_amount Total amount. + * @param Money $total_amount Total amount. * @return void */ - public function set_total_amount( TaxedMoney $total_amount ) { + public function set_total_amount( Money $total_amount ) { $this->total_amount = $total_amount; } @@ -428,7 +431,7 @@ public static function from_json( $json ) { } if ( isset( $json->unit_price ) ) { - $line->set_unit_price( TaxedMoneyJsonTransformer::from_json( $json->unit_price ) ); + $line->set_unit_price( MoneyJsonTransformer::from_json( $json->unit_price ) ); } if ( isset( $json->discount_amount ) ) { @@ -436,7 +439,7 @@ public static function from_json( $json ) { } if ( isset( $json->total_amount ) ) { - $line->set_total_amount( TaxedMoneyJsonTransformer::from_json( $json->total_amount ) ); + $line->set_total_amount( MoneyJsonTransformer::from_json( $json->total_amount ) ); } if ( property_exists( $json, 'product_url' ) ) { @@ -467,9 +470,9 @@ public function get_json() { 'name' => $this->get_name(), 'description' => $this->get_description(), 'quantity' => $this->get_quantity(), - 'unit_price' => TaxedMoneyJsonTransformer::to_json( $this->get_unit_price() ), - 'discount_amount' => MoneyJsonTransformer::to_json( $this->get_discount_amount() ), - 'total_amount' => TaxedMoneyJsonTransformer::to_json( $this->get_total_amount() ), + 'unit_price' => ( null === $this->unit_price ) ? null : $this->unit_price->jsonSerialize(), + 'discount_amount' => ( null === $this->discount_amount ) ? null : $this->discount_amount->jsonSerialize(), + 'total_amount' => $this->total_amount->jsonSerialize(), 'product_url' => $this->get_product_url(), 'image_url' => $this->get_image_url(), 'product_category' => $this->get_product_category(), diff --git a/src/Payments/PaymentLines.php b/src/Payments/PaymentLines.php index 57ed360e..ffbb7b2b 100644 --- a/src/Payments/PaymentLines.php +++ b/src/Payments/PaymentLines.php @@ -103,10 +103,12 @@ public function get_amount() { $total = $total->add( $line_total ); // Tax. - $line_tax = $line_total->get_tax_amount(); + if ( $line_total instanceof TaxedMoney ) { + $line_tax = $line_total->get_tax_amount(); - if ( null !== $line_tax ) { - $tax = $tax->add( $line_tax ); + if ( null !== $line_tax ) { + $tax = $tax->add( $line_tax ); + } } // Currency. diff --git a/src/Payments/PaymentsDataStoreCPT.php b/src/Payments/PaymentsDataStoreCPT.php index 7ae0eb0e..26025e57 100644 --- a/src/Payments/PaymentsDataStoreCPT.php +++ b/src/Payments/PaymentsDataStoreCPT.php @@ -12,6 +12,7 @@ use Pronamic\WordPress\DateTime\DateTime; use Pronamic\WordPress\DateTime\DateTimeZone; +use Pronamic\WordPress\Money\Money; use Pronamic\WordPress\Money\TaxedMoney; use Pronamic\WordPress\Pay\Customer; @@ -237,6 +238,11 @@ public function save_post_meta( $post_id, $post, $update ) { $this->update_post_meta( $payment ); + /** + * Payment updated. + * + * @param Payment $payment Payment. + */ do_action( 'pronamic_pay_update_payment', $payment ); } @@ -279,6 +285,11 @@ public function create( Payment $payment ) { return false; } + /** + * New payment created. + * + * @param Payment $payment Payment. + */ do_action( 'pronamic_pay_new_payment', $payment ); return true; @@ -734,7 +745,6 @@ protected function read_post_meta( $payment ) { $payment->method = $this->get_meta_string( $id, 'method' ); $payment->issuer = $this->get_meta_string( $id, 'issuer' ); $payment->order_id = $this->get_meta_string( $id, 'order_id' ); - $payment->transaction_id = $this->get_meta_string( $id, 'transaction_id' ); $payment->entrance_code = $this->get_meta_string( $id, 'entrance_code' ); $payment->action_url = $this->get_meta_string( $id, 'action_url' ); $payment->source = $this->get_meta_string( $id, 'source' ); @@ -754,6 +764,11 @@ protected function read_post_meta( $payment ) { // Legacy. parent::read_post_meta( $payment ); + // Transaction ID. + if ( empty( $payment->transaction_id ) ) { + $payment->transaction_id = $this->get_meta_string( $id, 'transaction_id' ); + } + // Amount. $amount = $payment->get_meta( 'amount' ); @@ -761,7 +776,7 @@ protected function read_post_meta( $payment ) { if ( empty( $amount_value ) && ! empty( $amount ) ) { $payment->set_total_amount( - new TaxedMoney( + new Money( $amount, $payment->get_meta( 'currency' ) ) @@ -796,7 +811,7 @@ protected function get_update_meta( $payment, $meta = array() ) { 'key' => $payment->key, 'order_id' => $payment->order_id, 'currency' => $payment->get_total_amount()->get_currency()->get_alphabetic_code(), - 'amount' => $payment->get_total_amount()->format(), + 'amount' => $payment->get_total_amount()->get_number()->get_value(), 'method' => $payment->method, 'issuer' => $payment->issuer, 'expiration_period' => null, @@ -870,19 +885,140 @@ public function update_meta_status( $payment ) { $this->update_meta( $id, 'status', $payment->status ); if ( $previous_status !== $payment->status ) { - $old = $previous_status; - $old = empty( $old ) ? 'unknown' : $old; - $old = strtolower( $old ); - - $new = $payment->status; - $new = empty( $new ) ? 'unknown' : $new; - $new = strtolower( $new ); + if ( empty( $previous_status ) ) { + $previous_status = null; + } $can_redirect = false; - do_action( 'pronamic_payment_status_update_' . $payment->source . '_' . $old . '_to_' . $new, $payment, $can_redirect, $previous_status, $payment->status ); - do_action( 'pronamic_payment_status_update_' . $payment->source, $payment, $can_redirect, $previous_status, $payment->status ); - do_action( 'pronamic_payment_status_update', $payment, $can_redirect, $previous_status, $payment->status ); + $source = $payment->source; + + $updated_status = $payment->status; + + $old_status = empty( $previous_status ) ? 'unknown' : strtolower( $previous_status ); + + $new_status = empty( $updated_status ) ? 'unknown' : strtolower( $updated_status ); + + /** + * Payment status updated for plugin integration source from old to new status. + * + * **Source** + * + * Plugin | Source + * ------ | ------ + * Charitable | `charitable` + * Contact Form 7 | `contact-form-7` + * Event Espresso | `eventespresso` + * Event Espresso (legacy) | `event-espresso` + * Formidable Forms | `formidable-forms` + * Give | `give` + * Gravity Forms | `gravityformsideal` + * MemberPress | `memberpress` + * Ninja Forms | `ninja-forms` + * s2Member | `s2member` + * WooCommerce | `woocommerce` + * WP eCommerce | `wp-e-commerce` + * + * **Action status** + * + * Status | Value + * ------ | ----- + * (empty) | `unknown` + * Cancelled | `cancelled` + * Expired | `expired` + * Failure | `failure` + * Open | `open` + * Reserved | `reserved` + * Success | `success` + * + * **Payment status** + * + * Status | Value + * ------ | ----- + * Cancelled | `Cancelled` + * Expired | `Expired` + * Failure | `Failure` + * Open | `Open` + * Reserved | `Reserved` + * Success | `Success` + * + * @param Payment $payment Payment. + * @param bool $can_redirect Flag to indicate if redirect is allowed after the payment update. + * @param null|string $previous_status Previous payment status. + * @param string $updated_status Updated payment status. + */ + do_action( 'pronamic_payment_status_update_' . $source . '_' . $old_status . '_to_' . $new_status, $payment, $can_redirect, $previous_status, $updated_status ); + + /** + * Payment status updated for plugin integration source. + * + * **Source** + * + * Plugin | Source + * ------ | ------ + * Charitable | `charitable` + * Contact Form 7 | `contact-form-7` + * Event Espresso | `eventespresso` + * Event Espresso (legacy) | `event-espresso` + * Formidable Forms | `formidable-forms` + * Give | `give` + * Gravity Forms | `gravityformsideal` + * MemberPress | `memberpress` + * Ninja Forms | `ninja-forms` + * s2Member | `s2member` + * WooCommerce | `woocommerce` + * WP eCommerce | `wp-e-commerce` + * + * **Action status** + * + * Status | Value + * ------ | ----- + * (empty) | `unknown` + * Cancelled | `cancelled` + * Expired | `expired` + * Failure | `failure` + * Open | `open` + * Reserved | `reserved` + * Success | `success` + * + * **Payment status** + * + * Status | Value + * ------ | ----- + * Cancelled | `Cancelled` + * Expired | `Expired` + * Failure | `Failure` + * Open | `Open` + * Reserved | `Reserved` + * Success | `Success` + * + * @param Payment $payment Payment. + * @param bool $can_redirect Flag to indicate if redirect is allowed after the payment update. + * @param null|string $previous_status Previous payment status. + * @param string $updated_status Updated payment status. + */ + do_action( 'pronamic_payment_status_update_' . $source, $payment, $can_redirect, $previous_status, $updated_status ); + + /** + * Payment status updated. + * + * **Payment status** + * + * Status | Value + * ------ | ----- + * Cancelled | `Cancelled` + * Expired | `Expired` + * Failure | `Failure` + * Open | `Open` + * Reserved | `Reserved` + * Success | `Success` + * + * @param Payment $payment Payment. + * @param bool $can_redirect Flag to indicate if redirect is allowed after the payment update. + * @param null|string $previous_status Previous payment status. + * @param string $updated_status Updated payment status. + */ + do_action( 'pronamic_payment_status_update', $payment, $can_redirect, $previous_status, $updated_status ); } } } diff --git a/src/Plugin.php b/src/Plugin.php index 7945fc23..743d225e 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -431,7 +431,15 @@ public function handle_returns() { } // Check if we should redirect. - $should_redirect = apply_filters( 'pronamic_pay_return_should_redirect', true, $payment ); + $should_redirect = true; + + /** + * Filter whether or not to allow redirects on payment return. + * + * @param bool $should_redirect Flag to indicate if redirect is allowed on handling payment return. + * @param Payment $payment Payment. + */ + $should_redirect = apply_filters( 'pronamic_pay_return_should_redirect', $should_redirect, $payment ); try { self::update_payment( $payment, $should_redirect ); @@ -586,8 +594,14 @@ public function plugins_loaded() { $this->admin = new Admin\AdminModule( $this ); } - // Gateway Integrations. - $gateways = apply_filters( 'pronamic_pay_gateways', array() ); + $gateways = array(); + + /** + * Filters the gateway integrations. + * + * @param AbstractGatewayIntegration[] $gateways Gateway integrations. + */ + $gateways = apply_filters( 'pronamic_pay_gateways', $gateways ); $this->gateway_integrations = new GatewayIntegrations( $gateways ); @@ -595,8 +609,14 @@ public function plugins_loaded() { $integration->setup(); } - // Plugin Integrations. - $this->plugin_integrations = apply_filters( 'pronamic_pay_plugin_integrations', array() ); + $plugin_integrations = array(); + + /** + * Filters the plugin integrations. + * + * @param AbstractPluginIntegration[] $plugin_integrations Plugin integrations. + */ + $this->plugin_integrations = apply_filters( 'pronamic_pay_plugin_integrations', $plugin_integrations ); foreach ( $this->plugin_integrations as $integration ) { $integration->setup(); @@ -716,6 +736,10 @@ public static function get_config_select_options( $payment_method = null ) { $options = array( __( '— Select Configuration —', 'pronamic_ideal' ) ); foreach ( $query->posts as $post ) { + if ( ! \is_object( $post ) ) { + continue; + } + $id = $post->ID; $options[ $id ] = sprintf( @@ -972,13 +996,15 @@ public static function start_payment( Payment $payment, $gateway = null ) { // Complement payment. self::complement_payment( $payment ); + $config_id = $payment->get_config_id(); + /** * Filters the payment gateway configuration ID. * - * @param int $configuration_id Gateway configuration ID. - * @param Payment $payment The payment resource data. + * @param null|int $config_id Gateway configuration ID. + * @param Payment $payment Payment. */ - $config_id = \apply_filters( 'pronamic_payment_gateway_configuration_id', $payment->get_config_id(), $payment ); + $config_id = \apply_filters( 'pronamic_payment_gateway_configuration_id', $config_id, $payment ); $payment->set_config_id( $config_id ); @@ -1174,6 +1200,12 @@ public function get_pages() { public function payment_redirect_url( $url, Payment $payment ) { $source = $payment->get_source(); + /** + * Filters the payment redirect URL by plugin integration source. + * + * @param null|string $url Redirect URL. + * @param Payment $payment Payment. + */ $url = \apply_filters( 'pronamic_payment_redirect_url_' . $source, $url, $payment ); return $url; diff --git a/src/PrivacyManager.php b/src/PrivacyManager.php index eb241e9c..c0205843 100644 --- a/src/PrivacyManager.php +++ b/src/PrivacyManager.php @@ -49,7 +49,14 @@ public function __construct() { * @return array */ public function register_exporters( $exporters ) { - do_action( 'pronamic_pay_privacy_register_exporters', $this ); + $privacy_manager = $this; + + /** + * Register privacy exporters. + * + * @param PrivacyManager $privacy_manager Privacy manager. + */ + do_action( 'pronamic_pay_privacy_register_exporters', $privacy_manager ); foreach ( $this->exporters as $id => $exporter ) { $exporters[ $id ] = $exporter; @@ -65,7 +72,14 @@ public function register_exporters( $exporters ) { * @return array */ public function register_erasers( $erasers ) { - do_action( 'pronamic_pay_privacy_register_erasers', $this ); + $privacy_manager = $this; + + /** + * Register privacy erasers. + * + * @param PrivacyManager $privacy_manager Privacy manager. + */ + do_action( 'pronamic_pay_privacy_register_erasers', $privacy_manager ); foreach ( $this->erasers as $id => $eraser ) { $erasers[ $id ] = $eraser; diff --git a/src/Subscriptions/Subscription.php b/src/Subscriptions/Subscription.php index ec065b9c..ff991327 100644 --- a/src/Subscriptions/Subscription.php +++ b/src/Subscriptions/Subscription.php @@ -360,12 +360,29 @@ public function get_source_text() { $pieces = array_filter( $pieces ); - $default_text = implode( '
', $pieces ); + $text = implode( '
', $pieces ); $source = $this->get_source(); - $text = apply_filters( 'pronamic_subscription_source_text_' . $source, $default_text, $this ); - $text = apply_filters( 'pronamic_subscription_source_text', $text, $this ); + $subscription = $this; + + if ( null !== $source ) { + /** + * Filters the subscription source text by plugin integration source. + * + * @param string $text Source text. + * @param Subscription $subscription Subscription. + */ + $text = apply_filters( 'pronamic_subscription_source_text_' . $source, $text, $subscription ); + } + + /** + * Filters the subscription source text. + * + * @param string $text Source text. + * @param Subscription $subscription Subscription. + */ + $text = apply_filters( 'pronamic_subscription_source_text', $text, $subscription ); return $text; } @@ -376,14 +393,31 @@ public function get_source_text() { * @return string */ public function get_source_description() { - $source = $this->get_source(); + $subscription = $this; - $default_text = $this->get_source(); + $source = $subscription->get_source(); - $text = apply_filters( 'pronamic_subscription_source_description_' . $source, $default_text, $this ); - $text = apply_filters( 'pronamic_subscription_source_description', $text, $this ); + $description = $source; - return $text; + if ( null !== $source ) { + /** + * Filters the subscription source description by plugin integration source. + * + * @param string $description Source description. + * @param Subscription $subscription Subscription. + */ + $description = apply_filters( 'pronamic_subscription_source_description_' . $source, $description, $subscription ); + } + + /** + * Filters the subscription source description. + * + * @param string $description Source description. + * @param Subscription $subscription Subscription. + */ + $description = apply_filters( 'pronamic_subscription_source_description', $description, $subscription ); + + return $description; } /** @@ -394,8 +428,27 @@ public function get_source_description() { public function get_source_link() { $url = null; - $url = apply_filters( 'pronamic_subscription_source_url', $url, $this ); - $url = apply_filters( 'pronamic_subscription_source_url_' . $this->source, $url, $this ); + $subscription = $this; + + $source = $subscription->get_source(); + + /** + * Filters the subscription source URL. + * + * @param null|string $url Source URL. + * @param Subscription $subscription Subscription. + */ + $url = apply_filters( 'pronamic_subscription_source_url', $url, $subscription ); + + if ( null !== $source ) { + /** + * Filters the subscription source URL by plugin integration source. + * + * @param null|string $url Source URL. + * @param Subscription $subscription Subscription. + */ + $url = apply_filters( 'pronamic_subscription_source_url_' . $source, $url, $subscription ); + } return $url; } @@ -412,7 +465,7 @@ public function get_cancel_url() { 'key' => $this->get_key(), 'action' => 'cancel', ), - home_url() + home_url( '/' ) ); return $cancel_url; @@ -430,7 +483,7 @@ public function get_renewal_url() { 'key' => $this->get_key(), 'action' => 'renew', ), - home_url() + home_url( '/' ) ); return $renewal_url; @@ -448,7 +501,7 @@ public function get_mandate_selection_url() { 'key' => $this->get_key(), 'action' => 'mandate', ), - home_url() + home_url( '/' ) ); return $url; diff --git a/src/Subscriptions/SubscriptionPeriod.php b/src/Subscriptions/SubscriptionPeriod.php index d32bbb18..ee02e5e4 100644 --- a/src/Subscriptions/SubscriptionPeriod.php +++ b/src/Subscriptions/SubscriptionPeriod.php @@ -11,8 +11,8 @@ namespace Pronamic\WordPress\Pay\Subscriptions; use Pronamic\WordPress\DateTime\DateTime; -use Pronamic\WordPress\Money\TaxedMoney; -use Pronamic\WordPress\Pay\TaxedMoneyJsonTransformer; +use Pronamic\WordPress\Money\Money; +use Pronamic\WordPress\Pay\MoneyJsonTransformer; /** * Subscription Period @@ -46,7 +46,7 @@ class SubscriptionPeriod { /** * The amount to pay for this period. * - * @var TaxedMoney + * @var Money */ private $amount; @@ -56,9 +56,9 @@ class SubscriptionPeriod { * @param SubscriptionPhase $phase Subscription phase. * @param DateTime $start_date Start date. * @param DateTime $end_date End date. - * @param TaxedMoney $amount Taxed amount. + * @param Money $amount Taxed amount. */ - public function __construct( SubscriptionPhase $phase, DateTime $start_date, DateTime $end_date, TaxedMoney $amount ) { + public function __construct( SubscriptionPhase $phase, DateTime $start_date, DateTime $end_date, Money $amount ) { $this->phase = $phase; $this->start_date = $start_date; $this->end_date = $end_date; @@ -105,7 +105,7 @@ public function get_end_date() { /** * Get amount. * - * @return TaxedMoney + * @return Money */ public function get_amount() { return $this->amount; @@ -192,7 +192,7 @@ public static function from_json( $json ) { $start_date = new DateTime( $json->start_date ); $end_date = new DateTime( $json->end_date ); - $amount = TaxedMoneyJsonTransformer::from_json( $json->amount ); + $amount = MoneyJsonTransformer::from_json( $json->amount ); return new self( $phase, $start_date, $end_date, $amount ); } @@ -229,7 +229,7 @@ public function to_json() { ), 'start_date' => $this->start_date->format( \DATE_ATOM ), 'end_date' => $this->end_date->format( \DATE_ATOM ), - 'amount' => TaxedMoneyJsonTransformer::to_json( $this->amount ), + 'amount' => $this->amount->jsonSerialize(), ); return $json; diff --git a/src/Subscriptions/SubscriptionPhase.php b/src/Subscriptions/SubscriptionPhase.php index cbb6b4d5..2dfad7a5 100644 --- a/src/Subscriptions/SubscriptionPhase.php +++ b/src/Subscriptions/SubscriptionPhase.php @@ -12,9 +12,8 @@ use DateTimeImmutable; use Pronamic\WordPress\DateTime\DateTime; -use Pronamic\WordPress\Money\TaxedMoney; +use Pronamic\WordPress\Money\Money; use Pronamic\WordPress\Pay\MoneyJsonTransformer; -use Pronamic\WordPress\Pay\TaxedMoneyJsonTransformer; /** * Subscription Phase @@ -48,7 +47,7 @@ class SubscriptionPhase implements \JsonSerializable { /** * Amount. * - * @var TaxedMoney + * @var Money */ private $amount; @@ -129,10 +128,10 @@ class SubscriptionPhase implements \JsonSerializable { * @param Subscription $subscription Subscription. * @param DateTimeImmutable $start_date Start date. * @param SubscriptionInterval $interval Interval. - * @param TaxedMoney $amount Amount. + * @param Money $amount Amount. * @return void */ - public function __construct( Subscription $subscription, DateTimeImmutable $start_date, SubscriptionInterval $interval, TaxedMoney $amount ) { + public function __construct( Subscription $subscription, DateTimeImmutable $start_date, SubscriptionInterval $interval, Money $amount ) { $this->subscription = $subscription; $this->start_date = $start_date; $this->interval = $interval; @@ -250,7 +249,7 @@ public function set_canceled_at( DateTimeImmutable $canceled_at = null ) { /** * Get amount. * - * @return TaxedMoney + * @return Money */ public function get_amount() { return $this->amount; @@ -259,7 +258,7 @@ public function get_amount() { /** * Set amount. * - * @param TaxedMoney $amount Amount. + * @param Money $amount Amount. * @return void */ public function set_amount( $amount ) { @@ -510,7 +509,7 @@ public function jsonSerialize() { 'sequence_number' => $this->get_sequence_number(), 'start_date' => $this->start_date->format( \DATE_ATOM ), 'interval' => $this->interval->get_specification(), - 'amount' => MoneyJsonTransformer::to_json( $this->amount ), + 'amount' => $this->amount->jsonSerialize(), // Numbers. 'total_periods' => $this->total_periods, 'periods_created' => $this->periods_created, @@ -560,7 +559,7 @@ public static function from_json( $json ) { $json->subscription, new \DateTimeImmutable( $json->start_date ), new SubscriptionInterval( $json->interval ), - TaxedMoneyJsonTransformer::from_json( $json->amount ) + MoneyJsonTransformer::from_json( $json->amount ) ); if ( property_exists( $json, 'total_periods' ) ) { diff --git a/src/Subscriptions/SubscriptionPhasesTrait.php b/src/Subscriptions/SubscriptionPhasesTrait.php index 10ea97bc..0e537a21 100644 --- a/src/Subscriptions/SubscriptionPhasesTrait.php +++ b/src/Subscriptions/SubscriptionPhasesTrait.php @@ -11,7 +11,7 @@ namespace Pronamic\WordPress\Pay\Subscriptions; use Pronamic\WordPress\DateTime\DateTime; -use Pronamic\WordPress\Money\TaxedMoney; +use Pronamic\WordPress\Money\Money; /** * Subscription Phases Trait @@ -61,9 +61,9 @@ public function add_phase( SubscriptionPhase $phase ) { /** * Create new phase for this subscription. * - * @param DateTime $start_date Start date. - * @param string $interval_spec Interval specification. - * @param TaxedMoney $amount Amount. + * @param DateTime $start_date Start date. + * @param string $interval_spec Interval specification. + * @param Money $amount Amount. * @return SubscriptionPhase */ public function new_phase( $start_date, $interval_spec, $amount ) { diff --git a/src/Subscriptions/SubscriptionsDataStoreCPT.php b/src/Subscriptions/SubscriptionsDataStoreCPT.php index b6d1ff25..9e10e222 100644 --- a/src/Subscriptions/SubscriptionsDataStoreCPT.php +++ b/src/Subscriptions/SubscriptionsDataStoreCPT.php @@ -13,11 +13,11 @@ use DatePeriod; use Pronamic\WordPress\DateTime\DateTime; use Pronamic\WordPress\DateTime\DateTimeZone; -use Pronamic\WordPress\Money\TaxedMoney; +use Pronamic\WordPress\Money\Money; use Pronamic\WordPress\Pay\Payments\LegacyPaymentsDataStoreCPT; use Pronamic\WordPress\Pay\Payments\PaymentStatus; use Pronamic\WordPress\Pay\Customer; -use Pronamic\WordPress\Pay\TaxedMoneyJsonTransformer; +use Pronamic\WordPress\Pay\MoneyJsonTransformer; /** * Title: Subscriptions data store CPT @@ -276,6 +276,11 @@ public function create( $subscription ) { $this->update_post_meta( $subscription ); + /** + * New subscription created. + * + * @param Subscription $subscription Subscription. + */ do_action( 'pronamic_pay_new_subscription', $subscription ); return true; @@ -380,13 +385,13 @@ public function read( $subscription ) { // Phases. if ( is_object( $json ) && ! property_exists( $json, 'phases' ) ) { // Amount. - $amount = new TaxedMoney( + $amount = new Money( (string) $this->get_meta( $id, 'amount' ), (string) $this->get_meta_string( $id, 'currency' ) ); if ( \property_exists( $json, 'total_amount' ) ) { - $amount = TaxedMoneyJsonTransformer::from_json( $json->total_amount ); + $amount = MoneyJsonTransformer::from_json( $json->total_amount ); } // Phase. @@ -704,7 +709,7 @@ private function update_post_meta( $subscription ) { if ( null !== $display_phase ) { $this->update_meta( $id, 'currency', $display_phase->get_amount()->get_currency()->get_alphabetic_code() ); - $this->update_meta( $id, 'amount', $display_phase->get_amount()->format() ); + $this->update_meta( $id, 'amount', $display_phase->get_amount()->get_number()->get_value() ); } $this->update_meta_status( $subscription ); @@ -728,19 +733,147 @@ public function update_meta_status( $subscription ) { $this->update_meta( $id, 'status', $subscription->status ); if ( $previous_status !== $subscription->status ) { - $old = $previous_status; - $old = empty( $old ) ? 'unknown' : $old; - $old = strtolower( $old ); - - $new = $subscription->status; - $new = empty( $new ) ? 'unknown' : $new; - $new = strtolower( $new ); + if ( empty( $previous_status ) ) { + $previous_status = null; + } $can_redirect = false; - do_action( 'pronamic_subscription_status_update_' . $subscription->source . '_' . $old . '_to_' . $new, $subscription, $can_redirect, $previous_status, $subscription->status ); - do_action( 'pronamic_subscription_status_update_' . $subscription->source, $subscription, $can_redirect, $previous_status, $subscription->status ); - do_action( 'pronamic_subscription_status_update', $subscription, $can_redirect, $previous_status, $subscription->status ); + $source = $subscription->source; + + $updated_status = $subscription->status; + + $old_status = empty( $previous_status ) ? 'unknown' : strtolower( $previous_status ); + $old_status = \str_replace( ' ', '_', $old_status ); + + $new_status = empty( $updated_status ) ? 'unknown' : strtolower( $updated_status ); + $new_status = \str_replace( ' ', '_', $new_status ); + + /** + * Subscription status updated for plugin integration source from old to new status. + * + * **Source** + * + * Plugin | Source + * ------ | ------ + * Charitable | `charitable` + * Contact Form 7 | `contact-form-7` + * Event Espresso | `eventespresso` + * Event Espresso (legacy) | `event-espresso` + * Formidable Forms | `formidable-forms` + * Give | `give` + * Gravity Forms | `gravityformsideal` + * MemberPress | `memberpress` + * Ninja Forms | `ninja-forms` + * s2Member | `s2member` + * WooCommerce | `woocommerce` + * WP eCommerce | `wp-e-commerce` + * + * **Action status** + * + * Status | Value + * ------ | ----- + * (empty) | `unknown` + * Active | `active` + * Cancelled | `cancelled` + * Completed | `completed` + * Expired | `expired` + * Failure | `failure` + * On Hold | `on_hold` + * Open | `open` + * + * **Subscription status** + * + * Status | Value + * ------ | ----- + * Active | `Active` + * Cancelled | `Cancelled` + * Completed | `Completed` + * Expired | `Expired` + * Failure | `Failure` + * On Hold | `On Hold` + * Open | `Open` + * + * @param Subscription $subscription Subscription. + * @param bool $can_redirect Flag to indicate if redirect is allowed after the subscription update. + * @param null|string $previous_status Previous subscription status. + * @param string $updated_status Updated subscription status. + */ + do_action( 'pronamic_subscription_status_update_' . $source . '_' . $old_status . '_to_' . $new_status, $subscription, $can_redirect, $previous_status, $updated_status ); + + /** + * Subscription status updated for plugin integration source. + * + * **Source** + * + * Plugin | Source + * ------ | ------ + * Charitable | `charitable` + * Contact Form 7 | `contact-form-7` + * Event Espresso | `eventespresso` + * Event Espresso (legacy) | `event-espresso` + * Formidable Forms | `formidable-forms` + * Give | `give` + * Gravity Forms | `gravityformsideal` + * MemberPress | `memberpress` + * Ninja Forms | `ninja-forms` + * s2Member | `s2member` + * WooCommerce | `woocommerce` + * WP eCommerce | `wp-e-commerce` + * + * **Action status** + * + * Status | Value + * ------ | ----- + * (empty) | `unknown` + * Active | `active` + * Cancelled | `cancelled` + * Completed | `completed` + * Expired | `expired` + * Failure | `failure` + * On Hold | `on_hold` + * Open | `open` + * + * **Subscription status** + * + * Status | Value + * ------ | ----- + * Active | `Active` + * Cancelled | `Cancelled` + * Completed | `Completed` + * Expired | `Expired` + * Failure | `Failure` + * On Hold | `On Hold` + * Open | `Open` + * + * @param Subscription $subscription Subscription. + * @param bool $can_redirect Flag to indicate if redirect is allowed after the subscription update. + * @param null|string $previous_status Previous subscription status. + * @param string $updated_status Updated subscription status. + */ + do_action( 'pronamic_subscription_status_update_' . $source, $subscription, $can_redirect, $previous_status, $updated_status ); + + /** + * Subscription status updated. + * + * **Subscription status** + * + * Status | Value + * ------ | ----- + * Active | `Active` + * Cancelled | `Cancelled` + * Completed | `Completed` + * Expired | `Expired` + * Failure | `Failure` + * On Hold | `On Hold` + * Open | `Open` + * + * @param Subscription $subscription Subscription. + * @param bool $can_redirect Flag to indicate if redirect is allowed after the subscription update. + * @param null|string $previous_status Previous subscription status. + * @param string $updated_status Updated subscription status. + */ + do_action( 'pronamic_subscription_status_update', $subscription, $can_redirect, $previous_status, $updated_status ); } } } diff --git a/src/Subscriptions/SubscriptionsModule.php b/src/Subscriptions/SubscriptionsModule.php index 15324251..80e9daf7 100644 --- a/src/Subscriptions/SubscriptionsModule.php +++ b/src/Subscriptions/SubscriptionsModule.php @@ -14,6 +14,7 @@ use Pronamic\WordPress\DateTime\DateTime; use Pronamic\WordPress\DateTime\DateTimeImmutable; use Pronamic\WordPress\DateTime\DateTimeZone; +use Pronamic\WordPress\Money\Money; use Pronamic\WordPress\Money\TaxedMoney; use Pronamic\WordPress\Pay\Core\Gateway; use Pronamic\WordPress\Pay\Core\PaymentMethods; @@ -334,7 +335,7 @@ private function handle_subscription_mandate( Subscription $subscription ) { $amount = 0.01; } - $total_amount = new TaxedMoney( + $total_amount = new Money( $amount, $payment->get_total_amount()->get_currency() ); @@ -1023,6 +1024,28 @@ public function send_subscription_renewal_notices() { // Send renewal notice. $source = $subscription->get_source(); + /** + * Send renewal notice for source. + * + * **Source** + * + * Plugin | Source + * ------ | ------ + * Charitable | `charitable` + * Contact Form 7 | `contact-form-7` + * Event Espresso | `eventespresso` + * Event Espresso (legacy) | `event-espresso` + * Formidable Forms | `formidable-forms` + * Give | `give` + * Gravity Forms | `gravityformsideal` + * MemberPress | `memberpress` + * Ninja Forms | `ninja-forms` + * s2Member | `s2member` + * WooCommerce | `woocommerce` + * WP eCommerce | `wp-e-commerce` + * + * @param Subscription $subscription Subscription. + */ do_action( 'pronamic_subscription_renewal_notice_' . $source, $subscription ); // Update renewal notice sent date meta. @@ -1131,8 +1154,8 @@ public function update_subscription_payments( $cli_test = false ) { if ( ! $gateway->supports( 'recurring' ) ) { $now = new DateTime(); - if ( PaymentStatus::COMPLETED !== $subscription->status && isset( $subscription->expiry_date ) && $subscription->expiry_date <= $now ) { - $subscription->status = PaymentStatus::EXPIRED; + if ( SubscriptionStatus::COMPLETED !== $subscription->status && isset( $subscription->expiry_date ) && $subscription->expiry_date <= $now ) { + $subscription->status = SubscriptionStatus::EXPIRED; $subscription->save(); diff --git a/src/Subscriptions/SubscriptionsPrivacy.php b/src/Subscriptions/SubscriptionsPrivacy.php index 7bb42879..a1cafc9c 100644 --- a/src/Subscriptions/SubscriptionsPrivacy.php +++ b/src/Subscriptions/SubscriptionsPrivacy.php @@ -198,7 +198,7 @@ public function subscriptions_anonymizer( $email_address, $page = 1 ) { $message = __( 'Subscription ID %s anonymized.', 'pronamic_ideal' ); // Anonymize completed and cancelled subscriptions. - if ( isset( $subscription_status ) && in_array( $subscription_status, array( PaymentStatus::COMPLETED, PaymentStatus::CANCELLED ), true ) ) { + if ( isset( $subscription_status ) && in_array( $subscription_status, array( SubscriptionStatus::COMPLETED, SubscriptionStatus::CANCELLED ), true ) ) { // Erase subscription meta. foreach ( $meta_keys as $meta_key => $meta_options ) { $meta_key = $data_store->meta_key_prefix . $meta_key; diff --git a/src/TaxedMoneyJsonTransformer.php b/src/TaxedMoneyJsonTransformer.php deleted file mode 100644 index de0b9f1b..00000000 --- a/src/TaxedMoneyJsonTransformer.php +++ /dev/null @@ -1,97 +0,0 @@ - - * @copyright 2005-2021 Pronamic - * @license GPL-3.0-or-later - * @package Pronamic\WordPress\Pay - */ - -namespace Pronamic\WordPress\Pay; - -use InvalidArgumentException; -use Pronamic\WordPress\Money\TaxedMoney; - -/** - * Taxed money JSON transformer - * - * @author Remco Tolsma - * @version 2.0.8 - * @since 2.0.8 - */ -class TaxedMoneyJsonTransformer { - /** - * Convert taxed money object to JSON. - * - * @param TaxedMoney|null $money Money. - * - * @return null|object - */ - public static function to_json( TaxedMoney $money = null ) { - if ( null === $money ) { - return null; - } - - $object = MoneyJsonTransformer::to_json( $money ); - - if ( null === $object ) { - return null; - } - - $properties = (array) $object; - - if ( null !== $money->get_tax_value() ) { - $properties['tax_value'] = $money->get_tax_value(); - } - - if ( null !== $money->get_tax_percentage() ) { - $properties['tax_percentage'] = $money->get_tax_percentage(); - } - - $object = (object) $properties; - - return $object; - } - - /** - * Convert JSON to taxed money object. - * - * @param mixed $json JSON. - * - * @return TaxedMoney - * - * @throws InvalidArgumentException Throws invalid argument exception when JSON is not an object. - */ - public static function from_json( $json ) { - if ( ! is_object( $json ) ) { - throw new InvalidArgumentException( 'JSON value must be an object.' ); - } - - // Default arguments. - $value = 0; - $currency = null; - $tax_value = null; - $tax_percentage = null; - - if ( property_exists( $json, 'value' ) ) { - $value = $json->value; - } - - if ( property_exists( $json, 'currency' ) ) { - $currency = $json->currency; - } - - if ( property_exists( $json, 'tax_value' ) ) { - $tax_value = $json->tax_value; - } - - if ( property_exists( $json, 'tax_percentage' ) ) { - $tax_percentage = $json->tax_percentage; - } - - $money = new TaxedMoney( $value, $currency, $tax_value, $tax_percentage ); - - return $money; - } -} diff --git a/src/Util.php b/src/Util.php index 09b8efc4..add7afff 100644 --- a/src/Util.php +++ b/src/Util.php @@ -63,16 +63,16 @@ public static function simplexml_load_string( $string ) { * * @param float $price The amount to convert to cents. * - * @deprecated 2.0.9 Use \Pronamic\WordPress\Money\Money::get_cents() instead. + * @deprecated 2.0.9 Use \Pronamic\WordPress\Money\Money::get_minor_units()->to_int() instead. * - * @return float + * @return int */ public static function amount_to_cents( $price ) { - _deprecated_function( __FUNCTION__, '2.0.9', 'Pronamic\WordPress\Money\Money::get_cents()' ); + _deprecated_function( __FUNCTION__, '2.0.9', 'Pronamic\WordPress\Money\Money::get_minor_units()->to_int()' ); $money = new Money( $price ); - return $money->get_cents(); + return $money->get_minor_units()->to_int(); } /** diff --git a/tests/json/money.json b/tests/json/money.json index 596ac56b..eb26a557 100644 --- a/tests/json/money.json +++ b/tests/json/money.json @@ -1,4 +1,4 @@ { - "value": 12.34, + "value": "12.34", "currency": "EUR" } diff --git a/tests/json/payment-line.json b/tests/json/payment-line.json index 729319c2..c7ce4d33 100644 --- a/tests/json/payment-line.json +++ b/tests/json/payment-line.json @@ -1,18 +1,18 @@ { "quantity":2, "unit_price":{ - "value":121, + "value":"121", "currency":"EUR", - "tax_value":21 + "tax_value":"21" }, "discount_amount":{ - "value":21, + "value":"21", "currency":"EUR" }, "total_amount":{ - "value":242, + "value":"242", "currency":"EUR", - "tax_value":42, - "tax_percentage":21 + "tax_value":"42", + "tax_percentage":"21" } } diff --git a/tests/json/payment-lines.json b/tests/json/payment-lines.json index eebf7a86..5b3fe092 100644 --- a/tests/json/payment-lines.json +++ b/tests/json/payment-lines.json @@ -4,7 +4,7 @@ "description":"Lorem ipsum dolor sit amet.", "quantity":50, "total_amount":{ - "value":39.99, + "value":"39.99", "currency":"EUR" } }, @@ -13,19 +13,19 @@ "description":"Lorem ipsum dolor sit amet.", "quantity":10, "total_amount":{ - "value":25, + "value":"25", "currency":"EUR" } }, { "total_amount":{ - "value":0, + "value":"0", "currency":"EUR" } }, { "total_amount":{ - "value":0, + "value":"0", "currency":"EUR" } } diff --git a/tests/json/payment.json b/tests/json/payment.json index 6f008074..8ac1e343 100644 --- a/tests/json/payment.json +++ b/tests/json/payment.json @@ -62,7 +62,7 @@ "description":"Lorem ipsum dolor sit amet.", "quantity":50, "total_amount":{ - "value":39.99, + "value":"39.99", "currency":"EUR" } }, @@ -71,10 +71,10 @@ "description":"Lorem ipsum dolor sit amet.", "quantity":10, "total_amount":{ - "value":25, + "value":"25", "currency":"EUR", - "tax_value":5.25, - "tax_percentage":21 + "tax_value":"5.25", + "tax_percentage":"21" } } ], @@ -104,10 +104,10 @@ "end_date": "2100-05-05T00:00:00+00:00", "expiry_date": "2005-05-05T00:30:00+00:00", "total_amount": { - "value": 242, + "value": "242", "currency": "EUR", - "tax_value": 42, - "tax_percentage": 21 + "tax_value": "42", + "tax_percentage": "21" }, "status":"Open", "failure_reason": { diff --git a/tests/src/MoneyJsonTransformerTest.php b/tests/src/MoneyJsonTransformerTest.php index c2593792..02bd8d42 100644 --- a/tests/src/MoneyJsonTransformerTest.php +++ b/tests/src/MoneyJsonTransformerTest.php @@ -39,20 +39,13 @@ public function test_json() { $json_data = json_decode( file_get_contents( $json_file, true ) ); - $json_string = wp_json_encode( MoneyJsonTransformer::to_json( $money ), JSON_PRETTY_PRINT ); + $json_string = wp_json_encode( $money, JSON_PRETTY_PRINT ); $this->assertEquals( wp_json_encode( $json_data, JSON_PRETTY_PRINT ), $json_string ); $this->assertJsonStringEqualsJsonFile( $json_file, strval( $json_string ) ); } - /** - * Test to JSON empty. - */ - public function test_to_json_empty() { - self::assertNull( MoneyJsonTransformer::to_json() ); - } - /** * Test from JSON invalid. */ diff --git a/tests/src/Payments/PaymentTest.php b/tests/src/Payments/PaymentTest.php index fcbdb0d5..0ce30f14 100644 --- a/tests/src/Payments/PaymentTest.php +++ b/tests/src/Payments/PaymentTest.php @@ -271,7 +271,7 @@ public function test_json() { $line->set_id( '1234' ); $line->set_description( 'Lorem ipsum dolor sit amet.' ); $line->set_quantity( 50 ); - $line->set_total_amount( new TaxedMoney( 39.99, 'EUR' ) ); + $line->set_total_amount( new Money( 39.99, 'EUR' ) ); $line = $lines->new_line(); $line->set_id( 5678 ); diff --git a/vendor-bin/phpdocumentor/composer.lock b/vendor-bin/phpdocumentor/composer.lock index 2d099426..fd0bcbcb 100644 --- a/vendor-bin/phpdocumentor/composer.lock +++ b/vendor-bin/phpdocumentor/composer.lock @@ -14,5 +14,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } diff --git a/vendor-bin/phpstan/composer.lock b/vendor-bin/phpstan/composer.lock index d141c90d..9a30fb50 100644 --- a/vendor-bin/phpstan/composer.lock +++ b/vendor-bin/phpstan/composer.lock @@ -9,16 +9,16 @@ "packages-dev": [ { "name": "php-stubs/wordpress-stubs", - "version": "v5.7.1", + "version": "v5.8.0", "source": { "type": "git", "url": "https://github.com/php-stubs/wordpress-stubs.git", - "reference": "9705d1d0ac8e5000fdcdc96b4d5fd12e429c125d" + "reference": "794e6eedfd5f2a334d581214c007fc398be588fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/9705d1d0ac8e5000fdcdc96b4d5fd12e429c125d", - "reference": "9705d1d0ac8e5000fdcdc96b4d5fd12e429c125d", + "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/794e6eedfd5f2a334d581214c007fc398be588fe", + "reference": "794e6eedfd5f2a334d581214c007fc398be588fe", "shasum": "" }, "replace": { @@ -47,22 +47,22 @@ ], "support": { "issues": "https://github.com/php-stubs/wordpress-stubs/issues", - "source": "https://github.com/php-stubs/wordpress-stubs/tree/v5.7.1" + "source": "https://github.com/php-stubs/wordpress-stubs/tree/v5.8.0" }, - "time": "2021-04-15T14:47:11+00:00" + "time": "2021-07-21T02:34:37+00:00" }, { "name": "phpstan/phpstan", - "version": "0.12.88", + "version": "0.12.94", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "464d1a81af49409c41074aa6640ed0c4cbd9bb68" + "reference": "3d0ba4c198a24e3c3fc489f3ec6ac9612c4be5d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/464d1a81af49409c41074aa6640ed0c4cbd9bb68", - "reference": "464d1a81af49409c41074aa6640ed0c4cbd9bb68", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3d0ba4c198a24e3c3fc489f3ec6ac9612c4be5d6", + "reference": "3d0ba4c198a24e3c3fc489f3ec6ac9612c4be5d6", "shasum": "" }, "require": { @@ -93,13 +93,17 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/0.12.88" + "source": "https://github.com/phpstan/phpstan/tree/0.12.94" }, "funding": [ { "url": "https://github.com/ondrejmirtes", "type": "github" }, + { + "url": "https://github.com/phpstan", + "type": "github" + }, { "url": "https://www.patreon.com/phpstan", "type": "patreon" @@ -109,7 +113,7 @@ "type": "tidelift" } ], - "time": "2021-05-17T12:24:49+00:00" + "time": "2021-07-30T09:05:27+00:00" }, { "name": "symfony/polyfill-php73", @@ -192,16 +196,16 @@ }, { "name": "szepeviktor/phpstan-wordpress", - "version": "v0.7.5", + "version": "v0.7.7", "source": { "type": "git", "url": "https://github.com/szepeviktor/phpstan-wordpress.git", - "reference": "90cf3c6a225a633889b1b3a556816911f42de4f7" + "reference": "bdbea69b2ba4a69998c3b6fe2b7106d78a23bd72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/szepeviktor/phpstan-wordpress/zipball/90cf3c6a225a633889b1b3a556816911f42de4f7", - "reference": "90cf3c6a225a633889b1b3a556816911f42de4f7", + "url": "https://api.github.com/repos/szepeviktor/phpstan-wordpress/zipball/bdbea69b2ba4a69998c3b6fe2b7106d78a23bd72", + "reference": "bdbea69b2ba4a69998c3b6fe2b7106d78a23bd72", "shasum": "" }, "require": { @@ -211,7 +215,7 @@ "symfony/polyfill-php73": "^1.12.0" }, "require-dev": { - "composer/composer": "^1.8.6", + "composer/composer": "^1.10.22", "dealerdirect/phpcodesniffer-composer-installer": "^0.7", "php-parallel-lint/php-parallel-lint": "^1.1", "phpstan/phpstan-strict-rules": "^0.12", @@ -227,7 +231,7 @@ }, "autoload": { "psr-4": { - "PHPStan\\WordPress\\": "src/" + "SzepeViktor\\PHPStan\\WordPress\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -244,7 +248,7 @@ ], "support": { "issues": "https://github.com/szepeviktor/phpstan-wordpress/issues", - "source": "https://github.com/szepeviktor/phpstan-wordpress/tree/v0.7.5" + "source": "https://github.com/szepeviktor/phpstan-wordpress/tree/v0.7.7" }, "funding": [ { @@ -252,7 +256,7 @@ "type": "custom" } ], - "time": "2021-03-19T21:23:23+00:00" + "time": "2021-07-14T09:19:15+00:00" } ], "aliases": [], @@ -262,5 +266,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } diff --git a/vendor-bin/psalm/composer.lock b/vendor-bin/psalm/composer.lock index b4a52c16..77e45f6f 100644 --- a/vendor-bin/psalm/composer.lock +++ b/vendor-bin/psalm/composer.lock @@ -9,27 +9,27 @@ "packages-dev": [ { "name": "amphp/amp", - "version": "v2.5.2", + "version": "v2.6.0", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9" + "reference": "caa95edeb1ca1bf7532e9118ede4a3c3126408cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/efca2b32a7580087adb8aabbff6be1dc1bb924a9", - "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9", + "url": "https://api.github.com/repos/amphp/amp/zipball/caa95edeb1ca1bf7532e9118ede4a3c3126408cc", + "reference": "caa95edeb1ca1bf7532e9118ede4a3c3126408cc", "shasum": "" }, "require": { - "php": ">=7" + "php": ">=7.1" }, "require-dev": { "amphp/php-cs-fixer-config": "dev-master", "amphp/phpunit-util": "^1", "ext-json": "*", "jetbrains/phpstorm-stubs": "^2019.3", - "phpunit/phpunit": "^6.0.9 | ^7", + "phpunit/phpunit": "^7 | ^8 | ^9", "psalm/phar": "^3.11@dev", "react/promise": "^2" }, @@ -86,7 +86,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.5.2" + "source": "https://github.com/amphp/amp/tree/v2.6.0" }, "funding": [ { @@ -94,7 +94,7 @@ "type": "github" } ], - "time": "2021-01-10T17:06:37+00:00" + "time": "2021-07-16T20:06:06+00:00" }, { "name": "amphp/byte-stream", @@ -329,21 +329,21 @@ }, { "name": "composer/xdebug-handler", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496" + "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/964adcdd3a28bf9ed5d9ac6450064e0d71ed7496", - "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/84674dd3a7575ba617f5a76d7e9e29a7d3891339", + "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0", - "psr/log": "^1.0" + "psr/log": "^1 || ^2 || ^3" }, "require-dev": { "phpstan/phpstan": "^0.12.55", @@ -373,7 +373,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/2.0.1" + "source": "https://github.com/composer/xdebug-handler/tree/2.0.2" }, "funding": [ { @@ -389,7 +389,7 @@ "type": "tidelift" } ], - "time": "2021-05-05T19:37:51+00:00" + "time": "2021-07-31T17:03:58+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -430,20 +430,20 @@ }, { "name": "felixfbecker/advanced-json-rpc", - "version": "v3.2.0", + "version": "v3.2.1", "source": { "type": "git", "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git", - "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e" + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/06f0b06043c7438959dbdeed8bb3f699a19be22e", - "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e", + "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447", + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447", "shasum": "" }, "require": { - "netresearch/jsonmapper": "^1.0 || ^2.0", + "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", "php": "^7.1 || ^8.0", "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0" }, @@ -469,9 +469,9 @@ "description": "A more advanced JSONRPC implementation", "support": { "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues", - "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.0" + "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1" }, - "time": "2021-01-10T17:48:47+00:00" + "time": "2021-06-11T22:34:44+00:00" }, { "name": "felixfbecker/language-server-protocol", @@ -531,16 +531,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v2.1.0", + "version": "v4.0.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e" + "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/e0f1e33a71587aca81be5cffbb9746510e1fe04e", - "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", + "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", "shasum": "" }, "require": { @@ -548,10 +548,10 @@ "ext-pcre": "*", "ext-reflection": "*", "ext-spl": "*", - "php": ">=5.6" + "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4 || ~7.0", + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", "squizlabs/php_codesniffer": "~3.5" }, "type": "library", @@ -576,22 +576,22 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/master" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0" }, - "time": "2020-04-16T18:48:43+00:00" + "time": "2020-12-01T19:48:11+00:00" }, { "name": "nikic/php-parser", - "version": "v4.10.5", + "version": "v4.12.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f" + "reference": "6608f01670c3cc5079e18c1dab1104e002579143" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f", - "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143", + "reference": "6608f01670c3cc5079e18c1dab1104e002579143", "shasum": "" }, "require": { @@ -632,9 +632,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0" }, - "time": "2021-05-03T19:11:20+00:00" + "time": "2021-07-21T10:44:31+00:00" }, { "name": "openlss/lib-array2xml", @@ -1013,27 +1013,29 @@ }, { "name": "symfony/console", - "version": "v5.2.8", + "version": "v5.3.6", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "864568fdc0208b3eba3638b6000b69d2386e6768" + "reference": "51b71afd6d2dc8f5063199357b9880cea8d8bfe2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/864568fdc0208b3eba3638b6000b69d2386e6768", - "reference": "864568fdc0208b3eba3638b6000b69d2386e6768", + "url": "https://api.github.com/repos/symfony/console/zipball/51b71afd6d2dc8f5063199357b9880cea8d8bfe2", + "reference": "51b71afd6d2dc8f5063199357b9880cea8d8bfe2", "shasum": "" }, "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php73": "^1.8", - "symfony/polyfill-php80": "^1.15", + "symfony/polyfill-php80": "^1.16", "symfony/service-contracts": "^1.1|^2", "symfony/string": "^5.1" }, "conflict": { + "psr/log": ">=3", "symfony/dependency-injection": "<4.4", "symfony/dotenv": "<5.1", "symfony/event-dispatcher": "<4.4", @@ -1041,10 +1043,10 @@ "symfony/process": "<4.4" }, "provide": { - "psr/log-implementation": "1.0" + "psr/log-implementation": "1.0|2.0" }, "require-dev": { - "psr/log": "~1.0", + "psr/log": "^1|^2", "symfony/config": "^4.4|^5.0", "symfony/dependency-injection": "^4.4|^5.0", "symfony/event-dispatcher": "^4.4|^5.0", @@ -1090,7 +1092,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.2.8" + "source": "https://github.com/symfony/console/tree/v5.3.6" }, "funding": [ { @@ -1106,7 +1108,74 @@ "type": "tidelift" } ], - "time": "2021-05-11T15:45:21+00:00" + "time": "2021-07-27T19:10:22+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v2.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-03-23T23:28:01+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1189,16 +1258,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.23.0", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab" + "reference": "16880ba9c5ebe3642d1995ab866db29270b36535" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/24b72c6baa32c746a4d0840147c9715e42bb68ab", - "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535", + "reference": "16880ba9c5ebe3642d1995ab866db29270b36535", "shasum": "" }, "require": { @@ -1250,7 +1319,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1" }, "funding": [ { @@ -1266,7 +1335,7 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:17:38+00:00" + "time": "2021-05-27T12:26:48+00:00" }, { "name": "symfony/polyfill-intl-normalizer", @@ -1354,16 +1423,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.0", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1" + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", "shasum": "" }, "require": { @@ -1414,7 +1483,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" }, "funding": [ { @@ -1430,7 +1499,7 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2021-05-27T12:26:48+00:00" }, { "name": "symfony/polyfill-php73", @@ -1513,16 +1582,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.23.0", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0" + "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0", - "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", + "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", "shasum": "" }, "require": { @@ -1576,7 +1645,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" }, "funding": [ { @@ -1592,7 +1661,7 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-07-28T13:41:28+00:00" }, { "name": "symfony/service-contracts", @@ -1675,16 +1744,16 @@ }, { "name": "symfony/string", - "version": "v5.2.8", + "version": "v5.3.3", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db" + "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db", - "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db", + "url": "https://api.github.com/repos/symfony/string/zipball/bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1", + "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1", "shasum": "" }, "require": { @@ -1738,7 +1807,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.2.8" + "source": "https://github.com/symfony/string/tree/v5.3.3" }, "funding": [ { @@ -1754,20 +1823,20 @@ "type": "tidelift" } ], - "time": "2021-05-10T14:56:10+00:00" + "time": "2021-06-27T11:44:38+00:00" }, { "name": "vimeo/psalm", - "version": "4.7.3", + "version": "4.9.2", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "38c452ae584467e939d55377aaf83b5a26f19dd1" + "reference": "00c062267d6e3229d91a1939992987e2d46f2393" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/38c452ae584467e939d55377aaf83b5a26f19dd1", - "reference": "38c452ae584467e939d55377aaf83b5a26f19dd1", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/00c062267d6e3229d91a1939992987e2d46f2393", + "reference": "00c062267d6e3229d91a1939992987e2d46f2393", "shasum": "" }, "require": { @@ -1786,7 +1855,7 @@ "felixfbecker/advanced-json-rpc": "^3.0.3", "felixfbecker/language-server-protocol": "^1.5", "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", - "nikic/php-parser": "^4.10.5", + "nikic/php-parser": "^4.12", "openlss/lib-array2xml": "^1.0", "php": "^7.1|^8", "sebastian/diff": "^3.0 || ^4.0", @@ -1805,10 +1874,10 @@ "phpmyadmin/sql-parser": "5.1.0||dev-master", "phpspec/prophecy": ">=1.9.0", "phpunit/phpunit": "^9.0", - "psalm/plugin-phpunit": "^0.13", + "psalm/plugin-phpunit": "^0.16", "slevomat/coding-standard": "^7.0", "squizlabs/php_codesniffer": "^3.5", - "symfony/process": "^4.3", + "symfony/process": "^4.3 || ^5.0", "weirdan/phpunit-appveyor-reporter": "^1.0.0", "weirdan/prophecy-shim": "^1.0 || ^2.0" }, @@ -1857,9 +1926,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.7.3" + "source": "https://github.com/vimeo/psalm/tree/4.9.2" }, - "time": "2021-05-24T04:09:51+00:00" + "time": "2021-08-01T01:15:26+00:00" }, { "name": "webmozart/assert", @@ -1977,5 +2046,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } diff --git a/vendor-bin/wp-documentor/composer.lock b/vendor-bin/wp-documentor/composer.lock index e7a12377..c61ed662 100644 --- a/vendor-bin/wp-documentor/composer.lock +++ b/vendor-bin/wp-documentor/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "nikic/php-parser", - "version": "v4.10.5", + "version": "v4.12.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f" + "reference": "6608f01670c3cc5079e18c1dab1104e002579143" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f", - "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143", + "reference": "6608f01670c3cc5079e18c1dab1104e002579143", "shasum": "" }, "require": { @@ -58,9 +58,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0" }, - "time": "2021-05-03T19:11:20+00:00" + "time": "2021-07-21T10:44:31+00:00" }, { "name": "phpdocumentor/reflection", @@ -278,16 +278,16 @@ }, { "name": "pronamic/wp-documentor", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/pronamic/wp-documentor.git", - "reference": "12f09a2d9e5768f6188fc6104a1e0d8f68e98df4" + "reference": "886d98c3bf3ca7eba8dc84061e98a25cc98d6d0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pronamic/wp-documentor/zipball/12f09a2d9e5768f6188fc6104a1e0d8f68e98df4", - "reference": "12f09a2d9e5768f6188fc6104a1e0d8f68e98df4", + "url": "https://api.github.com/repos/pronamic/wp-documentor/zipball/886d98c3bf3ca7eba8dc84061e98a25cc98d6d0c", + "reference": "886d98c3bf3ca7eba8dc84061e98a25cc98d6d0c", "shasum": "" }, "require": { @@ -344,9 +344,9 @@ ], "support": { "issues": "https://github.com/pronamic/wp-documentor/issues", - "source": "https://github.com/pronamic/wp-documentor/tree/1.1.0" + "source": "https://github.com/pronamic/wp-documentor/tree/1.1.1" }, - "time": "2021-04-16T14:50:29+00:00" + "time": "2021-06-10T11:09:50+00:00" }, { "name": "psr/container", @@ -448,27 +448,29 @@ }, { "name": "symfony/console", - "version": "v5.2.8", + "version": "v5.3.6", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "864568fdc0208b3eba3638b6000b69d2386e6768" + "reference": "51b71afd6d2dc8f5063199357b9880cea8d8bfe2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/864568fdc0208b3eba3638b6000b69d2386e6768", - "reference": "864568fdc0208b3eba3638b6000b69d2386e6768", + "url": "https://api.github.com/repos/symfony/console/zipball/51b71afd6d2dc8f5063199357b9880cea8d8bfe2", + "reference": "51b71afd6d2dc8f5063199357b9880cea8d8bfe2", "shasum": "" }, "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php73": "^1.8", - "symfony/polyfill-php80": "^1.15", + "symfony/polyfill-php80": "^1.16", "symfony/service-contracts": "^1.1|^2", "symfony/string": "^5.1" }, "conflict": { + "psr/log": ">=3", "symfony/dependency-injection": "<4.4", "symfony/dotenv": "<5.1", "symfony/event-dispatcher": "<4.4", @@ -476,10 +478,10 @@ "symfony/process": "<4.4" }, "provide": { - "psr/log-implementation": "1.0" + "psr/log-implementation": "1.0|2.0" }, "require-dev": { - "psr/log": "~1.0", + "psr/log": "^1|^2", "symfony/config": "^4.4|^5.0", "symfony/dependency-injection": "^4.4|^5.0", "symfony/event-dispatcher": "^4.4|^5.0", @@ -525,7 +527,74 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.2.8" + "source": "https://github.com/symfony/console/tree/v5.3.6" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-07-27T19:10:22+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v2.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" }, "funding": [ { @@ -541,25 +610,26 @@ "type": "tidelift" } ], - "time": "2021-05-11T15:45:21+00:00" + "time": "2021-03-23T23:28:01+00:00" }, { "name": "symfony/filesystem", - "version": "v5.2.7", + "version": "v5.3.4", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "056e92acc21d977c37e6ea8e97374b2a6c8551b0" + "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/056e92acc21d977c37e6ea8e97374b2a6c8551b0", - "reference": "056e92acc21d977c37e6ea8e97374b2a6c8551b0", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/343f4fe324383ca46792cae728a3b6e2f708fb32", + "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/polyfill-ctype": "~1.8" + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { @@ -587,7 +657,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.2.7" + "source": "https://github.com/symfony/filesystem/tree/v5.3.4" }, "funding": [ { @@ -603,24 +673,25 @@ "type": "tidelift" } ], - "time": "2021-04-01T10:42:13+00:00" + "time": "2021-07-21T12:40:44+00:00" }, { "name": "symfony/finder", - "version": "v5.2.9", + "version": "v5.3.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ccccb9d48ca42757dd12f2ca4bf857a4e217d90d" + "reference": "17f50e06018baec41551a71a15731287dbaab186" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ccccb9d48ca42757dd12f2ca4bf857a4e217d90d", - "reference": "ccccb9d48ca42757dd12f2ca4bf857a4e217d90d", + "url": "https://api.github.com/repos/symfony/finder/zipball/17f50e06018baec41551a71a15731287dbaab186", + "reference": "17f50e06018baec41551a71a15731287dbaab186", "shasum": "" }, "require": { - "php": ">=7.2.5" + "php": ">=7.2.5", + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { @@ -648,7 +719,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.2.9" + "source": "https://github.com/symfony/finder/tree/v5.3.4" }, "funding": [ { @@ -664,7 +735,7 @@ "type": "tidelift" } ], - "time": "2021-05-16T13:07:46+00:00" + "time": "2021-07-23T15:54:19+00:00" }, { "name": "symfony/polyfill-ctype", @@ -747,16 +818,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.23.0", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab" + "reference": "16880ba9c5ebe3642d1995ab866db29270b36535" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/24b72c6baa32c746a4d0840147c9715e42bb68ab", - "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535", + "reference": "16880ba9c5ebe3642d1995ab866db29270b36535", "shasum": "" }, "require": { @@ -808,7 +879,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1" }, "funding": [ { @@ -824,7 +895,7 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:17:38+00:00" + "time": "2021-05-27T12:26:48+00:00" }, { "name": "symfony/polyfill-intl-normalizer", @@ -912,16 +983,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.0", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1" + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", "shasum": "" }, "require": { @@ -972,7 +1043,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" }, "funding": [ { @@ -988,7 +1059,7 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2021-05-27T12:26:48+00:00" }, { "name": "symfony/polyfill-php73", @@ -1071,16 +1142,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.23.0", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0" + "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0", - "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", + "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", "shasum": "" }, "require": { @@ -1134,7 +1205,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" }, "funding": [ { @@ -1150,7 +1221,7 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-07-28T13:41:28+00:00" }, { "name": "symfony/service-contracts", @@ -1233,16 +1304,16 @@ }, { "name": "symfony/string", - "version": "v5.2.8", + "version": "v5.3.3", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db" + "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db", - "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db", + "url": "https://api.github.com/repos/symfony/string/zipball/bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1", + "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1", "shasum": "" }, "require": { @@ -1296,7 +1367,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.2.8" + "source": "https://github.com/symfony/string/tree/v5.3.3" }, "funding": [ { @@ -1312,7 +1383,7 @@ "type": "tidelift" } ], - "time": "2021-05-10T14:56:10+00:00" + "time": "2021-06-27T11:44:38+00:00" }, { "name": "webmozart/assert", @@ -1381,5 +1452,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } diff --git a/views/form.php b/views/form.php index 939a816f..9b8c021a 100644 --- a/views/form.php +++ b/views/form.php @@ -17,6 +17,10 @@ use Pronamic\WordPress\Pay\Plugin; use Pronamic\WordPress\Pay\Util; +if ( ! isset( $settings ) ) { + return; +} + $methods_with_choices = array( \Pronamic\WordPress\Pay\Forms\FormPostType::AMOUNT_METHOD_CHOICES_ONLY, \Pronamic\WordPress\Pay\Forms\FormPostType::AMOUNT_METHOD_CHOICES_AND_INPUT, diff --git a/views/meta-box-form-options.php b/views/meta-box-form-options.php index 20277c55..0aecb457 100644 --- a/views/meta-box-form-options.php +++ b/views/meta-box-form-options.php @@ -10,6 +10,10 @@ use Pronamic\WordPress\Money\Money; +if ( ! isset( $post ) ) { + return; +} + wp_nonce_field( 'pronamic_pay_save_form_options', 'pronamic_pay_nonce' ); ?> diff --git a/views/meta-box-payment-lines.php b/views/meta-box-payment-lines.php index 27801977..5364ea65 100644 --- a/views/meta-box-payment-lines.php +++ b/views/meta-box-payment-lines.php @@ -11,12 +11,14 @@ namespace Pronamic\WordPress\Pay; use Pronamic\WordPress\Money\Money; +use Pronamic\WordPress\Money\TaxedMoney; +use Pronamic\WordPress\Number\Number; use Pronamic\WordPress\Pay\Payments\PaymentLine; if ( empty( $lines ) ) : ?>
- +
@@ -25,29 +27,29 @@| - | - | - | + | + | + | + | %s', - esc_attr__( 'Unit price with discount including tax.', 'pronamic_ideal' ), - esc_html__( 'Unit Price', 'pronamic_ideal' ) + \esc_attr__( 'Unit price with discount including tax.', 'pronamic_ideal' ), + \esc_html__( 'Unit Price', 'pronamic_ideal' ) ); ?> | -+ | %s', - esc_attr__( 'Total discount.', 'pronamic_ideal' ), - esc_html__( 'Discount', 'pronamic_ideal' ) + \esc_attr__( 'Total discount.', 'pronamic_ideal' ), + \esc_html__( 'Discount', 'pronamic_ideal' ) ); ?> @@ -55,15 +57,15 @@ | %s', - esc_attr__( 'Total amount with discount including tax.', 'pronamic_ideal' ), - esc_html__( 'Total Amount', 'pronamic_ideal' ) + \esc_attr__( 'Total amount with discount including tax.', 'pronamic_ideal' ), + \esc_html__( 'Total Amount', 'pronamic_ideal' ) ); ?> | -+ | get_quantity(); - }, - $lines->get_array() - ); + $quantity_total = new Number( 0 ); - echo esc_html( array_sum( $quantities ) ); + foreach ( $lines as $line ) { + $quantity = $line->get_quantity(); + + if ( null !== $quantity ) { + $quantity_total = $quantity_total->add( Number::from_int( $quantity ) ); + } + } + + echo \esc_html( $quantity_total->format_i18n() ); ?> | get_discount_amount() ) { - return $line->get_discount_amount()->get_value(); - } + $discount_amount = $line->get_discount_amount(); + + return ( null === $discount_amount ) ? null : $discount_amount->get_value(); }, $lines->get_array() ); - $discount_amount = new Money( array_sum( $values ), $lines->get_amount()->get_currency() ); + $discount_amount = new Money( \array_sum( $values ), $lines->get_amount()->get_currency() ); - echo esc_html( $discount_amount ); + echo \esc_html( $discount_amount->format_i18n() ); ?> |
- get_total_amount()->get_excluding_tax()->get_value();
- },
- $lines->get_array()
- );
-
- $total_exclusive = new Money( array_sum( $values ), $lines->get_amount()->get_currency() );
-
- $tip = array(
- sprintf(
- /* translators: %s: price excluding tax */
- __( 'Exclusive tax: %s', 'pronamic_ideal' ),
- $total_exclusive
- ),
- );
-
- if ( $lines->get_amount()->has_tax() ) {
- $values = array_map(
- function ( PaymentLine $line ) {
- return $line->get_total_amount()->get_including_tax()->get_value();
- },
- $lines->get_array()
- );
-
- $total_inclusive = new Money( array_sum( $values ), $lines->get_amount()->get_currency() );
-
- $tip[] = sprintf(
- /* translators: %s: price including tax */
- __( 'Inclusive tax: %s', 'pronamic_ideal' ),
- $total_inclusive
- );
- }
-
- printf(
- '%s',
- esc_attr( implode( ' ', $tip ) ), - esc_html( $total_exclusive ) - ); - - ?> + get_amount()->format_i18n() ); ?> |
get_total_amount()->get_tax_value(); + $total_amount = $line->get_total_amount(); + + if ( $total_amount instanceof TaxedMoney ) { + return $total_amount->get_tax_value(); + } + + return null; }, $lines->get_array() ); - $tax_amount = new Money( array_sum( $values ), $lines->get_amount()->get_currency()->get_alphabetic_code() ); + $tax_amount = new Money( \array_sum( $values ), $lines->get_amount()->get_currency() ); - echo esc_html( $tax_amount ); + echo \esc_html( $tax_amount->format_i18n() ); ?> | @@ -175,17 +144,17 @@ function( PaymentLine $line ) {
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| get_id() ); ?> | -get_sku() ); ?> | +get_id() ); ?> | +get_sku() ); ?> |
get_image_url();
if ( ! empty( $image_url ) ) {
- printf(
+ \printf(
' |
get_unit_price() ) {
+ $unit_price = $line->get_unit_price();
- $tip = array(
- sprintf(
- /* translators: %s: price excluding tax */
- __( 'Exclusive tax: %s', 'pronamic_ideal' ),
- $line->get_unit_price()->get_excluding_tax()
- ),
+ if ( null !== $unit_price ) {
+ $tips = array(
+ \__( 'No tax information.', 'pronamic_ideal' ),
);
- if ( $line->get_unit_price()->has_tax() ) {
- $tip[] = sprintf(
- /* translators: %s: price including tax */
- __( 'Inclusive tax: %s', 'pronamic_ideal' ),
- $line->get_unit_price()->get_including_tax()
+ if ( $unit_price instanceof TaxedMoney ) {
+ $tips = array(
+ \sprintf(
+ /* translators: %s: price excluding tax */
+ \__( 'Exclusive tax: %s', 'pronamic_ideal' ),
+ $unit_price->get_excluding_tax()
+ ),
+ \sprintf(
+ /* translators: %s: price including tax */
+ \__( 'Inclusive tax: %s', 'pronamic_ideal' ),
+ $unit_price->get_including_tax()
+ ),
);
}
- printf(
+ \printf(
'%s',
- esc_attr( implode( ' ', $tip ) ), - esc_html( $line->get_unit_price()->get_excluding_tax() ) + \esc_attr( \implode( ' ', $tips ) ), + \esc_html( $unit_price->format_i18n() ) ); } ?> |
- get_quantity() ); ?> | +get_quantity() ); ?> | get_discount_amount() ) { - echo esc_html( $line->get_discount_amount() ); + $discount_amount = $line->get_discount_amount(); + + if ( null !== $discount_amount ) { + echo \esc_html( $discount_amount ); } ?> @@ -274,26 +249,31 @@ function( PaymentLine $line ) { |
get_total_amount()->get_excluding_tax()
- ),
+ $line_total = $line->get_total_amount();
+
+ $tips = array(
+ \__( 'No tax information.', 'pronamic_ideal' ),
);
- if ( $line->get_total_amount()->has_tax() ) {
- $tip[] = sprintf(
- /* translators: %s: price including tax */
- __( 'Inclusive tax: %s', 'pronamic_ideal' ),
- $line->get_total_amount()->get_including_tax()
+ if ( $line_total instanceof TaxedMoney ) {
+ $tips = array(
+ \sprintf(
+ /* translators: %s: price excluding tax */
+ \__( 'Exclusive tax: %s', 'pronamic_ideal' ),
+ $line->get_total_amount()->get_excluding_tax()
+ ),
+ \sprintf(
+ /* translators: %s: price including tax */
+ \__( 'Inclusive tax: %s', 'pronamic_ideal' ),
+ $line->get_total_amount()->get_including_tax()
+ ),
);
}
- printf(
+ \printf(
'%s',
- esc_attr( implode( ' ', $tip ) ), - esc_html( $line->get_total_amount()->get_excluding_tax() ) + \esc_attr( \implode( ' ', $tips ) ), + \esc_html( $line_total->format_i18n() ) ); ?> @@ -301,20 +281,17 @@ function( PaymentLine $line ) { |
get_total_amount()->get_tax_amount();
-
- if ( null === $line->get_total_amount()->get_tax_percentage() ) {
-
- echo esc_html( $tax_amount );
-
- } else {
-
- printf(
- '%s',
- esc_attr( number_format_i18n( $line->get_total_amount()->get_tax_percentage() ) . '%' ),
- esc_html( $tax_amount )
- );
+ if ( $line_total instanceof TaxedMoney ) {
+ $tax_amount = $line_total->get_tax_amount();
+ $tax_percentage = $line_total->get_tax_percentage();
+ if ( null !== $tax_amount ) {
+ \printf(
+ '%s',
+ \esc_attr( \number_format_i18n( $tax_percentage ) . '%' ),
+ \esc_html( $tax_amount->format_i18n() )
+ );
+ }
}
?>
diff --git a/views/meta-box-payment-update.php b/views/meta-box-payment-update.php
index 2700b056..4d67b023 100644
--- a/views/meta-box-payment-update.php
+++ b/views/meta-box-payment-update.php
@@ -12,6 +12,10 @@
use Pronamic\WordPress\Pay\Payments\PaymentPostType;
use Pronamic\WordPress\Pay\Plugin;
+if ( ! isset( $post ) ) {
+ return;
+}
+
$states = PaymentPostType::get_payment_states();
$payment = get_pronamic_payment( get_the_ID() );
diff --git a/views/meta-box-subscription-info.php b/views/meta-box-subscription-info.php
index 21a3c776..c246ffe4 100644
--- a/views/meta-box-subscription-info.php
+++ b/views/meta-box-subscription-info.php
@@ -13,6 +13,10 @@
use Pronamic\WordPress\Pay\Subscriptions\SubscriptionStatus;
use Pronamic\WordPress\Pay\Util;
+if ( ! isset( $subscription ) ) {
+ return;
+}
+
$subscription_id = $subscription->get_id();
$customer = $subscription->get_customer();
diff --git a/views/meta-box-subscription-payments.php b/views/meta-box-subscription-payments.php
index 8b486141..9d415dca 100644
--- a/views/meta-box-subscription-payments.php
+++ b/views/meta-box-subscription-payments.php
@@ -11,6 +11,14 @@
use Pronamic\WordPress\Pay\Plugin;
use Pronamic\WordPress\Pay\Subscriptions\SubscriptionStatus;
+if ( ! isset( $periods ) ) {
+ return;
+}
+
+if ( ! isset( $subscription ) ) {
+ return;
+}
+
?>
diff --git a/views/meta-box-subscription-update.php b/views/meta-box-subscription-update.php
index e4b74430..5479922a 100644
--- a/views/meta-box-subscription-update.php
+++ b/views/meta-box-subscription-update.php
@@ -10,6 +10,10 @@
use Pronamic\WordPress\Pay\Subscriptions\SubscriptionPostType;
+if ( ! isset( $post ) ) {
+ return;
+}
+
$states = SubscriptionPostType::get_states();
// WordPress by default doesn't allow `post_author` values of `0`, that's why we use a dash (`-`).
diff --git a/views/notice-license.php b/views/notice-license.php
index 41829cb8..77063cc2 100644
--- a/views/notice-license.php
+++ b/views/notice-license.php
@@ -12,6 +12,10 @@
die;
}
+if ( ! isset( $data ) ) {
+ return;
+}
+
$class = ( 'valid' === $data->license ) ? 'updated' : 'error';
?>
diff --git a/views/notice-upgrade.php b/views/notice-upgrade.php
index fd0ce59f..457e5d1e 100644
--- a/views/notice-upgrade.php
+++ b/views/notice-upgrade.php
@@ -30,7 +30,7 @@
diff --git a/views/page-dashboard.php b/views/page-dashboard.php
index 4a10606e..4cdf4937 100644
--- a/views/page-dashboard.php
+++ b/views/page-dashboard.php
@@ -19,7 +19,7 @@
-
+
@@ -314,7 +314,7 @@
-
+
diff --git a/views/page-reports.php b/views/page-reports.php
index 5e90cf7a..9f26a702 100644
--- a/views/page-reports.php
+++ b/views/page-reports.php
@@ -11,6 +11,10 @@
use Pronamic\WordPress\Money\Money;
use Pronamic\WordPress\Pay\Util;
+if ( ! isset( $admin_reports ) ) {
+ return;
+}
+
?>
@@ -27,7 +31,7 @@
-
+
name ); ?>
|
diff --git a/views/tab-system_status.php b/views/tab-system_status.php
index f890ab35..88647d31 100644
--- a/views/tab-system_status.php
+++ b/views/tab-system_status.php
@@ -108,10 +108,10 @@
-
+
|
-
+
|
- |
diff --git a/views/widget-payments-status-list.php b/views/widget-payments-status-list.php
index bd3b5f7e..7dbab6f1 100644
--- a/views/widget-payments-status-list.php
+++ b/views/widget-payments-status-list.php
@@ -8,25 +8,47 @@
* @package Pronamic\WordPress\Pay
*/
+$counts = \wp_count_posts( 'pronamic_payment' );
+
+$states = array(
+ /* translators: %s: posts count value */
+ 'payment_completed' => __( '%s completed', 'pronamic_ideal' ),
+ /* translators: %s: posts count value */
+ 'payment_pending' => __( '%s pending', 'pronamic_ideal' ),
+ /* translators: %s: posts count value */
+ 'payment_cancelled' => __( '%s cancelled', 'pronamic_ideal' ),
+ /* translators: %s: posts count value */
+ 'payment_failed' => __( '%s failed', 'pronamic_ideal' ),
+ /* translators: %s: posts count value */
+ 'payment_expired' => __( '%s expired', 'pronamic_ideal' ),
+);
+
+$url = \add_query_arg(
+ array(
+ 'post_type' => 'pronamic_payment',
+ ),
+ \admin_url( 'edit.php' )
+);
+
?>
| |