Skip to content

Commit

Permalink
Release 1.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
vttn committed Jul 1, 2020
1 parent c483ff9 commit 86ebb6e
Show file tree
Hide file tree
Showing 11 changed files with 95 additions and 70 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 1.1.4
- [WAL-8526] Disable changing credentials on the showcases

# 1.1.3
- [WAL-8526] Make line item consistency default
- [WAL-8526] Confirm transaction right away
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Once composer is installed, execute the following command in your project root t

```sh
composer require wallee/shopware-6
php bin/console plugin:refresh
php bin/console plugin:install WalleePayment
php bin/console plugin:activate WalleePayment
php bin/console cache:clear
Expand All @@ -35,6 +36,7 @@ Uncompress the zip file you download, and include the autoloader in your project

```php
# unzip to ShopwareInstallDir/custom/plugins/WalleePayment
php bin/console plugin:refresh
php bin/console plugin:install WalleePayment
php bin/console plugin:activate WalleePayment
php bin/console cache:clear
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@
"wallee/sdk": "2.1.*"
},
"type": "shopware-platform-plugin",
"version": "1.1.3"
"version": "1.1.4"
}
10 changes: 9 additions & 1 deletion src/Core/Settings/Command/SettingsCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

/**
* Class SettingsCommand
*
* @internal
* @package WalleePayment\Core\Settings\Command
*/
class SettingsCommand extends Command {
Expand Down Expand Up @@ -50,6 +50,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
SettingsService::CONFIG_APPLICATION_KEY => $input->getOption(SettingsService::CONFIG_APPLICATION_KEY),
SettingsService::CONFIG_EMAIL_ENABLED => $input->getOption(SettingsService::CONFIG_EMAIL_ENABLED),
SettingsService::CONFIG_INTEGRATION => $input->getOption(SettingsService::CONFIG_INTEGRATION),
SettingsService::CONFIG_IS_SHOWCASE => $input->getOption(SettingsService::CONFIG_IS_SHOWCASE),
SettingsService::CONFIG_LINE_ITEM_CONSISTENCY_ENABLED => $input->getOption(SettingsService::CONFIG_LINE_ITEM_CONSISTENCY_ENABLED),
SettingsService::CONFIG_SPACE_ID => $input->getOption(SettingsService::CONFIG_SPACE_ID),
SettingsService::CONFIG_SPACE_VIEW_ID => $input->getOption(SettingsService::CONFIG_SPACE_VIEW_ID),
Expand Down Expand Up @@ -97,6 +98,13 @@ protected function configure()
SettingsService::CONFIG_INTEGRATION,
Integration::IFRAME
)
->addOption(
SettingsService::CONFIG_IS_SHOWCASE,
SettingsService::CONFIG_IS_SHOWCASE,
InputOption::VALUE_OPTIONAL,
SettingsService::CONFIG_IS_SHOWCASE,
true
)
->addOption(
SettingsService::CONFIG_LINE_ITEM_CONSISTENCY_ENABLED,
SettingsService::CONFIG_LINE_ITEM_CONSISTENCY_ENABLED,
Expand Down
1 change: 1 addition & 0 deletions src/Core/Settings/Service/SettingsService.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class SettingsService {
public const CONFIG_APPLICATION_KEY = 'applicationKey';
public const CONFIG_EMAIL_ENABLED = 'emailEnabled';
public const CONFIG_INTEGRATION = 'integration';
public const CONFIG_IS_SHOWCASE = 'isShowcase';
public const CONFIG_LINE_ITEM_CONSISTENCY_ENABLED = 'lineItemConsistencyEnabled';
public const CONFIG_SPACE_ID = 'spaceId';
public const CONFIG_SPACE_VIEW_ID = 'spaceViewId';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,74 +6,78 @@ import constants from '../../page/wallee-settings/wallee-config-consts'
const {Component, Mixin} = Shopware;

Component.register('sw-wallee-credentials', {
template: template,
template: template,

name: 'WalleeCredentials',
name: 'WalleeCredentials',

mixins: [
Mixin.getByName('notification')
],
mixins: [
Mixin.getByName('notification')
],

props: {
actualConfigData: {
type: Object,
required: true
},
allConfigs: {
type: Object,
required: true
},
props: {
actualConfigData: {
type: Object,
required: true
},
allConfigs: {
type: Object,
required: true
},

selectedSalesChannelId: {
required: true
},
spaceIdFilled: {
type: Boolean,
required: true
},
spaceIdErrorState: {
required: true
},
userIdFilled: {
type: Boolean,
required: true
},
userIdErrorState: {
required: true
},
applicationKeyFilled: {
type: Boolean,
required: true
},
applicationKeyErrorState: {
required: true
},
isLoading: {
type: Boolean,
required: true
}
},
selectedSalesChannelId: {
required: true
},
spaceIdFilled: {
type: Boolean,
required: true
},
spaceIdErrorState: {
required: true
},
userIdFilled: {
type: Boolean,
required: true
},
userIdErrorState: {
required: true
},
applicationKeyFilled: {
type: Boolean,
required: true
},
applicationKeyErrorState: {
required: true
},
isLoading: {
type: Boolean,
required: true
},
isShowcase: {
type: Boolean,
required: true
}
},

data() {
return {
...constants
};
},
data() {
return {
...constants
};
},

computed: {},
computed: {},

methods: {
methods: {

checkTextFieldInheritance(value) {
if (typeof value !== 'string') {
return true;
}
checkTextFieldInheritance(value) {
if (typeof value !== 'string') {
return true;
}

return value.length <= 0;
},
return value.length <= 0;
},

checkBoolFieldInheritance(value) {
return typeof value !== 'boolean';
}
}
checkBoolFieldInheritance(value) {
return typeof value !== 'boolean';
}
}
});
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{% block wallee_settings_content_card_channel_config_credentials %}
<sw-card class="sw-card"
:title="$tc('wallee-settings.settingForm.credentials.cardTitle')">
<sw-card
class="sw-card"
:title="$tc('wallee-settings.settingForm.credentials.cardTitle')"
v-if="!isShowcase"
>

{% block wallee_settings_content_card_channel_config_credentials_card_container %}
<sw-container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ Component.register('wallee-settings', {
config: {},

isLoading: false,

isSaveSuccessful: false,
isShowcase: false,

applicationKeyFilled: false,
applicationKeyErrorState: false,
Expand Down Expand Up @@ -59,7 +61,7 @@ Component.register('wallee-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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const CONFIG_LINE_ITEM_CONSISTENCY_ENABLED = CONFIG_DOMAIN + '.' + 'lineI
export const CONFIG_SPACE_ID = CONFIG_DOMAIN + '.' + 'spaceId';
export const CONFIG_SPACE_VIEW_ID = CONFIG_DOMAIN + '.' + 'spaceViewId';
export const CONFIG_USER_ID = CONFIG_DOMAIN + '.' + 'userId';

export const CONFIG_IS_SHOWCASE = CONFIG_DOMAIN + '.' + 'isShowcase';
export default {
CONFIG_DOMAIN,
CONFIG_APPLICATION_KEY,
Expand All @@ -15,5 +15,6 @@ export default {
CONFIG_LINE_ITEM_CONSISTENCY_ENABLED,
CONFIG_SPACE_ID,
CONFIG_SPACE_VIEW_ID,
CONFIG_USER_ID
CONFIG_USER_ID,
CONFIG_IS_SHOWCASE
};
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,9 @@
:spaceIdFilled="spaceIdFilled"
:userIdFilled="userIdFilled"
:applicationKeyFilled="applicationKeyFilled"
:isLoading="isLoading">
</sw-wallee-credentials>
:isLoading="isLoading"
:isShowcase="isShowcase"
></sw-wallee-credentials>
{% endblock %}

{% block wallee_settings_content_card_channel_config_options_card %}
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/public/administration/js/wallee-payment.js

Large diffs are not rendered by default.

0 comments on commit 86ebb6e

Please sign in to comment.