feat(default-theme): remove apartment number from forms

packages/default-theme/src/components/SwAddress.vue

@@ -4,7 +4,7 @@
  <h4 class="sw-address__title">{{ addressTitle }}</h4>
  <slot name="before-content" />
  <p class="content">
- {{ street }} {{ apartment }}, {{ zipcode }}<br />
+ {{ street }}, {{ zipcode }}<br />
  {{ city }}
  </p>
  <p v-if="phoneNumber" class="content">
@@ -43,9 +43,6 @@ export default {
  city() {
  return this.address.city
  },
- apartment() {
- return this.address.apartment
- },
  phoneNumber() {
  return this.address.phoneNumber
  },

packages/default-theme/src/components/checkout/steps/guest/BillingAddressGuestForm.vue

@@ -29,28 +29,18 @@
  class="sw-form__input"
  required
  />
+ </div>
+ <div class="inputs-group">
  <SwInput
  v-model="street"
  :valid="!validations.street.$error"
  :error-message="$t('This field is required')"
- :label="$t('Street')"
+ :label="$t('Street and house number')"
  data-cy="street-name"
  name="street"
  class="sw-form__input"
  required
  />
- </div>
- <div class="inputs-group">
- <SwInput
- v-model="apartment"
- :valid="!validations.apartment.$error"
- :error-message="$t('This field is required')"
- :label="$t('House/Apartment number')"
- data-cy="apartment"
- name="apartment"
- class="sw-form__input"
- required
- />
  <SwInput
  v-model="city"
  :valid="!validations.city.$error"
@@ -142,7 +132,6 @@ export default {
  firstName,
  lastName,
  street,
- apartment,
  city,
  state,
  zipcode,
@@ -163,7 +152,6 @@ export default {
  firstName,
  lastName,
  street,
- apartment,
  city,
  state,
  zipcode,

packages/default-theme/src/components/checkout/steps/guest/ShippingAddressGuestForm.vue

@@ -21,28 +21,18 @@
  class="sw-form__input"
  required
  />
+ </div>
+ <div class="inputs-group">
  <SwInput
  v-model="street"
  :valid="!validations.street.$error"
  :error-message="$t('This field is required')"
- :label="$t('Street')"
+ :label="$t('Street and house number')"
  data-cy="street-name"
  name="street"
  class="sw-form__input"
  required
  />
- </div>
- <div class="inputs-group">
- <SwInput
- v-model="apartment"
- :valid="!validations.apartment.$error"
- :error-message="$t('This field is required')"
- :label="$t('House/Apartment number')"
- data-cy="apartment"
- name="apartment"
- class="sw-form__input"
- required
- />
  <SwInput
  v-model="city"
  :valid="!validations.city.$error"
@@ -137,7 +127,6 @@ export default {
  firstName,
  lastName,
  street,
- apartment,
  city,
  state,
  zipcode,
@@ -167,7 +156,6 @@ export default {
  firstName,
  lastName,
  street,
- apartment,
  city,
  state,
  zipcode,

packages/default-theme/src/components/forms/SwAddressForm.vue

@@ -53,24 +53,15 @@
  <SwInput
  v-model="form.street"
  name="street"
- :label="$t('Street')"
+ :label="$t('Street and house number')"
  :error-message="$t('Street is required')"
  :valid="!$v.form.street.$error"
  required
  class="sw-form__input"
  @blur="$v.form.street.$touch()"
  />
  </div>
- <SwInput
- v-model="form.apartment"
- name="apartment"
- :label="$t('House/Apartment number')"
- :error-message="$t('Apartment is required')"
- :valid="!$v.form.apartment.$error"
- required
- class="form__element"
- @blur="$v.form.apartment.$touch()"
- />
+
  <div class="inputs-group">
  <SwInput
  v-model="form.city"
@@ -89,7 +80,6 @@
  :label="$t('State/Province')"
  :error-message="$t('State is required')"
  :valid="!$v.form.state.$error"
- required
  class="sw-form__input"
  :required="forceState"
  @blur="$v.form.state.$touch()"
@@ -178,7 +168,6 @@ export default {
  country: null,
  zipcode: "",
  street: "",
- apartment: "",
  city: "",
  phoneNumber: "",
  }),
@@ -234,7 +223,6 @@ export default {
  salutation,
  zipcode,
  street,
- apartment,
  city,
  country,
  phoneNumber,
@@ -247,7 +235,6 @@ export default {
  salutationId: salutation.id,
  zipcode,
  street,
- apartment,
  city,
  countryId: country.id,
  phoneNumber,
@@ -281,9 +268,6 @@ export default {
  street: {
  required,
  },
- apartment: {
- required,
- },
  city: {
  required,
  },

packages/default-theme/src/logic/checkout/usePaymentStep.js

@@ -9,7 +9,6 @@ export const usePaymentStep = createCheckoutStep({
  firstName: null,
  lastName: null,
  street: null,
- apartment: null,
  city: null,
  state: null,
  zipcode: null,
@@ -41,11 +40,6 @@ export const usePaymentStepValidationRules = {
  return instance.differentThanShipping
  }),
  },
- apartment: {
- required: requiredIf(function (instance) {
- return instance.differentThanShipping
- }),
- },
  city: {
  required: requiredIf(function (instance) {
  return instance.differentThanShipping

packages/default-theme/src/logic/checkout/useShippingStep.js

@@ -8,7 +8,6 @@ export const useShippingStep = createCheckoutStep({
  firstName: null,
  lastName: null,
  street: null,
- apartment: null,
  city: null,
  state: null,
  zipcode: null,
@@ -39,9 +38,6 @@ export const useShippingStepValidationRules = {
  street: {
  required,
  },
- apartment: {
- required,
- },
  city: {
  required,
  },

packages/default-theme/src/logic/checkout/useUICheckoutPage.js

@@ -8,7 +8,7 @@ import { usePaymentStep } from "@/logic/checkout/usePaymentStep"
 import { PAGE_ORDER_SUCCESS } from "@/helpers/pages"
 
 export const useUICheckoutPage = (rootContext) => {
- const { router, i18n } = getApplicationContext(
+ const { router, routing } = getApplicationContext(
  rootContext,
  "useUICheckoutPage"
  )
@@ -87,7 +87,7 @@ export const useUICheckoutPage = (rootContext) => {
  nextStepNumber > CHECKOUT_STEPS.REVIEW
  ) {
  const order = await createOrder()
- router.push(i18n.path(`${PAGE_ORDER_SUCCESS}?orderId=${order.id}`))
+ router.push(routing.getUrl(`${PAGE_ORDER_SUCCESS}?orderId=${order.id}`))
  } else {
  const nextStep = getStepByNumber(nextStepNumber)
  if (stepsStatus.value[nextStep].available) {