Skip to content

Commit

Permalink
Release 6.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewrowanwallee committed Jun 11, 2024
1 parent 893ed98 commit 0f61d85
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 12 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 6.1.4
- Improved plugin's settings form
- Support for Shopware 6.6.2.0

# 6.1.3
- Solvency check support for Powerpay and MF Group Invoice payment methods
- Improved handling of abandoned transactions
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG_de-DE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 6.1.4
- Das Einstellungsformular des Plugins wurde verbessert
- Unterstützung von Shopware 6.6.2.0

# 6.1.3
- Unterstützung der Bonitätsprüfung für die Zahlungsmethoden Powerpay und MF Group Invoice
- Verbesserte Handhabung abgebrochener Transaktionen
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Uncompress the zip file you download, and include the autoloader in your project

```bash
# unzip to ShopwareInstallDir/custom/plugins/PostFinanceCheckoutPayment
composer require postfinancecheckout/sdk 4.0.2
composer require postfinancecheckout/sdk 4.2.0
php bin/console plugin:refresh
php bin/console plugin:install --activate --clearCache PostFinanceCheckoutPayment
```
Expand All @@ -71,7 +71,7 @@ tail -f var/log/postfinancecheckout_payment*.log

## Documentation

[Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/shopware-6/6.1.3/docs/en/documentation.html)
[Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/shopware-6/6.1.4/docs/en/documentation.html)

## License

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
"php": ">=8.2",
"shopware/core": "6.6.*",
"shopware/storefront": "6.6.*",
"postfinancecheckout/sdk": "4.0.2"
"postfinancecheckout/sdk": "4.2.0"
},
"type": "shopware-platform-plugin",
"version": "6.1.3"
"version": "6.1.4"
}
2 changes: 1 addition & 1 deletion docs/en/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Documentation</h2> </div>
</a>
</li>
<li>
<a href="https://github.com/pfpayments/shopware-6/releases/tag/6.1.3/">
<a href="https://github.com/pfpayments/shopware-6/releases/tag/6.1.4/">
Source
</a>
</li>
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Settings/Command/SettingsCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
SettingsService::CONFIG_STOREFRONT_WEBHOOKS_UPDATE_ENABLED => $input->getOption(SettingsService::CONFIG_STOREFRONT_WEBHOOKS_UPDATE_ENABLED),
SettingsService::CONFIG_STOREFRONT_PAYMENTS_UPDATE_ENABLED => $input->getOption(SettingsService::CONFIG_STOREFRONT_PAYMENTS_UPDATE_ENABLED),
]);
return 0;
return Command::SUCCESS;
}

/**
Expand Down Expand Up @@ -103,7 +103,7 @@ protected function configure()
SettingsService::CONFIG_IS_SHOWCASE,
InputOption::VALUE_OPTIONAL,
SettingsService::CONFIG_IS_SHOWCASE,
true
false
)
->addOption(
SettingsService::CONFIG_LINE_ITEM_CONSISTENCY_ENABLED,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% block postfinancecheckout_settings_content_card_channel_config_credentials %}
<sw-card
class="sw-card"
:title="$tc('postfinancecheckout-settings.settingForm.credentials.cardTitle')"
v-if="!isShowcase"
:title="$tc('postfinancecheckout-settings.settingForm.credentials.cardTitle')"
v-if="actualConfigData[CONFIG_IS_SHOWCASE] === 'false'"
>

{% block postfinancecheckout_settings_content_card_channel_config_credentials_card_container %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
labelProperty="translated.name"
valueProperty="id"
:options="salesChannel"
:disabled="isShowcase"
@change="onInput">
</sw-single-select>
{% endblock %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ Component.register('postfinancecheckout-settings', {
handler() {
const defaultConfig = this.$refs.configComponent.allConfigs.null;
const salesChannelId = this.$refs.configComponent.selectedSalesChannelId;
this.isShowcase = this.config[this.CONFIG_IS_SHOWCASE];
if (salesChannelId === null) {

this.applicationKeyFilled = !!this.config[this.CONFIG_APPLICATION_KEY];
Expand Down Expand Up @@ -112,6 +111,10 @@ Component.register('postfinancecheckout-settings', {
this.config[this.CONFIG_STOREFRONT_PAYMENTS_UPDATE_ENABLED] = this.configStorefrontPaymentsUpdateEnabledDefaultValue;
}

if (!(this.CONFIG_IS_SHOWCASE in this.config)) {
this.config[this.CONFIG_IS_SHOWCASE] = this.isShowcase;
}

} else {

this.applicationKeyFilled = !!this.config[this.CONFIG_APPLICATION_KEY] || !!defaultConfig[this.CONFIG_APPLICATION_KEY];
Expand Down Expand Up @@ -142,6 +145,10 @@ Component.register('postfinancecheckout-settings', {
if (!(this.CONFIG_STOREFRONT_PAYMENTS_UPDATE_ENABLED in this.config) || !(this.CONFIG_STOREFRONT_PAYMENTS_UPDATE_ENABLED in defaultConfig)) {
this.config[this.CONFIG_STOREFRONT_PAYMENTS_UPDATE_ENABLED] = this.configStorefrontPaymentsUpdateEnabledDefaultValue;
}

if (!(this.CONFIG_IS_SHOWCASE in this.config) || !(this.CONFIG_IS_SHOWCASE in defaultConfig)) {
this.config[this.CONFIG_IS_SHOWCASE] = this.isShowcase;
}
}
},
deep: true
Expand Down

Large diffs are not rendered by default.

0 comments on commit 0f61d85

Please sign in to comment.