Skip to content

Commit

Permalink
not needed changes deleted
Browse files Browse the repository at this point in the history
  • Loading branch information
GytisZum committed Jul 3, 2024
1 parent 084001d commit 16143fe
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 24 deletions.
14 changes: 0 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,3 @@ prepare-zip:
composer dump-autoload --no-dev --optimize --classmap-authoritative
cp .github/.htaccess vendor/.htaccess
rm -rf .git .docker .editorconfig .github tests .php-cs-fixer.php Makefile cypress .docker cypress.config.js cypress.env.json docker-compose*.yml .gitignore bin codeception.yml package-lock.json package.json .php_cs.dist .php-cs-fixer.dist

# Define SQL commands
SQL_COMMANDS := \
"UPDATE \`ps_configuration\` SET \`value\` = '1' WHERE \`name\` = 'PS_SSL_ENABLED';" \
"UPDATE \`ps_configuration\` SET \`value\` = '1' WHERE \`name\` = 'PS_SSL_ENABLED_EVERYWHERE';" \
"UPDATE \`ps_shop_url\` SET \`domain\` = '$(DOMAIN_NAME)' WHERE active = 1;" \
"UPDATE \`ps_shop_url\` SET \`domain_ssl\` = '$(DOMAIN_NAME)' WHERE active = 1;"
# Target to change shop URL
change-shop-url:
@echo "Executing SQL commands to change shop URL..."
docker exec -i $(DOCKER_CONTAINER_NAME) mysql -u$(MYSQL_USER) -p$(MYSQL_PASSWORD) $(MYSQL_DATABASE) -e "$(SQL_COMMANDS)"
@echo "Shop URL updated successfully."
2 changes: 1 addition & 1 deletion controllers/front/webhook.php
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ protected function executeWebhook(string $transactionId): void
} else {
$transaction = $this->module->getApiClient()->payments->get($transactionId);

if ($transaction->orderId && $transaction->status !== 'expired') {
if ($transaction->orderId) {
$transaction = $this->module->getApiClient()->orders->get($transaction->orderId, ['embed' => 'payments']);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Config/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class Config
],
'mybank' => [],
'trustly' => ['at', 'de', 'ee', 'es', 'fi', 'lt', 'lv', 'nl'],
'riverty' => ['nl','be','de','at'],
'riverty' => ['nl', 'be', 'de', 'at'],
'payconiq' => [],
];

Expand Down
3 changes: 0 additions & 3 deletions src/Service/ApiService.php
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,6 @@ public function getMethodsForConfig(MollieApiClient $api)
$apiMethods = $apiMethods->getArrayCopy();
/** @var Method $method */
foreach ($apiMethods as $key => $method) {
if ($method->status === 'pending-review') { // TODO REMOVE THIS ONCE RIVERTY IS IMPLEMENTED
continue;
}
if ($method->status !== 'activated') {
unset($apiMethods[$key]);
}
Expand Down
5 changes: 0 additions & 5 deletions src/Service/TransactionService.php
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,6 @@ public function processTransaction($apiPayment)
return $apiPayment;
}

/** @var PrestaLoggerInterface $logger */
$logger = $this->module->getService(PrestaLoggerInterface::class);
$logger->error($apiPayment->resource);
switch ($apiPayment->resource) {
case Config::MOLLIE_API_STATUS_PAYMENT:
PrestaShopLogger::addLog(__METHOD__ . ' said: Starting to process PAYMENT transaction.', Config::NOTICE);
Expand Down Expand Up @@ -287,8 +284,6 @@ public function processTransaction($apiPayment)
$this->configurationAdapter->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS)
=== Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_DEFAULT;


$logger->error($apiPayment->method);
if (
!$isAuthorizablePaymentInvoiceOnStatusDefault
&& $apiPayment->status === OrderStatus::STATUS_COMPLETED
Expand Down

0 comments on commit 16143fe

Please sign in to comment.