Fix a couple defects found while testing payment-method

- INSR-8663: contact-details was inadvertently blanking out provider
- INSR-8666: shop-address was overwriting a global validation rule,
    causing incorrect validation text to appear on later pages

src/layouts/contact-details/contact-details.vue

@@ -245,11 +245,14 @@ export default {
             };
             useMainStore().updateContactInfo(contactInfo);
 
+            const provider = useMainStore().serviceLocation.provider;
+
             useMainStore().updateServiceLocation({
                 address: this.address,
                 address2: this.address2,
                 city: this.city,
-                isVehicleProtected: this.isVehicleProtected || 'false'
+                isVehicleProtected: this.isVehicleProtected || 'false',
+                provider
             });
 
             this.$router.navigate(this.navigationScenarios.CLICKED_FORWARD, this.$route);

src/layouts/schedule-page/service-location/shop-address/shop-address.vue

@@ -68,7 +68,7 @@
                     groupName="chooseShop"
                     textPosition="text-start"
                     isRequired
-                    validationRules="option-required" />
+                    validationRules="provider-required" />
                 <span class="service-zip-prompt">
                     {{ serviceZipPrompt }}
                 </span>
@@ -115,7 +115,7 @@ import errorMessages from '@/constants/error-messages';
 import { defineRule } from 'vee-validate';
 import { required } from '@/helpers/validation-rules';
 
-defineRule('option-required', required(errorMessages.PROVIDER_REQUIRED));
+defineRule('provider-required', required(errorMessages.PROVIDER_REQUIRED));
 
 const SERVICE_ZIP_QUESTION_REF_NAME = 'serviceZipCodeQuestion';