Skip to content

Commit

Permalink
Renamed all conventional recurring to subscription
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheCartpenter
TheCartpenter committed Jan 20, 2024
1 parent c805f75 commit 42dd388
Show file tree
Hide file tree
Showing 17 changed files with 344 additions and 248 deletions.
66 changes: 33 additions & 33 deletions upload/admin/controller/extension/payment/squareup.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@ public function index(): void {
$data['payment_squareup_sandbox_locations'] = $this->getSettingValue('payment_squareup_sandbox_locations', $previous_config->get('payment_squareup_sandbox_locations'));
$data['payment_squareup_sandbox_location_id'] = $this->getSettingValue('payment_squareup_sandbox_location_id');
$data['payment_squareup_delay_capture'] = $this->getSettingValue('payment_squareup_delay_capture');
$data['payment_squareup_recurring_status'] = $this->getSettingValue('payment_squareup_recurring_status');
$data['payment_squareup_subscription_status'] = $this->getSettingValue('payment_squareup_subscription_status');
$data['payment_squareup_cron_email_status'] = $this->getSettingValue('payment_squareup_cron_email_status');
$data['payment_squareup_cron_email'] = $this->getSettingValue('payment_squareup_cron_email', $this->config->get('config_email'));
$data['payment_squareup_cron_token'] = $this->getSettingValue('payment_squareup_cron_token');
$data['payment_squareup_cron_acknowledge'] = $this->getSettingValue('payment_squareup_cron_acknowledge', null, true);
$data['payment_squareup_notify_recurring_success'] = $this->getSettingValue('payment_squareup_notify_recurring_success');
$data['payment_squareup_notify_recurring_fail'] = $this->getSettingValue('payment_squareup_notify_recurring_fail');
$data['payment_squareup_notify_subscription_success'] = $this->getSettingValue('payment_squareup_notify_subscription_success');
$data['payment_squareup_notify_subscription_fail'] = $this->getSettingValue('payment_squareup_notify_subscription_fail');
$data['payment_squareup_merchant_id'] = $this->getSettingValue('payment_squareup_merchant_id', $previous_config->get('payment_squareup_merchant_id'));
$data['payment_squareup_merchant_name'] = $this->getSettingValue('payment_squareup_merchant_name', $previous_config->get('payment_squareup_merchant_name'));

Expand Down Expand Up @@ -214,7 +214,7 @@ public function index(): void {
$tabs = [
'tab-transaction',
'tab-setting',
'tab-recurring',
'tab-subscription',
'tab-cron'
];

Expand Down Expand Up @@ -279,7 +279,7 @@ public function index(): void {
$data['payment_squareup_cron_token'] = md5(mt_rand());
}

$data['payment_squareup_cron_url'] = 'https://' . parse_url($server, PHP_URL_HOST) . dirname(parse_url($server, PHP_URL_PATH)) . '/index.php?route=extension/subscription/squareup/recurring&cron_token={CRON_TOKEN}';
$data['payment_squareup_cron_url'] = 'https://' . parse_url($server, PHP_URL_HOST) . dirname(parse_url($server, PHP_URL_PATH)) . '/index.php?route=extension/subscription/squareup/subscription&cron_token={CRON_TOKEN}';

$data['catalog'] = $this->request->server['HTTPS'] ? HTTPS_CATALOG : HTTP_CATALOG;

Expand Down Expand Up @@ -867,41 +867,41 @@ public function uninstall(): void {
}

/**
* recurringButtons
* subscriptionButtons
*
* @return string
*/
public function recurringButtons(): string {
public function subscriptionButtons(): string {
$this->load->language('extension/payment/squareup');

// Squareup
$this->load->model('extension/payment/squareup');

if (isset($this->request->get['order_recurring_id'])) {
$order_recurring_id = (int)$this->request->get['order_recurring_id'];
if (isset($this->request->get['subscription_id'])) {
$subscription_id = (int)$this->request->get['subscription_id'];
} else {
$order_recurring_id = 0;
$subscription_id = 0;
}

// Recurring
$this->load->model('extension/other/recurring');
// Subscription
$this->load->model('sale/subscription');

$order_recurring_info = $this->model_extension_other_recurring->getRecurring($order_recurring_id);
$subscription_info = $this->model_extension_sale_subscription->getSubscription($subscription_id);

Check failure on line 889 in upload/admin/controller/extension/payment/squareup.php

View workflow job for this annotation

GitHub Actions / tests (8.3) 

Cannot call method getSubscription() on null.

$data['button_text'] = $this->language->get('button_cancel_recurring');
$data['button_text'] = $this->language->get('button_cancel_subscription');

if ($order_recurring_info['status'] == ModelExtensionPaymentSquareup::RECURRING_ACTIVE) {
$data['order_recurring_id'] = $order_recurring_id;
if ($subscription_info['status'] == ModelExtensionPaymentSquareup::RECURRING_ACTIVE) {
$data['subscription_id'] = $subscription_id;
} else {
$data['order_recurring_id'] = '';
$data['subscription_id'] = '';
}

// Orders
$this->load->model('sale/order');

$order_info = $this->model_sale_order->getOrder($order_recurring_info['order_id']);
$order_info = $this->model_sale_order->getOrder($subscription_info['order_id']);

$data['order_id'] = $order_recurring_info['order_id'];
$data['order_id'] = $subscription_info['order_id'];
$data['store_id'] = $order_info['store_id'];
$data['order_status_id'] = $order_info['order_status_id'];
$data['comment'] = $this->language->get('text_order_history_cancel');
Expand Down Expand Up @@ -931,40 +931,40 @@ public function recurringButtons(): string {
$data['api_key'] = '';
}

$data['cancel'] = html_entity_decode($this->url->link('extension/payment/squareup/recurringCancel', 'order_recurring_id=' . $order_recurring_id . '&user_token=' . $this->session->data['user_token'], true));
$data['cancel'] = html_entity_decode($this->url->link('extension/payment/squareup/subscriptionCancel', 'subscription_id=' . $subscription_id . '&user_token=' . $this->session->data['user_token'], true));

return $this->load->view('extension/payment/squareup_recurring_buttons', $data);
return $this->load->view('extension/payment/squareup_subscription_buttons', $data);
}

/**
* recurringCancel
* subscriptionCancel
*
* @return void
*/
public function recurringCancel(): void {
public function subscriptionCancel(): void {
$this->load->language('extension/payment/squareup');

$json = [];

if (!$this->user->hasPermission('modify', 'extension/other/recurring')) {
$json['error'] = $this->language->get('error_permission_recurring');
if (!$this->user->hasPermission('modify', 'extension/payment/squareup')) {
$json['error'] = $this->language->get('error_permission_subscription');
} else {
if (isset($this->request->get['order_recurring_id'])) {
$order_recurring_id = (int)$this->request->get['order_recurring_id'];
if (isset($this->request->get['subscription_id'])) {
$subscription_id = (int)$this->request->get['subscription_id'];
} else {
$order_recurring_id = 0;
$subscription_id = 0;
}

// Recurring
$this->load->model('extension/other/recurring');
// Subscription
$this->load->model('sale/subscription');

$recurring_order_info = $this->model_extension_other_recurring->getRecurring($order_recurring_id);
$subscription_order_info = $this->model_extension_sale_subscription->getSubscription($subscription_id);

Check failure on line 961 in upload/admin/controller/extension/payment/squareup.php

View workflow job for this annotation

GitHub Actions / tests (8.3) 

Cannot call method getSubscription() on null.

if ($recurring_order_info) {
if ($subscription_order_info) {
// Squareup
$this->load->model('extension/payment/squareup');

$this->model_extension_payment_squareup->editOrderRecurringStatus($order_recurring_id, ModelExtensionPaymentSquareup::RECURRING_CANCELLED);
$this->model_extension_payment_squareup->editOrderSubscriptionStatus($subscription_id, ModelExtensionPaymentSquareup::RECURRING_CANCELLED);

$json['success'] = $this->language->get('text_canceled_success');
} else {
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/language/en-gb/extension/payment/laybuy.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
$_['text_payment_info'] = 'Payment Information';
$_['text_no_cron_time'] = 'The cron has not yet been executed';
$_['text_comment'] = 'Updated by Lay-Buy';
$_['text_comment_canceled'] = 'Order canceled and recurring PayPal Profile #%s canceled.';
$_['text_comment_canceled'] = 'Order canceled and subscription PayPal Profile #%s has been canceled.';
$_['text_remaining'] = 'Remaining:';
$_['text_payment'] = 'Payment';

Expand Down
24 changes: 12 additions & 12 deletions upload/admin/language/en-gb/extension/payment/squareup.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
$_['help_total'] = 'The checkout total the order must reach before this payment method becomes active.';
$_['help_local_cron'] = 'Insert this command in your web server CRON tab. Set it up to run at least once per day.';
$_['help_remote_cron'] = 'Use this URL to set up a CRON task via a web-based CRON service. Set it up to run at least once per day.';
$_['help_recurring_status'] = 'Enable to allow periodic recurring payments.<br/>NOTE: You must also setup a daily CRON task.';
$_['help_subscription_status'] = 'Enable to allow periodic subscription payments.<br/>NOTE: You must also setup a daily CRON task.';
$_['help_cron_email'] = 'A summary of the recurring task will be sent to this e-mail after completion.';
$_['help_cron_email_status'] = 'Enable to receive a summary after every CRON task.';
$_['help_notify_recurring_success'] = 'Notify customers about successful recurring transactions.';
$_['help_notify_recurring_fail'] = 'Notify customers about failed recurring transactions.';
$_['help_notify_subscription_success'] = 'Notify customers about successful subscription transactions.';
$_['help_notify_subscription_fail'] = 'Notify customers about failed subscription transactions.';

// Tabs
$_['tab_setting'] = 'Settings';
$_['tab_transaction'] = 'Transactions';
$_['tab_cron'] = 'CRON';
$_['tab_recurring'] = 'Recurring Payments';
$_['tab_subscription'] = 'Subscription Payments';

// Text
$_['text_access_token_expires_label'] = 'Access token expires';
Expand All @@ -35,7 +35,7 @@
$_['text_client_secret_label'] = 'OAuth Application Secret';
$_['text_client_secret_placeholder'] = 'OAuth Application Secret';
$_['text_confirm_action'] = 'Are you sure?';
$_['text_confirm_cancel'] = 'Are you sure you want to cancel the recurring payments?';
$_['text_confirm_cancel'] = 'Are you sure you want to cancel the subscription payments?';
$_['text_confirm_capture'] = 'You are about to capture the following amount: <strong>%s</strong>. Click OK to proceed.';
$_['text_confirm_refund'] = 'Please provide a reason for the refund:';
$_['text_confirm_void'] = 'You are about to void the following amount: <strong>%s</strong>. Click OK to proceed.';
Expand Down Expand Up @@ -81,15 +81,15 @@
$_['text_not_connected'] = 'Not connected';
$_['text_not_connected_info'] = 'By clicking this button you will connect this module to your Square account and activate the service.';
$_['text_notification_ssl'] = 'Make sure you have SSL enabled on your checkout page. Otherwise, the extension will not work.';
$_['text_notify_recurring_fail'] = 'Recurring Transaction Failed:';
$_['text_notify_recurring_success'] = 'Recurring Transaction Successful:';
$_['text_notify_subscription_fail'] = 'Subscription Transaction Failed:';
$_['text_notify_subscription_success'] = 'Subscription Transaction Successful:';
$_['text_ok'] = 'OK';
$_['text_order_history_cancel'] = 'An administrator has canceled your recurring payments. Your card will no longer be charged.';
$_['text_order_history_cancel'] = 'An administrator has canceled your subscription payments. Your card will no longer be charged.';
$_['text_payment_method_name_help'] = 'Checkout payment method name';
$_['text_payment_method_name_label'] = 'Payment method name';
$_['text_payment_method_name_placeholder'] = 'Credit / Debit Card';
$_['text_recurring_info'] = 'Please make sure to set up a daily CRON task using one of the methods below. CRON jobs help you with:<br/><br/>&bull; Automatic refresh of your API access token<br/>&bull; Processing of recurring transactions';
$_['text_recurring_status'] = 'Status of recurring payments:';
$_['text_subscription_info'] = 'Please make sure to set up a daily CRON task using one of the methods below. CRON jobs help you with:<br/><br/>&bull; Automatic refresh of your API access token<br/>&bull; Processing of subscription transactions';
$_['text_subscription_status'] = 'Status of subscription payments:';
$_['text_redirect_uri_help'] = 'Paste this link into the Redirect URI field under Manage Application/oAuth';
$_['text_redirect_uri_label'] = 'Square OAuth Redirect URL';
$_['text_refresh_access_token_success'] = 'Successfully refreshed the connection to your Square account.';
Expand Down Expand Up @@ -180,11 +180,11 @@
$_['button_connect'] = 'Connect';
$_['button_reconnect'] = 'Reconnect';
$_['button_refresh'] = 'Refresh token';
$_['button_cancel_recurring'] = 'Cancel Subscription';
$_['button_cancel_subscription'] = 'Cancel Subscription';

// Error
$_['error_permission'] = '<strong>Warning:</strong> You do not have permission to modify payment Square!';
$_['error_permission_recurring'] = '<strong>Warning:</strong> You do not have permission to modify recurring payments!';
$_['error_permission_subscription'] = '<strong>Warning:</strong> You do not have permission to modify subscription payments!';
$_['error_transaction_missing'] = 'Transaction not found!';
$_['error_no_ssl'] = '<strong>Warning:</strong> SSL is not enabled on your admin panel. Please enable it to finish your configuration.';
$_['error_user_rejected_connect_attempt'] = 'Connection attempt was canceled by the user.';
Expand Down
10 changes: 5 additions & 5 deletions upload/admin/model/extension/payment/sagepay_direct.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ public function install(): void {
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");

$this->db->query("
CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "sagepay_direct_order_recurring` (
`sagepay_direct_order_recurring_id` int(11) NOT NULL AUTO_INCREMENT,
CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "sagepay_direct_order_subscription` (
`sagepay_direct_subscription_id` int(11) NOT NULL AUTO_INCREMENT,
`subscription_id` int(11) NOT NULL,
`order_id` int(11) NOT NULL,
`order_recurring_id` int(11) NOT NULL,
`vps_tx_id` varchar(50),
`vendor_tx_code` varchar(50) NOT NULL,
`security_key` char(50) NOT NULL,
Expand All @@ -57,7 +57,7 @@ public function install(): void {
`subscription_end` datetime DEFAULT NULL,
`currency_code` varchar(3) NOT NULL,
`total` decimal(15,4) NOT NULL,
PRIMARY KEY (`sagepay_direct_order_recurring_id`)
PRIMARY KEY (`sagepay_direct_subscription_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");

$this->db->query("
Expand All @@ -80,7 +80,7 @@ public function install(): void {
public function uninstall(): void {
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "sagepay_direct_order`");
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "sagepay_direct_order_transaction`");
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "sagepay_direct_order_recurring`");
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "sagepay_direct_order_subscription`");
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "sagepay_direct_card`");
}

Expand Down
10 changes: 5 additions & 5 deletions upload/admin/model/extension/payment/sagepay_server.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ public function install(): void {
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");

$this->db->query("
CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "sagepay_server_order_recurring` (
`sagepay_server_order_recurring_id` int(11) NOT NULL AUTO_INCREMENT,
`order_id` int(11) NOT NULL,
CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "sagepay_server_order_subscription` (
`sagepay_server_subscription_id` int(11) NOT NULL AUTO_INCREMENT,
`subscription_id` int(11) NOT NULL,
`order_id` int(11) NOT NULL,
`vps_tx_id` varchar(50),
`vendor_tx_code` varchar(50) NOT NULL,
`security_key` varchar(50) NOT NULL,
Expand All @@ -57,7 +57,7 @@ public function install(): void {
`subscription_end` datetime DEFAULT NULL,
`currency_code` varchar(3) NOT NULL,
`total` decimal(15,4) NOT NULL,
PRIMARY KEY (`sagepay_server_order_recurring_id`)
PRIMARY KEY (`sagepay_server_subscription_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");

$this->db->query("
Expand All @@ -81,7 +81,7 @@ public function install(): void {
public function uninstall(): void {
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "sagepay_server_order`");
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "sagepay_server_order_transaction`");
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "sagepay_server_order_recurring`");
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "sagepay_server_order_subscription`");
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "sagepay_server_card`");
}

Expand Down
8 changes: 4 additions & 4 deletions upload/admin/model/extension/payment/squareup.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ public function getOrderStatusId(int $order_id, ?string $transaction_status = nu
}

/**
* editOrderRecurringStatus
* editOrderSubscriptionStatus
*
* @param int $order_recurring_id
* @param int $subscription_id
* @param int $status
*
* @return void
*/
public function editOrderRecurringStatus(int $order_recurring_id, int $status): void {
$this->db->query("UPDATE `" . DB_PREFIX . "order_recurring` SET `status` = '" . (int)$status . "' WHERE `order_recurring_id` = '" . (int)$order_recurring_id . "'");
public function editOrderSubscriptionStatus(int $subscription_id, int $status): void {
$this->db->query("UPDATE `" . DB_PREFIX . "subscription` SET `status` = '" . (int)$status . "' WHERE `subscription_id` = '" . (int)$subscription_id . "'");
}

/**
Expand Down
12 changes: 6 additions & 6 deletions upload/admin/model/extension/payment/worldpay.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ public function install(): void {
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");

$this->db->query("
CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "worldpay_order_recurring` (
`worldpay_order_recurring_id` int(11) NOT NULL AUTO_INCREMENT,
`order_id` int(11) NOT NULL,
`order_recurring_id` int(11) NOT NULL,
CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "worldpay_order_subscription` (
`worldpay_order_subscription_id` int(11) NOT NULL AUTO_INCREMENT,
`subscription_id` int(11) NOT NULL,
`order_id` int(11) NOT NULL,
`order_code` varchar(50),
`token` varchar(50),
`date_added` datetime NOT NULL,
Expand All @@ -48,7 +48,7 @@ public function install(): void {
`subscription_end` datetime DEFAULT NULL,
`currency_code` varchar(3) NOT NULL,
`total` decimal(15,4) NOT NULL,
PRIMARY KEY (`worldpay_order_recurring_id`)
PRIMARY KEY (`worldpay_order_subscription_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;");

$this->db->query("
Expand All @@ -72,7 +72,7 @@ public function install(): void {
public function uninstall(): void {
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "worldpay_order`");
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "worldpay_order_transaction`");
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "worldpay_order_recurring`");
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "worldpay_order_subscription`");
$this->db->query("DROP TABLE IF EXISTS `" . DB_PREFIX . "worldpay_card`");
}

Expand Down
Loading

0 comments on commit 42dd388

Please sign in to comment.