|
|
@@ -11,14 +11,13 @@ import {
|
|
|
LanguageCode,
|
|
|
UpdateChannelInput,
|
|
|
} from '@vendure/admin-ui/core';
|
|
|
-import { getDefaultLanguage } from '@vendure/admin-ui/core';
|
|
|
+import { getDefaultUiLanguage } from '@vendure/admin-ui/core';
|
|
|
import { NotificationService } from '@vendure/admin-ui/core';
|
|
|
import { DataService } from '@vendure/admin-ui/core';
|
|
|
import { ServerConfigService } from '@vendure/admin-ui/core';
|
|
|
import { DEFAULT_CHANNEL_CODE } from '@vendure/common/lib/shared-constants';
|
|
|
import { Observable } from 'rxjs';
|
|
|
import { map, mergeMap, take } from 'rxjs/operators';
|
|
|
-
|
|
|
@Component({
|
|
|
selector: 'vdr-channel-detail',
|
|
|
templateUrl: './channel-detail.component.html',
|
|
|
@@ -30,11 +29,12 @@ export class ChannelDetailComponent extends BaseDetailComponent<Channel.Fragment
|
|
|
zones$: Observable<GetZones.Zones[]>;
|
|
|
detailForm: FormGroup;
|
|
|
currencyCodes = Object.values(CurrencyCode);
|
|
|
+ availableLanguageCodes$: Observable<LanguageCode[]>;
|
|
|
|
|
|
constructor(
|
|
|
router: Router,
|
|
|
route: ActivatedRoute,
|
|
|
- serverConfigService: ServerConfigService,
|
|
|
+ protected serverConfigService: ServerConfigService,
|
|
|
private changeDetector: ChangeDetectorRef,
|
|
|
protected dataService: DataService,
|
|
|
private formBuilder: FormBuilder,
|
|
|
@@ -47,6 +47,7 @@ export class ChannelDetailComponent extends BaseDetailComponent<Channel.Fragment
|
|
|
pricesIncludeTax: [false],
|
|
|
currencyCode: [''],
|
|
|
defaultShippingZoneId: ['', Validators.required],
|
|
|
+ defaultLanguageCode: [],
|
|
|
defaultTaxZoneId: ['', Validators.required],
|
|
|
});
|
|
|
}
|
|
|
@@ -54,6 +55,7 @@ export class ChannelDetailComponent extends BaseDetailComponent<Channel.Fragment
|
|
|
ngOnInit() {
|
|
|
this.init();
|
|
|
this.zones$ = this.dataService.settings.getZones().mapSingle((data) => data.zones);
|
|
|
+ this.availableLanguageCodes$ = this.serverConfigService.getAvailableLanguages();
|
|
|
}
|
|
|
|
|
|
ngOnDestroy() {
|
|
|
@@ -72,7 +74,7 @@ export class ChannelDetailComponent extends BaseDetailComponent<Channel.Fragment
|
|
|
const input: CreateChannelInput = {
|
|
|
code: formValue.code,
|
|
|
token: formValue.token,
|
|
|
- defaultLanguageCode: getDefaultLanguage(),
|
|
|
+ defaultLanguageCode: formValue.defaultLanguageCode,
|
|
|
pricesIncludeTax: formValue.pricesIncludeTax,
|
|
|
currencyCode: formValue.currencyCode,
|
|
|
defaultShippingZoneId: formValue.defaultShippingZoneId,
|
|
|
@@ -126,6 +128,7 @@ export class ChannelDetailComponent extends BaseDetailComponent<Channel.Fragment
|
|
|
pricesIncludeTax: formValue.pricesIncludeTax,
|
|
|
currencyCode: formValue.currencyCode,
|
|
|
defaultShippingZoneId: formValue.defaultShippingZoneId,
|
|
|
+ defaultLanguageCode: formValue.defaultLanguageCode,
|
|
|
defaultTaxZoneId: formValue.defaultTaxZoneId,
|
|
|
} as UpdateChannelInput;
|
|
|
return this.dataService.settings.updateChannel(input);
|
|
|
@@ -157,6 +160,7 @@ export class ChannelDetailComponent extends BaseDetailComponent<Channel.Fragment
|
|
|
pricesIncludeTax: entity.pricesIncludeTax,
|
|
|
currencyCode: entity.currencyCode,
|
|
|
defaultShippingZoneId: entity.defaultShippingZone ? entity.defaultShippingZone.id : '',
|
|
|
+ defaultLanguageCode: entity.defaultLanguageCode,
|
|
|
defaultTaxZoneId: entity.defaultTaxZone ? entity.defaultTaxZone.id : '',
|
|
|
});
|
|
|
if (entity.code === DEFAULT_CHANNEL_CODE) {
|