Skip to content

Commit

Permalink
Release 1.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
vttn committed Jul 1, 2020
1 parent 86ebb6e commit 44f6ca7
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 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.5
- Fix settings bug

# 1.1.4
- [WAL-8526] Disable changing credentials on the showcases

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.4"
"version": "1.1.5"
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
:label="$tc('wallee-settings.settingForm.options.integration.label')"
:helpText="$tc('wallee-settings.settingForm.options.integration.tooltipText')"
:disabled="props.isInherited"
:value="props.currentValue ? props.currentValue : 'iframe'"
:value="props.currentValue"
@change="props.updateCurrentValue">
</sw-single-select>
</template>
Expand All @@ -62,7 +62,7 @@
:label="$tc('wallee-settings.settingForm.options.lineItemConsistencyEnabled.label')"
:helpText="$tc('wallee-settings.settingForm.options.lineItemConsistencyEnabled.tooltipText')"
:disabled="props.isInherited"
:value="props.currentValue ? props.currentValue : true"
:value="props.currentValue"
@change="props.updateCurrentValue">
</sw-switch-field>
</template>
Expand All @@ -82,7 +82,7 @@
:label="$tc('wallee-settings.settingForm.options.emailEnabled.label')"
:helpText="$tc('wallee-settings.settingForm.options.emailEnabled.tooltipText')"
:disabled="props.isInherited"
:value="props.currentValue ? props.currentValue : true"
:value="props.currentValue"
@change="props.updateCurrentValue">
</sw-switch-field>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Component.register('wallee-settings', {
this.spaceIdFilled = !!this.config[this.CONFIG_SPACE_ID];
this.userIdFilled = !!this.config[this.CONFIG_USER_ID];

if (!(this.CONFIG_INTEGRATION in this.config) || !this.config[this.CONFIG_INTEGRATION]) {
if (!(this.CONFIG_INTEGRATION in this.config)) {
this.config[this.CONFIG_INTEGRATION] = 'iframe';
}

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 44f6ca7

Please sign in to comment.