--- a/app/design/frontend/DCKAP/DDI/Magento_Checkout/web/js/view/shipping.js	2025-07-09 10:33:22.185523345 +0530
+++ b/app/design/frontend/DCKAP/DDI/Magento_Checkout/web/js/view/shipping-new.js	2025-07-10 09:21:28.445712783 +0530
@@ -1,369 +1,422 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-define([
-    'jquery',
-    'underscore',
-    'Magento_Ui/js/form/form',
-    'ko',
-    'Magento_Customer/js/model/customer',
-    'Magento_Customer/js/model/address-list',
-    'Magento_Checkout/js/model/address-converter',
-    'Magento_Checkout/js/model/quote',
-    'Magento_Checkout/js/action/create-shipping-address',
-    'Magento_Checkout/js/action/select-shipping-address',
-    'Magento_Checkout/js/model/shipping-rates-validator',
-    'Magento_Checkout/js/model/shipping-address/form-popup-state',
-    'Magento_Checkout/js/model/shipping-service',
-    'Magento_Checkout/js/action/select-shipping-method',
-    'Magento_Checkout/js/model/shipping-rate-registry',
-    'Magento_Checkout/js/action/set-shipping-information',
-    'Magento_Checkout/js/model/step-navigator',
-    'Magento_Ui/js/modal/modal',
-    'Magento_Checkout/js/model/checkout-data-resolver',
-    'Magento_Checkout/js/checkout-data',
-    'uiRegistry',
-    'mage/translate',
-    'Magento_Checkout/js/model/shipping-rate-service'
-], function (
-    $,
-    _,
-    Component,
-    ko,
-    customer,
-    addressList,
-    addressConverter,
-    quote,
-    createShippingAddress,
-    selectShippingAddress,
-    shippingRatesValidator,
-    formPopUpState,
-    shippingService,
-    selectShippingMethodAction,
-    rateRegistry,
-    setShippingInformationAction,
-    stepNavigator,
-    modal,
-    checkoutDataResolver,
-    checkoutData,
-    registry,
-    $t
-) {
-    'use strict';
-
-    let popUp = null;
-
-    return Component.extend({
-        defaults: {
-            template: 'Magento_Checkout/shipping',
-            shippingFormTemplate: 'Magento_Checkout/shipping-address/form',
-            shippingMethodListTemplate: 'Magento_Checkout/shipping-address/shipping-method-list',
-            shippingMethodItemTemplate: 'Magento_Checkout/shipping-address/shipping-method-item'
-        },
-        visible: ko.observable(!quote.isVirtual()),
-        errorValidationMessage: ko.observable(false),
-        isCustomerLoggedIn: customer.isLoggedIn,
-        isFormPopUpVisible: formPopUpState.isVisible,
-        isFormInline: addressList().length === 0,
-        isNewAddressAdded: ko.observable(false),
-        saveInAddressBook: window.checkoutConfig.quoteData['edited_order_id'] == null,
-        quoteIsVirtual: quote.isVirtual(),
-
-        /**
-         * @return {exports}
-         */
-        initialize: function () {
-            let self = this,
-                hasNewAddress,
-                fieldsetName = 'checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset';
-
-            this._super();
-
-            if (!quote.isVirtual()) {
-                stepNavigator.registerStep(
-                    'shipping',
-                    '',
-                    $t('Shipping'),
-                    this.visible, _.bind(this.navigate, this),
-                    10
-                );
-            }
-
-            if((window.checkoutConfig.quoteData['edited_order_id'])&&(window.checkoutConfig.quoteData['edited_order_id']=='999999999')){
-                let selectAddress = window.checkoutConfig.quoteData['edited_order_address'];
-
-                let formattedAddressData = addressConverter.quoteAddressToFormAddressData(selectAddress);
-                let quoteshippingaddress = addressConverter.formAddressDataToQuoteAddress(formattedAddressData);
-
-                checkoutData.setNewCustomerShippingAddress(formattedAddressData);
-                selectShippingAddress(quoteshippingaddress);
-
-                checkoutData.setSelectedShippingAddress(quoteshippingaddress.getKey());
-                checkoutData.setShippingAddressFromData(formattedAddressData);
-            }
-
-            checkoutDataResolver.resolveShippingAddress();
-
-            hasNewAddress = addressList.some(function (address) {
-                return address.getType() == 'new-customer-address'; //eslint-disable-line eqeqeq
-            });
-            this.isNewAddressAdded(hasNewAddress);
-
-            this.isFormPopUpVisible.subscribe(function (value) {
-                if (value) {
-                    self.getPopUp().openModal();
-                }
-            });
-
-            quote.shippingMethod.subscribe(function () {
-                self.errorValidationMessage(false);
-            });
-            registry.async('checkoutProvider')(function (checkoutProvider) {
-                let shippingAddressData = checkoutData.getShippingAddressFromData();
-
-                if (shippingAddressData) {
-                    checkoutProvider.set(
-                        'shippingAddress',
-                        $.extend(true, {}, checkoutProvider.get('shippingAddress'), shippingAddressData)
-                    );
-                }
-                checkoutProvider.on('shippingAddress', function (shippingAddrsData) {
-                    checkoutData.setShippingAddressFromData(shippingAddrsData);
-                });
-                shippingRatesValidator.initFields(fieldsetName);
-            });
-
-            return this;
-        },
-
-        /**
-         * Navigator change hash handler.
-         *
-         * @param {Object} step - navigation step
-         */
-        navigate: function (step) {
-            step && step.isVisible(true);
-        },
-
-        /**
-         * @return {*}
-         */
-        getPopUp: function () {
-            let self = this,
-                buttons;
-
-            if (!popUp) {
-                buttons = this.popUpForm.options.buttons;
-                this.popUpForm.options.buttons = [
-                    {
-                        text: buttons.save.text ? buttons.save.text : $t('Save Address'),
-                        class: buttons.save.class ? buttons.save.class : 'action primary action-save-address',
-                        click: self.saveNewAddress.bind(self)
-                    },
-                    {
-                        text: buttons.cancel.text ? buttons.cancel.text : $t('Cancel'),
-                        class: buttons.cancel.class ? buttons.cancel.class : 'action secondary action-hide-popup',
-
-                        /** @inheritdoc */
-                        click: this.onClosePopUp.bind(this)
-                    }
-                ];
-
-                /** @inheritdoc */
-                this.popUpForm.options.closed = function () {
-                    self.isFormPopUpVisible(false);
-                };
-
-                this.popUpForm.options.modalCloseBtnHandler = this.onClosePopUp.bind(this);
-                this.popUpForm.options.keyEventHandlers = {
-                    escapeKey: this.onClosePopUp.bind(this)
-                };
-
-                /** @inheritdoc */
-                this.popUpForm.options.opened = function () {
-                    // Store temporary address for revert action in case when user click cancel action
-                    self.temporaryAddress = $.extend(true, {}, checkoutData.getShippingAddressFromData());
-                };
-                popUp = modal(this.popUpForm.options, $(this.popUpForm.element));
-            }
-
-            return popUp;
-        },
-
-        /**
-         * Revert address and close modal.
-         */
-        onClosePopUp: function () {
-            checkoutData.setShippingAddressFromData($.extend(true, {}, this.temporaryAddress));
-            this.getPopUp().closeModal();
-        },
-
-        /**
-         * Show address form popup
-         */
-        showFormPopUp: function () {
-            this.isFormPopUpVisible(true);
-        },
-
-        /**
-         * Save new shipping address
-         */
-        saveNewAddress: function () {
-            let addressData,
-                newShippingAddress;
-
-            this.source.set('params.invalid', false);
-            this.triggerShippingDataValidateEvent();
-
-            if (!this.source.get('params.invalid')) {
-                addressData = this.source.get('shippingAddress');
-                // if user clicked the checkbox, its value is true or false. Need to convert.
-                addressData['save_in_address_book'] = this.saveInAddressBook ? 1 : 0;
-
-                // New address must be selected as a shipping address
-                newShippingAddress = createShippingAddress(addressData);
-                selectShippingAddress(newShippingAddress);
-                checkoutData.setSelectedShippingAddress(newShippingAddress.getKey());
-                checkoutData.setNewCustomerShippingAddress($.extend(true, {}, addressData));
-                this.getPopUp().closeModal();
-                this.isNewAddressAdded(true);
-            }
-        },
-
-        /**
-         * Shipping Method View
-         */
-        rates: shippingService.getShippingRates(),
-        isLoading: shippingService.isLoading,
-        isSelected: ko.computed(function () {
-            return quote.shippingMethod() ?
-                quote.shippingMethod()['carrier_code'] + '_' + quote.shippingMethod()['method_code'] :
-                null;
-        }),
-
-        /**
-         * @param {Object} shippingMethod
-         * @return {Boolean}
-         */
-        selectShippingMethod: function (shippingMethod) {
-            selectShippingMethodAction(shippingMethod);
-            checkoutData.setSelectedShippingRate(shippingMethod['carrier_code'] + '_' + shippingMethod['method_code']);
-
-            return true;
-        },
-
-        /**
-         * Set shipping information handler
-         */
-        setShippingInformation: function () {
-            if (this.validateShippingInformation()) {
-                quote.billingAddress(null);
-                checkoutDataResolver.resolveBillingAddress();
-                setShippingInformationAction().done(
-                    function () {
-                        stepNavigator.next();
-                    }
-                );
-            }
-        },
-
-        /**
-         * @return {Boolean}
-         */
-        validateShippingInformation: function () {
-            let shippingAddress,
-                addressData,
-                loginFormSelector = 'form[data-role=email-with-possible-login]',
-                emailValidationResult = customer.isLoggedIn(),
-                field,
-                country = registry.get(this.parentName + '.shippingAddress.shipping-address-fieldset.country_id'),
-                countryIndexedOptions = country.indexedOptions,
-                option = countryIndexedOptions[quote.shippingAddress().countryId],
-                messageContainer = registry.get('checkout.errors').messageContainer;
-
-            if (!quote.shippingMethod()) {
-                this.errorValidationMessage(
-                    $t('The shipping method is missing. Select the shipping method and try again.')
-                );
-
-                return false;
-            }
-
-            if (!customer.isLoggedIn()) {
-                $(loginFormSelector).validation();
-                emailValidationResult = Boolean($(loginFormSelector + ' input[name=username]').valid());
-            }
-
-            if (this.isFormInline) {
-                this.source.set('params.invalid', false);
-                this.triggerShippingDataValidateEvent();
-
-                if (emailValidationResult &&
-                    this.source.get('params.invalid') ||
-                    !quote.shippingMethod()['method_code'] ||
-                    !quote.shippingMethod()['carrier_code']
-                ) {
-                    this.focusInvalid();
-
-                    return false;
-                }
-
-                shippingAddress = quote.shippingAddress();
-                addressData = addressConverter.formAddressDataToQuoteAddress(
-                    this.source.get('shippingAddress')
-                );
-
-                //Copy form data to quote shipping address object
-                for (field in addressData) {
-                    if (addressData.hasOwnProperty(field) &&  //eslint-disable-line max-depth
-                        shippingAddress.hasOwnProperty(field) &&
-                        typeof addressData[field] != 'function' &&
-                        _.isEqual(shippingAddress[field], addressData[field])
-                    ) {
-                        shippingAddress[field] = addressData[field];
-                    } else if (typeof addressData[field] != 'function' &&
-                        !_.isEqual(shippingAddress[field], addressData[field])) {
-                        shippingAddress = addressData;
-                        break;
-                    }
-                }
-
-                if (customer.isLoggedIn()) {
-                    shippingAddress['save_in_address_book'] = 1;
-                }
-                selectShippingAddress(shippingAddress);
-            } else if (customer.isLoggedIn() &&
-                option &&
-                option['is_region_required'] &&
-                !quote.shippingAddress().region
-            ) {
-                messageContainer.addErrorMessage({
-                    message: $t('Please specify a regionId in shipping address.')
-                });
-
-                return false;
-            }
-
-            if (!emailValidationResult) {
-                $(loginFormSelector + ' input[name=username]').focus();
-
-                return false;
-            }
-
-            return true;
-        },
-
-        /**
-         * Trigger Shipping data Validate Event.
-         */
-        triggerShippingDataValidateEvent: function () {
-            this.source.trigger('shippingAddress.data.validate');
-
-            if (this.source.get('shippingAddress.custom_attributes')) {
-                this.source.trigger('shippingAddress.custom_attributes.data.validate');
-            }
-        }
-    });
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'underscore',
+    'Magento_Ui/js/form/form',
+    'ko',
+    'Magento_Customer/js/model/customer',
+    'Magento_Customer/js/model/address-list',
+    'Magento_Checkout/js/model/address-converter',
+    'Magento_Checkout/js/model/quote',
+    'Magento_Checkout/js/action/create-shipping-address',
+    'Magento_Checkout/js/action/select-shipping-address',
+    'Magento_Checkout/js/model/shipping-rates-validator',
+    'Magento_Checkout/js/model/shipping-address/form-popup-state',
+    'Magento_Checkout/js/model/shipping-service',
+    'Magento_Checkout/js/action/select-shipping-method',
+    'Magento_Checkout/js/model/shipping-rate-registry',
+    'Magento_Checkout/js/action/set-shipping-information',
+    'Magento_Checkout/js/model/step-navigator',
+    'Magento_Ui/js/modal/modal',
+    'Magento_Checkout/js/model/checkout-data-resolver',
+    'Magento_Checkout/js/checkout-data',
+    'uiRegistry',
+    'mage/translate',
+    'Magento_Checkout/js/model/shipping-rate-service'
+], function (
+    $,
+    _,
+    Component,
+    ko,
+    customer,
+    addressList,
+    addressConverter,
+    quote,
+    createShippingAddress,
+    selectShippingAddress,
+    shippingRatesValidator,
+    formPopUpState,
+    shippingService,
+    selectShippingMethodAction,
+    rateRegistry,
+    setShippingInformationAction,
+    stepNavigator,
+    modal,
+    checkoutDataResolver,
+    checkoutData,
+    registry,
+    $t
+) {
+    'use strict';
+
+    let popUp = null;
+
+    return Component.extend({
+        defaults: {
+            template: 'Magento_Checkout/shipping',
+            shippingFormTemplate: 'Magento_Checkout/shipping-address/form',
+            shippingMethodListTemplate: 'Magento_Checkout/shipping-address/shipping-method-list',
+            shippingMethodItemTemplate: 'Magento_Checkout/shipping-address/shipping-method-item'
+        },
+        visible: ko.observable(!quote.isVirtual()),
+        errorValidationMessage: ko.observable(false),
+        isCustomerLoggedIn: customer.isLoggedIn,
+        isFormPopUpVisible: formPopUpState.isVisible,
+        isFormInline: addressList().length === 0,
+        isNewAddressAdded: ko.observable(false),
+        saveInAddressBook: window.checkoutConfig.quoteData['edited_order_id'] == null,
+        quoteIsVirtual: quote.isVirtual(),
+
+        /**
+         * @return {exports}
+         */
+        initialize: function () {
+            let self = this,
+                hasNewAddress,
+                fieldsetName = 'checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset';
+
+            this._super();
+
+            if (!quote.isVirtual()) {
+                stepNavigator.registerStep(
+                    'shipping',
+                    '',
+                    $t('Shipping'),
+                    this.visible, _.bind(this.navigate, this),
+                    10
+                );
+            }
+
+            if((window.checkoutConfig.quoteData['edited_order_id'])&&(window.checkoutConfig.quoteData['edited_order_id']=='999999999')){
+                let selectAddress = window.checkoutConfig.quoteData['edited_order_address'];
+
+                let formattedAddressData = addressConverter.quoteAddressToFormAddressData(selectAddress);
+                let quoteshippingaddress = addressConverter.formAddressDataToQuoteAddress(formattedAddressData);
+
+                checkoutData.setNewCustomerShippingAddress(formattedAddressData);
+                selectShippingAddress(quoteshippingaddress);
+
+                checkoutData.setSelectedShippingAddress(quoteshippingaddress.getKey());
+                checkoutData.setShippingAddressFromData(formattedAddressData);
+            }
+
+            checkoutDataResolver.resolveShippingAddress();
+
+            hasNewAddress = addressList.some(function (address) {
+                return address.getType() == 'new-customer-address'; //eslint-disable-line eqeqeq
+            });
+            this.isNewAddressAdded(hasNewAddress);
+
+            this.isFormPopUpVisible.subscribe(function (value) {
+                if (value) {
+                    self.getPopUp().openModal();
+                }
+            });
+
+            quote.shippingMethod.subscribe(function () {
+                self.errorValidationMessage(false);
+            });
+            registry.async('checkoutProvider')(function (checkoutProvider) {
+                let shippingAddressData = checkoutData.getShippingAddressFromData();
+
+                if (shippingAddressData) {
+                    checkoutProvider.set(
+                        'shippingAddress',
+                        $.extend(true, {}, checkoutProvider.get('shippingAddress'), shippingAddressData)
+                    );
+                }
+                checkoutProvider.on('shippingAddress', function (shippingAddrsData) {
+                    checkoutData.setShippingAddressFromData(shippingAddrsData);
+                });
+                shippingRatesValidator.initFields(fieldsetName);
+            });
+
+            return this;
+        },
+
+        /**
+         * Navigator change hash handler.
+         *
+         * @param {Object} step - navigation step
+         */
+        navigate: function (step) {
+            step && step.isVisible(true);
+        },
+
+        /**
+         * @return {*}
+         */
+        getPopUp: function () {
+            let self = this,
+                buttons;
+
+            if (!popUp) {
+                buttons = this.popUpForm.options.buttons;
+                this.popUpForm.options.buttons = [
+                    {
+                        text: buttons.save.text ? buttons.save.text : $t('Save Address'),
+                        class: buttons.save.class ? buttons.save.class : 'action primary action-save-address',
+                        click: self.saveNewAddress.bind(self)
+                    },
+                    {
+                        text: buttons.cancel.text ? buttons.cancel.text : $t('Cancel'),
+                        class: buttons.cancel.class ? buttons.cancel.class : 'action secondary action-hide-popup',
+
+                        /** @inheritdoc */
+                        click: this.onClosePopUp.bind(this)
+                    }
+                ];
+
+                /** @inheritdoc */
+                this.popUpForm.options.closed = function () {
+                    self.isFormPopUpVisible(false);
+                };
+
+                this.popUpForm.options.modalCloseBtnHandler = this.onClosePopUp.bind(this);
+                this.popUpForm.options.keyEventHandlers = {
+                    escapeKey: this.onClosePopUp.bind(this)
+                };
+
+                /** @inheritdoc */
+                this.popUpForm.options.opened = function () {
+                    // Store temporary address for revert action in case when user click cancel action
+                    self.temporaryAddress = $.extend(true, {}, checkoutData.getShippingAddressFromData());
+                };
+                popUp = modal(this.popUpForm.options, $(this.popUpForm.element));
+            }
+
+            return popUp;
+        },
+
+        /**
+         * Revert address and close modal.
+         */
+        onClosePopUp: function () {
+            checkoutData.setShippingAddressFromData($.extend(true, {}, this.temporaryAddress));
+            this.getPopUp().closeModal();
+        },
+
+        /**
+         * Show address form popup
+         */
+        showFormPopUp: function () {
+            this.isFormPopUpVisible(true);
+        },
+
+        /**
+         * Save new shipping address
+         */
+        saveNewAddress: function () {
+            let addressData,
+                newShippingAddress;
+
+            this.source.set('params.invalid', false);
+            this.triggerShippingDataValidateEvent();
+
+            console.log('saving address');
+            console.log(this.source.get('shippingAddress.firstname'));
+            console.log(this.source.get('shippingAddress.lastname'));
+            console.log(this.source.get('shippingAddress.company'));
+            console.log(this.source.get('shippingAddress.city'));
+            console.log(this.source.get('shippingAddress.postcode'));
+            console.log(this.source.get('shippingAddress.telephone'));
+            
+            var htmlPattern = /<.*?>/;
+
+            var fields = [
+                { name: 'street[0]', value: this.source.get('shippingAddress.street.0') },
+                { name: 'firstname', value: this.source.get('shippingAddress.firstname') },
+                { name: 'lastname', value: this.source.get('shippingAddress.lastname') },
+                { name: 'company', value: this.source.get('shippingAddress.company') },
+                { name: 'city', value: this.source.get('shippingAddress.city') },
+                { name: 'postcode', value: this.source.get('shippingAddress.postcode') },
+                { name: 'telephone', value: this.source.get('shippingAddress.telephone') }
+            ];
+
+            var hasError = false;
+
+            fields.forEach(function (field) {
+                var $field = $('input[name="' + field.name + '"]');
+
+                if (htmlPattern.test(field.value)) {
+                    hasError = true;
+
+                    // Add error styles
+                    $field.addClass('mage-error').attr('aria-invalid', 'true');
+
+                    // Add error message if not already present
+                    if ($field.next('.mage-error').length === 0) {
+                        $('<div class="mage-error" generated="true">HTML tags are not allowed in address.</div>')
+                            .insertAfter($field);
+                    }
+                } else {
+                    // Remove error styles if no error
+                    $field.removeClass('mage-error').attr('aria-invalid', 'false');
+
+                    // Remove existing error message
+                    if ($field.next('.mage-error[generated="true"]').length) {
+                        $field.next('.mage-error[generated="true"]').remove();
+                    }
+                }
+            });
+
+            if (hasError) {
+                console.log('Validation error: HTML tags detected.');
+                return false; // stop processing
+            }
+
+
+            if (!this.source.get('params.invalid')) {
+                addressData = this.source.get('shippingAddress');
+                // if user clicked the checkbox, its value is true or false. Need to convert.
+                addressData['save_in_address_book'] = this.saveInAddressBook ? 1 : 0;
+
+                // New address must be selected as a shipping address
+                newShippingAddress = createShippingAddress(addressData);
+                selectShippingAddress(newShippingAddress);
+                checkoutData.setSelectedShippingAddress(newShippingAddress.getKey());
+                checkoutData.setNewCustomerShippingAddress($.extend(true, {}, addressData));
+                this.getPopUp().closeModal();
+                this.isNewAddressAdded(true);
+            }
+        },
+
+        /**
+         * Shipping Method View
+         */
+        rates: shippingService.getShippingRates(),
+        isLoading: shippingService.isLoading,
+        isSelected: ko.computed(function () {
+            return quote.shippingMethod() ?
+                quote.shippingMethod()['carrier_code'] + '_' + quote.shippingMethod()['method_code'] :
+                null;
+        }),
+
+        /**
+         * @param {Object} shippingMethod
+         * @return {Boolean}
+         */
+        selectShippingMethod: function (shippingMethod) {
+            selectShippingMethodAction(shippingMethod);
+            checkoutData.setSelectedShippingRate(shippingMethod['carrier_code'] + '_' + shippingMethod['method_code']);
+
+            return true;
+        },
+
+        /**
+         * Set shipping information handler
+         */
+        setShippingInformation: function () {
+            if (this.validateShippingInformation()) {
+                quote.billingAddress(null);
+                checkoutDataResolver.resolveBillingAddress();
+                setShippingInformationAction().done(
+                    function () {
+                        stepNavigator.next();
+                    }
+                );
+            }
+        },
+
+        /**
+         * @return {Boolean}
+         */
+        validateShippingInformation: function () {
+            let shippingAddress,
+                addressData,
+                loginFormSelector = 'form[data-role=email-with-possible-login]',
+                emailValidationResult = customer.isLoggedIn(),
+                field,
+                country = registry.get(this.parentName + '.shippingAddress.shipping-address-fieldset.country_id'),
+                countryIndexedOptions = country.indexedOptions,
+                option = countryIndexedOptions[quote.shippingAddress().countryId],
+                messageContainer = registry.get('checkout.errors').messageContainer;
+
+            if (!quote.shippingMethod()) {
+                this.errorValidationMessage(
+                    $t('The shipping method is missing. Select the shipping method and try again.')
+                );
+
+                return false;
+            }
+
+            if (!customer.isLoggedIn()) {
+                $(loginFormSelector).validation();
+                emailValidationResult = Boolean($(loginFormSelector + ' input[name=username]').valid());
+            }
+
+            if (this.isFormInline) {
+                this.source.set('params.invalid', false);
+                this.triggerShippingDataValidateEvent();
+
+                if (emailValidationResult &&
+                    this.source.get('params.invalid') ||
+                    !quote.shippingMethod()['method_code'] ||
+                    !quote.shippingMethod()['carrier_code']
+                ) {
+                    this.focusInvalid();
+
+                    return false;
+                }
+
+                shippingAddress = quote.shippingAddress();
+                addressData = addressConverter.formAddressDataToQuoteAddress(
+                    this.source.get('shippingAddress')
+                );
+
+                //Copy form data to quote shipping address object
+                for (field in addressData) {
+                    if (addressData.hasOwnProperty(field) &&  //eslint-disable-line max-depth
+                        shippingAddress.hasOwnProperty(field) &&
+                        typeof addressData[field] != 'function' &&
+                        _.isEqual(shippingAddress[field], addressData[field])
+                    ) {
+                        shippingAddress[field] = addressData[field];
+                    } else if (typeof addressData[field] != 'function' &&
+                        !_.isEqual(shippingAddress[field], addressData[field])) {
+                        shippingAddress = addressData;
+                        break;
+                    }
+                }
+
+                if (customer.isLoggedIn()) {
+                    shippingAddress['save_in_address_book'] = 1;
+                }
+                selectShippingAddress(shippingAddress);
+            } else if (customer.isLoggedIn() &&
+                option &&
+                option['is_region_required'] &&
+                !quote.shippingAddress().region
+            ) {
+                messageContainer.addErrorMessage({
+                    message: $t('Please specify a regionId in shipping address.')
+                });
+
+                return false;
+            }
+
+            if (!emailValidationResult) {
+                $(loginFormSelector + ' input[name=username]').focus();
+
+                return false;
+            }
+
+            return true;
+        },
+
+        /**
+         * Trigger Shipping data Validate Event.
+         */
+        triggerShippingDataValidateEvent: function () {
+            this.source.trigger('shippingAddress.data.validate');
+
+            if (this.source.get('shippingAddress.custom_attributes')) {
+                this.source.trigger('shippingAddress.custom_attributes.data.validate');
+            }
+        }
+    });
 });
\ No newline at end of file
--- a/app/design/frontend/DCKAP/DDI/Magento_Customer/templates/address/edit.phtml	2025-07-04 15:55:15.083102496 +0530
+++ b/app/design/frontend/DCKAP/DDI/Magento_Customer/templates/address/edit-new.phtml	2025-07-10 09:30:02.106877432 +0530
@@ -1,212 +1,234 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/** @var \Magento\Customer\Block\Address\Edit $block */
-?>
-<?php $_company = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Company::class) ?>
-<?php $_telephone = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Telephone::class) ?>
-<?php $_fax = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Fax::class) ?>
-<?php
-$addressID = $this->getRequest()->getParams();
-$params['id'] = ((isset($addressID['id']) && $addressID['id'] != '')? $addressID['id']: "");
-$AddressData = $this->helper('DCKAP\AccountCreation\Helper\Data');
-$is_billing = $AddressData->isDefaultAddress('billing', $params['id']);
-$is_shipping = $AddressData->isDefaultAddress('shipping', $params['id']);
-$user_erp_no = $block->getAddress()->getCustomAttribute('erp_account_number');
-$erp_account_number = isset($user_erp_no) ? $user_erp_no->getValue(): "";
-$user_ddi_no = $block->getAddress()->getCustomAttribute('ddi_ship_number');
-$ddi_ship_number = ((isset($user_ddi_no) && $user_ddi_no != '')? $user_ddi_no->getValue(): "");
-?>
-<form class="form-address-edit"
-      action="<?= $block->escapeUrl($block->getSaveUrl()) ?>"
-      method="post"
-      id="form-validate"
-      enctype="multipart/form-data"
-      data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
-    <fieldset class="fieldset">
-        <legend class="legend"><span><?= $block->escapeHtml(__('Contact Information')) ?></span></legend><br>
-        <?= $block->getBlockHtml('formkey') ?>
-        <input type="hidden" name="success_url" value="<?= $block->escapeUrl($block->getSuccessUrl()) ?>">
-        <input type="hidden" name="error_url" value="<?= $block->escapeUrl($block->getErrorUrl()) ?>">
-        <?= $block->getNameBlockHtml() ?>
-
-        <?php if ($_company->isEnabled()) : ?>
-            <?= $_company->setCompany($block->getAddress()->getCompany())->toHtml() ?>
-        <?php endif ?>
-
-        <?php if ($_telephone->isEnabled()) : ?>
-            <?= $_telephone->setTelephone($block->getAddress()->getTelephone())->toHtml() ?>
-        <?php endif ?>
-
-        <?php if ($_fax->isEnabled()) : ?>
-            <?= $_fax->setFax($block->getAddress()->getFax())->toHtml() ?>
-        <?php endif ?>
-
-    </fieldset>
-    <fieldset class="fieldset">
-        <legend class="legend"><span><?= $block->escapeHtml(__('Address')) ?></span></legend><br>
-        <?php $_streetValidationClass = $this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('street'); ?>
-        <div class="field street required">
-            <label for="street_1" class="label">
-                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?></span>
-            </label>
-            <div class="control">
-                <input type="text"
-                       name="street[]"
-                       value="<?= $block->escapeHtmlAttr($block->getStreetLine(1)) ?>"
-                       title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?>"
-                       id="street_1"
-                       class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>"/>
-                <div class="nested">
-                    <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
-                    <?php for ($_i = 1, $_n = $this->helper(\Magento\Customer\Helper\Address::class)->getStreetLines(); $_i < $_n; $_i++) : ?>
-                        <div class="field additional">
-                            <label class="label" for="street_<?= /* @noEscape */ $_i + 1 ?>">
-                                <span><?= $block->escapeHtml(__('Street Address %1', $_i + 1)) ?></span>
-                            </label>
-                            <div class="control">
-                                <input type="text" name="street[]"
-                                       value="<?= $block->escapeHtmlAttr($block->getStreetLine($_i + 1)) ?>"
-                                       title="<?= $block->escapeHtmlAttr(__('Street Address %1', $_i + 1)) ?>"
-                                       id="street_<?= /* @noEscape */ $_i + 1 ?>"
-                                       class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
-                            </div>
-                        </div>
-                    <?php endfor; ?>
-                </div>
-            </div>
-        </div>
-
-        <?php if ($this->helper(\Magento\Customer\Helper\Address::class)->isVatAttributeVisible()) : ?>
-            <div class="field taxvat">
-                <label class="label" for="vat_id">
-                    <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('vat_id') ?></span>
-                </label>
-                <div class="control">
-                    <input type="text"
-                           name="vat_id"
-                           value="<?= $block->escapeHtmlAttr($block->getAddress()->getVatId()) ?>"
-                           title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('vat_id') ?>"
-                           class="input-text <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('vat_id')) ?>"
-                           id="vat_id">
-                </div>
-            </div>
-        <?php endif; ?>
-        <div class="field city required">
-            <label class="label" for="city"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?></span></label>
-            <div class="control">
-                <input type="text"
-                       name="city"
-                       value="<?= $block->escapeHtmlAttr($block->getAddress()->getCity()) ?>"
-                       title="<?= $block->escapeHtmlAttr(__('City')) ?>"
-                       class="input-text <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('city')) ?>"
-                       id="city">
-            </div>
-        </div>
-        <div class="field region required">
-            <label class="label" for="region_id">
-                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?></span>
-            </label>
-            <div class="control">
-                <select id="region_id" name="region_id"
-                        title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>"
-                        class="validate-select region_id" <?= /* @noEscape */ !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>>
-                    <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
-                </select>
-                <input type="text"
-                       id="region"
-                       name="region"
-                       value="<?= $block->escapeHtmlAttr($block->getRegion()) ?>"
-                       title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>"
-                       class="input-text validate-not-number-first <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('region')) ?>"<?= !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>/>
-            </div>
-        </div>
-        <div class="field zip required">
-            <label class="label" for="zip">
-                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?></span>
-            </label>
-            <div class="control">
-                <input type="text"
-                       name="postcode"
-                       value="<?= $block->escapeHtmlAttr($block->getAddress()->getPostcode()) ?>"
-                       title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>"
-                       id="zip"
-                       class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('postcode')) ?>">
-                <div role="alert" class="message warning" style="display:none">
-                    <span></span>
-                </div>
-            </div>
-        </div>
-        <div class="field country required">
-            <label class="label" for="country"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('country_id') ?></span></label>
-            <div class="control">
-                <?= $block->getCountryHtmlSelect() ?>
-            </div>
-        </div>
-
-        <?php if ($is_shipping == '1' && $is_billing == '1') : 
-            $is_default_address = 3;?>
-             <div class="message info">
-                <span><?= $block->escapeHtml(__("It's a default billing address.")) ?></span>
-            </div>
-            <div class="message info">
-                <span><?= $block->escapeHtml(__("It's a default shipping address.")) ?></span>
-            </div>
-        <?php elseif ($is_billing == '1') : 
-            $is_default_address = 2;?>
-            <div class="message info">
-                <span><?= $block->escapeHtml(__("It's a default billing address.")) ?></span>
-            </div>
-
-        <?php elseif ($is_shipping == '1') : 
-            $is_default_address = 1;?>
-            <div class="message info">
-                <span><?= $block->escapeHtml(__("It's a default shipping address.")) ?></span>
-            </div>
-        <?php else : 
-            $is_default_address = 0;?>
-        <?php endif; ?>
-        <input type="hidden" name="erp_account_number" value="<?= $erp_account_number ?>" />
-        <input type="hidden" name="ddi_ship_number" value="<?= $ddi_ship_number ?>" />
-        <input type="hidden" name="is_default_address" value="<?= $is_default_address ?>" />
-    </fieldset>
-    <div class="actions-toolbar">
-        <div class="primary">
-            <button type="submit"
-                    class="action save primary"
-                    data-action="save-address"
-                    title="<?= $block->escapeHtmlAttr(__('Save Address')) ?>">
-                <span><?= $block->escapeHtml(__('Save Address')) ?></span>
-            </button>
-        </div>
-        <div class="secondary">
-            <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>">
-                <span><?= $block->escapeHtml(__('Go back')) ?></span>
-            </a>
-        </div>
-    </div>
-</form>
-<script type="text/x-magento-init">
-    {
-        "#form-validate": {
-            "addressValidation": {
-                "postCodes": <?= /* @noEscape */ $block->getPostCodeConfig()->getSerializedPostCodes(); ?>
-            }
-        },
-        "#country": {
-            "regionUpdater": {
-                "optionalRegionAllowed": <?= /* @noEscape */ $block->getConfig('general/region/display_all') ? 'true' : 'false' ?>,
-                "regionListId": "#region_id",
-                "regionInputId": "#region",
-                "postcodeId": "#zip",
-                "form": "#form-validate",
-                "regionJson": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>,
-                "defaultRegion": "<?= (int) $block->getRegionId() ?>",
-                "countriesWithOptionalZip": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getCountriesWithOptionalZip(true) ?>
-            }
-        }
-    }
-</script>
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Customer\Block\Address\Edit $block */
+?>
+<?php $_company = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Company::class) ?>
+<?php $_telephone = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Telephone::class) ?>
+<?php $_fax = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Fax::class) ?>
+<?php
+$addressID = $this->getRequest()->getParams();
+$params['id'] = ((isset($addressID['id']) && $addressID['id'] != '')? $addressID['id']: "");
+$AddressData = $this->helper('DCKAP\AccountCreation\Helper\Data');
+$is_billing = $AddressData->isDefaultAddress('billing', $params['id']);
+$is_shipping = $AddressData->isDefaultAddress('shipping', $params['id']);
+$user_erp_no = $block->getAddress()->getCustomAttribute('erp_account_number');
+$erp_account_number = isset($user_erp_no) ? $user_erp_no->getValue(): "";
+$user_ddi_no = $block->getAddress()->getCustomAttribute('ddi_ship_number');
+$ddi_ship_number = ((isset($user_ddi_no) && $user_ddi_no != '')? $user_ddi_no->getValue(): "");
+?>
+<form class="form-address-edit"
+      action="<?= $block->escapeUrl($block->getSaveUrl()) ?>"
+      method="post"
+      id="form-validate"
+      enctype="multipart/form-data"
+      data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
+    <fieldset class="fieldset">
+        <legend class="legend"><span><?= $block->escapeHtml(__('Contact Information')) ?></span></legend><br>
+        <?= $block->getBlockHtml('formkey') ?>
+        <input type="hidden" name="success_url" value="<?= $block->escapeUrl($block->getSuccessUrl()) ?>">
+        <input type="hidden" name="error_url" value="<?= $block->escapeUrl($block->getErrorUrl()) ?>">
+        <?= $block->getNameBlockHtml() ?>
+
+        <?php if ($_company->isEnabled()) : ?>
+            <?= $_company->setCompany($block->getAddress()->getCompany())->toHtml() ?>
+        <?php endif ?>
+
+        <?php if ($_telephone->isEnabled()) : ?>
+            <?= $_telephone->setTelephone($block->getAddress()->getTelephone())->toHtml() ?>
+        <?php endif ?>
+
+        <?php if ($_fax->isEnabled()) : ?>
+            <?= $_fax->setFax($block->getAddress()->getFax())->toHtml() ?>
+        <?php endif ?>
+
+    </fieldset>
+    <fieldset class="fieldset">
+        <legend class="legend"><span><?= $block->escapeHtml(__('Address')) ?></span></legend><br>
+        <?php $_streetValidationClass = $this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('street'); ?>
+        <div class="field street required">
+            <label for="street_1" class="label">
+                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?></span>
+            </label>
+            <div class="control">
+                <input type="text"
+                       name="street[]"
+                       data-validate="{'noHtmlTags':true}"
+                       value="<?= $block->escapeHtmlAttr($block->getStreetLine(1)) ?>"
+                       title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?>"
+                       id="street_1"
+                       class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>"/>
+                <div class="nested">
+                    <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
+                    <?php for ($_i = 1, $_n = $this->helper(\Magento\Customer\Helper\Address::class)->getStreetLines(); $_i < $_n; $_i++) : ?>
+                        <div class="field additional">
+                            <label class="label" for="street_<?= /* @noEscape */ $_i + 1 ?>">
+                                <span><?= $block->escapeHtml(__('Street Address %1', $_i + 1)) ?></span>
+                            </label>
+                            <div class="control">
+                                <input type="text" name="street[]" 
+                                       value="<?= $block->escapeHtmlAttr($block->getStreetLine($_i + 1)) ?>"
+                                       title="<?= $block->escapeHtmlAttr(__('Street Address %1', $_i + 1)) ?>"
+                                       id="street_<?= /* @noEscape */ $_i + 1 ?>"
+                                       class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
+                            </div>
+                        </div>
+                    <?php endfor; ?>
+                </div>
+            </div>
+        </div>
+
+        <?php if ($this->helper(\Magento\Customer\Helper\Address::class)->isVatAttributeVisible()) : ?>
+            <div class="field taxvat">
+                <label class="label" for="vat_id">
+                    <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('vat_id') ?></span>
+                </label>
+                <div class="control">
+                    <input type="text"
+                           name="vat_id"
+                           value="<?= $block->escapeHtmlAttr($block->getAddress()->getVatId()) ?>"
+                           title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('vat_id') ?>"
+                           class="input-text <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('vat_id')) ?>"
+                           id="vat_id">
+                </div>
+            </div>
+        <?php endif; ?>
+        <div class="field city required">
+            <label class="label" for="city"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?></span></label>
+            <div class="control">
+                <input type="text"
+                       name="city"
+                       value="<?= $block->escapeHtmlAttr($block->getAddress()->getCity()) ?>"
+                       title="<?= $block->escapeHtmlAttr(__('City')) ?>"
+                       class="input-text <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('city')) ?>"
+                       id="city" data-validate="{'noHtmlTags':true}">
+            </div>
+        </div>
+        <div class="field region required">
+            <label class="label" for="region_id">
+                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?></span>
+            </label>
+            <div class="control">
+                <select id="region_id" name="region_id"
+                        title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>"
+                        class="validate-select region_id" <?= /* @noEscape */ !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>>
+                    <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
+                </select>
+                <input type="text"
+                       id="region"
+                       name="region"
+                       value="<?= $block->escapeHtmlAttr($block->getRegion()) ?>"
+                       title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>"
+                       class="input-text validate-not-number-first <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('region')) ?>"<?= !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>/>
+            </div>
+        </div>
+        <div class="field zip required">
+            <label class="label" for="zip">
+                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?></span>
+            </label>
+            <div class="control">
+                <input type="text"
+                       name="postcode"
+                       value="<?= $block->escapeHtmlAttr($block->getAddress()->getPostcode()) ?>"
+                       title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>"
+                       id="zip"
+                       data-validate="{'noHtmlTags':true}"
+                       class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('postcode')) ?>">
+                <div role="alert" class="message warning" style="display:none">
+                    <span></span>
+                </div>
+            </div>
+        </div>
+        <div class="field country required">
+            <label class="label" for="country"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('country_id') ?></span></label>
+            <div class="control">
+                <?= $block->getCountryHtmlSelect() ?>
+            </div>
+        </div>
+
+        <?php if ($is_shipping == '1' && $is_billing == '1') : 
+            $is_default_address = 3;?>
+             <div class="message info">
+                <span><?= $block->escapeHtml(__("It's a default billing address.")) ?></span>
+            </div>
+            <div class="message info">
+                <span><?= $block->escapeHtml(__("It's a default shipping address.")) ?></span>
+            </div>
+        <?php elseif ($is_billing == '1') : 
+            $is_default_address = 2;?>
+            <div class="message info">
+                <span><?= $block->escapeHtml(__("It's a default billing address.")) ?></span>
+            </div>
+
+        <?php elseif ($is_shipping == '1') : 
+            $is_default_address = 1;?>
+            <div class="message info">
+                <span><?= $block->escapeHtml(__("It's a default shipping address.")) ?></span>
+            </div>
+        <?php else : 
+            $is_default_address = 0;?>
+        <?php endif; ?>
+        <input type="hidden" name="erp_account_number" value="<?= $erp_account_number ?>" />
+        <input type="hidden" name="ddi_ship_number" value="<?= $ddi_ship_number ?>" />
+        <input type="hidden" name="is_default_address" value="<?= $is_default_address ?>" />
+    </fieldset>
+    <div class="actions-toolbar">
+        <div class="primary">
+            <button type="submit"
+                    class="action save primary"
+                    data-action="save-address"
+                    title="<?= $block->escapeHtmlAttr(__('Save Address')) ?>">
+                <span><?= $block->escapeHtml(__('Save Address')) ?></span>
+            </button>
+        </div>
+        <div class="secondary">
+            <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>">
+                <span><?= $block->escapeHtml(__('Go back')) ?></span>
+            </a>
+        </div>
+    </div>
+</form>
+<script type="text/x-magento-init">
+    {
+        "#form-validate": {
+            "addressValidation": {
+                "postCodes": <?= /* @noEscape */ $block->getPostCodeConfig()->getSerializedPostCodes(); ?>
+            }
+        },
+        "#country": {
+            "regionUpdater": {
+                "optionalRegionAllowed": <?= /* @noEscape */ $block->getConfig('general/region/display_all') ? 'true' : 'false' ?>,
+                "regionListId": "#region_id",
+                "regionInputId": "#region",
+                "postcodeId": "#zip",
+                "form": "#form-validate",
+                "regionJson": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>,
+                "defaultRegion": "<?= (int) $block->getRegionId() ?>",
+                "countriesWithOptionalZip": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getCountriesWithOptionalZip(true) ?>
+            }
+        }
+    }
+</script>
+<script>
+    require([
+        'jquery',
+        'mage/mage',
+        'jquery/validate',
+        'mage/translate'
+    ], function($){
+
+        //var dataForm = $('#form-validate');
+
+        $.validator.addMethod(
+            "noHtmlTags",
+            function(value, element) {
+                return this.optional(element) || !/[<>]/g.test(value);
+            },
+            $.mage.__("HTML tags are not allowed.")
+        );
+
+    });
+</script>
\ No newline at end of file
--- a/app/design/frontend/DCKAP/DDI/Magento_Customer/templates/form/register.phtml	2025-07-09 10:33:22.195442784 +0530
+++ b/app/design/frontend/DCKAP/DDI/Magento_Customer/templates/form/register-new.phtml	2025-07-10 09:38:31.810662295 +0530
@@ -1,275 +1,283 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-
-/** @var \Magento\Customer\Block\Form\Register $block */
-$extensionHelper = $this->helper('DCKAP\Extension\Helper\Data');
-$ecommUserData = $extensionHelper->getErpEcommUserData();
-$StateCollection=[];
-if( isset($ecommUserData)  &&  $ecommUserData !='' ) {
-    $statecode = $ecommUserData['billState'];
-    $country =$ecommUserData['billCountry'];
-    if(empty($country)){
-        $country ="US";
-    }
-    if (isset($statecode) && $statecode!='') {
-        $StateCollection = $extensionHelper->getRegionCodeDetials($statecode,$country);
-    }
-}
-?>
-<?= $block->getChildHtml('form_fields_before') ?>
-<?php /* Extensions placeholder */ ?>
-<?= $block->getChildHtml('customer.form.register.extra') ?>
-<form class="form create account form-create-account" action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>" method="post" id="form-validate" enctype="multipart/form-data" autocomplete="off">
-  <?= /* @noEscape */ $block->getBlockHtml('formkey'); ?>
-    <fieldset class="fieldset create info">
-        <legend class="legend"><span><?= $block->escapeHtml(__('Personal Information')) ?></span></legend><br>
-        <input type="hidden" name="success_url" value="<?= $block->escapeUrl($block->getSuccessUrl()) ?>">
-        <input type="hidden" name="error_url" value="<?= $block->escapeUrl($block->getErrorUrl()) ?>">
-        <input type="hidden" name="erp_account_number" id="erp_account_number" value="" />
-        <input type="hidden" name="ddi_ship_number" id="ddi_ship_number" value="" />
-      <?= $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($block->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
-      <?php if ($block->isNewsletterEnabled()): ?>
-          <div class="field choice newsletter">
-              <input type="checkbox" name="is_subscribed" title="<?= $block->escapeHtmlAttr(__('Sign Up for Newsletter')) ?>" value="1" id="is_subscribed"<?php if ($block->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox">
-              <label for="is_subscribed" class="label"><span><?= $block->escapeHtml(__('Sign Up for Newsletter')) ?></span></label>
-          </div>
-        <?php /* Extensions placeholder */ ?>
-        <?= $block->getChildHtml('customer.form.register.newsletter') ?>
-      <?php endif ?>
-
-      <?php $_dob = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
-      <?php if ($_dob->isEnabled()): ?>
-        <?= $_dob->setDate($block->getFormData()->getDob())->toHtml() ?>
-      <?php endif ?>
-
-      <?php $_taxvat = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Taxvat') ?>
-      <?php if ($_taxvat->isEnabled()): ?>
-        <?= $_taxvat->setTaxvat($block->getFormData()->getTaxvat())->toHtml() ?>
-      <?php endif ?>
-
-      <?php $_gender = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
-      <?php if ($_gender->isEnabled()): ?>
-        <?= $_gender->setGender($block->getFormData()->getGender())->toHtml() ?>
-      <?php endif ?>
-
-        <!--<div class="field field-name-customer_company">
-            <label class="label" for="customer_company"><span>Customer Company</span></label>
-            <div class="control">
-                <input type="text" id="customer_company" name="customer_company" value="" title="First Name" class="input-text required-entry" data-validate="{required:true}" autocomplete="off" aria-required="true">
-            </div>
-        </div>-->
-    </fieldset>
-  <?php if ($block->getShowAddressFields()): ?>
-      <fieldset class="fieldset address">
-          <legend class="legend"><span><?= $block->escapeHtml(__('Address Information')) ?></span></legend><br>
-          <input type="hidden" name="create_address" value="1" />
-
-        <?php $_company = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Company') ?>
-        <?php if ($_company->isEnabled()): ?>
-          <?= $_company->setCompany($block->getFormData()->getCompany())->toHtml() ?>
-        <?php endif ?>
-
-        <?php $_telephone = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Telephone') ?>
-        <?php if ($_telephone->isEnabled()): ?>
-          <?= $_telephone->setTelephone($block->getFormData()->getTelephone())->toHtml() ?>
-        <?php endif ?>
-
-        <?php $_fax = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Fax') ?>
-        <?php if ($_fax->isEnabled()): ?>
-          <?= $_fax->setFax($block->getFormData()->getFax())->toHtml() ?>
-        <?php endif ?>
-
-        <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
-
-          <div class="field street required">
-              <label for="street_1" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?></span></label>
-              <div class="control">
-                  <input type="text" name="street[]" value="<?= $block->escapeHtmlAttr($block->getFormData()->getStreet(0)) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?>" id="street_1" class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
-                  <div class="nested">
-                    <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
-                    <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
-                        <div class="field additional">
-                            <label class="label" for="street_<?= /* @noEscape */ $_i ?>">
-                                <span><?= $block->escapeHtml(__('Address')) ?></span>
-                            </label>
-                            <div class="control">
-                                <input type="text" name="street[]" value="<?= $block->escapeHtml($block->getFormData()->getStreetLine($_i - 1)) ?>" title="<?= $block->escapeHtmlAttr(__('Street Address %1', $_i)) ?>" id="street_<?= /* @noEscape */ $_i ?>" class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
-                            </div>
-                        </div>
-                    <?php endfor; ?>
-                  </div>
-              </div>
-          </div>
-
-          <div class="field city required">
-              <label for="city" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?></span></label>
-              <div class="control">
-                  <input type="text" name="city" value="<?= $block->escapeHtmlAttr($block->getFormData()->getCity()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city')) ?>" id="city">
-              </div>
-          </div>
-
-          <div class="field region required">
-              <label for="region_id" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?></span></label>
-              <div class="control">
-                  <select id="region_id" name="region_id" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="validate-select" style="display:none;">
-                      <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
-                  </select>
-                  <input type="text" id="region" name="region" value="<?= $block->escapeHtml($block->getRegion()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>" style="display:none;">
-              </div>
-          </div>
-
-          <div class="field zip required">
-              <label for="zip" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?></span></label>
-              <div class="control">
-                  <input type="text" name="postcode" value="<?= $block->escapeHtmlAttr($block->getFormData()->getPostcode()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>" id="zip" class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode')) ?>">
-              </div>
-          </div>
-
-          <div class="field country required">
-              <label for="country" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('country_id') ?></span></label>
-              <div class="control">
-                <?= $block->getCountryHtmlSelect() ?>
-              </div>
-          </div>
-        <?php $addressAttributes = $block->getChildBlock('customer_form_address_user_attributes');?>
-        <?php if ($addressAttributes): ?>
-          <?php $addressAttributes->setEntityType('customer_address'); ?>
-          <?php $addressAttributes->setFieldIdFormat('address:%1$s')->setFieldNameFormat('address[%1$s]');?>
-          <?php $block->restoreSessionData($addressAttributes->getMetadataForm(), 'address');?>
-          <?= $addressAttributes->setShowContainer(false)->toHtml() ?>
-        <?php endif;?>
-          <input type="hidden" name="default_billing" value="1">
-          <input type="hidden" name="default_shipping" value="1">
-      </fieldset>
-
-  <?php endif; ?>
-    <fieldset class="fieldset create account" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
-        <legend class="legend"><span><?= $block->escapeHtml(__('Sign-in Information')) ?></span></legend><br>
-        <div class="field email required">
-            <label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
-            <div class="control">
-                <input type="email" name="email" autocomplete="email" id="email_address" value="<?= $block->escapeHtmlAttr($block->getFormData()->getEmail()) ?>" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" class="input-text" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
-            </div>
-        </div>
-        <div class="field password required">
-            <label for="password" class="label"><span><?= $block->escapeHtml(__('Password')) ?></span></label>
-            <div class="control">
-                <input type="password" name="password" id="password"
-                       title="<?= $block->escapeHtmlAttr(__('Password')) ?>"
-                       class="input-text"
-                       data-password-min-length="<?= $block->escapeHtmlAttr($block->getMinimumPasswordLength()) ?>"
-                       data-password-min-character-sets="<?= $block->escapeHtmlAttr($block->getRequiredCharacterClassesNumber()) ?>"
-                       data-validate="{required:true, 'validate-customer-password':true}"
-                       autocomplete="off">
-                <div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite">
-                    <div id="password-strength-meter" class="password-strength-meter">
-                      <?= $block->escapeHtml(__('Password Strength')) ?>:
-                        <span id="password-strength-meter-label" data-role="password-strength-meter-label">
-                            <?= $block->escapeHtml(__('No Password')) ?>
-                        </span>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-        <div class="field confirmation required">
-            <label for="password-confirmation" class="label"><span><?= $block->escapeHtml(__('Confirm Password')) ?></span></label>
-            <div class="control">
-                <input type="password" name="password_confirmation" title="<?= $block->escapeHtmlAttr(__('Confirm Password')) ?>" id="password-confirmation" class="input-text" data-validate="{required:true, equalTo:'#password'}" data-msg-equalTo="Your passwords do not match." autocomplete="off">
-            </div>
-        </div>
-      <?= $block->getChildHtml('form_additional_info') ?>
-    </fieldset>
-    <div class="actions-toolbar">
-        <div class="primary">
-            <button type="submit" class="action submit primary" title="<?= $block->escapeHtmlAttr(__('Create an Account')) ?>"><span><?= $block->escapeHtml(__('Create an Account')) ?></span></button>
-        </div>
-        <div class="secondary">
-            <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a>
-        </div>
-    </div>
-</form>
-<script>
-    require([
-        'jquery',
-        'mage/mage'
-    ], function($){
-
-        var dataForm = $('#form-validate');
-        var ignore = <?= /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null' ?>;
-
-        dataForm.mage('validation', {
-          <?php if ($_dob->isEnabled()): ?>
-            errorPlacement: function(error, element) {
-                if (element.prop('id').search('full') !== -1) {
-                    var dobElement = $(element).parents('.customer-dob'),
-                        errorClass = error.prop('class');
-                    error.insertAfter(element.parent());
-                    dobElement.find('.validate-custom').addClass(errorClass)
-                        .after('<div class="' + errorClass + '"></div>');
-                }
-                else {
-                    error.insertAfter(element);
-                }
-            },
-            ignore: ':hidden:not(' + ignore + ')'
-          <?php else: ?>
-            ignore: ignore ? ':hidden:not(' + ignore + ')' : ':hidden'
-          <?php endif ?>
-        }).find('input:text').attr('autocomplete', 'off');
-
-    });
-</script>
-<?php if ($block->getShowAddressFields()): ?>
-
-  <?php if(isset($StateCollection) && !empty($StateCollection) ) { ?>
-        <script type="text/x-magento-init">
-    {
-        "#country": {
-            "regionUpdater": {
-                "optionalRegionAllowed": <?= /* @noEscape */ $block->getConfig('general/region/display_all') ? 'true' : 'false' ?>,
-                "regionListId": "#region_id",
-                "regionInputId": "#region",
-                "postcodeId": "#zip",
-                "form": "#form-validate",
-                "regionJson": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>,
-                "defaultRegion": "<?php echo $StateCollection['region_id']; ?>",
-                "countriesWithOptionalZip": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getCountriesWithOptionalZip(true) ?>
-            }
-        }
-    }
-</script>
-  <?php } else { ?>
-        <script type="text/x-magento-init">
-    {
-        "#country": {
-            "regionUpdater": {
-                "optionalRegionAllowed": <?= /* @noEscape */ $block->getConfig('general/region/display_all') ? 'true' : 'false' ?>,
-                "regionListId": "#region_id",
-                "regionInputId": "#region",
-                "postcodeId": "#zip",
-                "form": "#form-validate",
-                "regionJson": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>,
-                "defaultRegion": "<?= (int) $block->getFormData()->getRegionId() ?>",
-                "countriesWithOptionalZip": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getCountriesWithOptionalZip(true) ?>
-            }
-        }
-    }
-</script>
-  <?php } ?>
-<?php endif; ?>
-
-<script type="text/x-magento-init">
-    {
-        ".field.password": {
-            "passwordStrengthIndicator": {
-                "formSelector": "form.form-create-account"
-            }
-        }
-    }
-</script>
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+
+/** @var \Magento\Customer\Block\Form\Register $block */
+$extensionHelper = $this->helper('DCKAP\Extension\Helper\Data');
+$ecommUserData = $extensionHelper->getErpEcommUserData();
+$StateCollection=[];
+if( isset($ecommUserData)  &&  $ecommUserData !='' ) {
+    $statecode = $ecommUserData['billState'];
+    $country =$ecommUserData['billCountry'];
+    if(empty($country)){
+        $country ="US";
+    }
+    if (isset($statecode) && $statecode!='') {
+        $StateCollection = $extensionHelper->getRegionCodeDetials($statecode,$country);
+    }
+}
+?>
+<?= $block->getChildHtml('form_fields_before') ?>
+<?php /* Extensions placeholder */ ?>
+<?= $block->getChildHtml('customer.form.register.extra') ?>
+<form class="form create account form-create-account" action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>" method="post" id="form-validate" enctype="multipart/form-data" autocomplete="off">
+  <?= /* @noEscape */ $block->getBlockHtml('formkey'); ?>
+    <fieldset class="fieldset create info">
+        <legend class="legend"><span><?= $block->escapeHtml(__('Personal Information')) ?></span></legend><br>
+        <input type="hidden" name="success_url" value="<?= $block->escapeUrl($block->getSuccessUrl()) ?>">
+        <input type="hidden" name="error_url" value="<?= $block->escapeUrl($block->getErrorUrl()) ?>">
+        <input type="hidden" name="erp_account_number" id="erp_account_number" value="" />
+        <input type="hidden" name="ddi_ship_number" id="ddi_ship_number" value="" />
+      <?= $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($block->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
+      <?php if ($block->isNewsletterEnabled()): ?>
+          <div class="field choice newsletter">
+              <input type="checkbox" name="is_subscribed" title="<?= $block->escapeHtmlAttr(__('Sign Up for Newsletter')) ?>" value="1" id="is_subscribed"<?php if ($block->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox">
+              <label for="is_subscribed" class="label"><span><?= $block->escapeHtml(__('Sign Up for Newsletter')) ?></span></label>
+          </div>
+        <?php /* Extensions placeholder */ ?>
+        <?= $block->getChildHtml('customer.form.register.newsletter') ?>
+      <?php endif ?>
+
+      <?php $_dob = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
+      <?php if ($_dob->isEnabled()): ?>
+        <?= $_dob->setDate($block->getFormData()->getDob())->toHtml() ?>
+      <?php endif ?>
+
+      <?php $_taxvat = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Taxvat') ?>
+      <?php if ($_taxvat->isEnabled()): ?>
+        <?= $_taxvat->setTaxvat($block->getFormData()->getTaxvat())->toHtml() ?>
+      <?php endif ?>
+
+      <?php $_gender = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
+      <?php if ($_gender->isEnabled()): ?>
+        <?= $_gender->setGender($block->getFormData()->getGender())->toHtml() ?>
+      <?php endif ?>
+
+        <!--<div class="field field-name-customer_company">
+            <label class="label" for="customer_company"><span>Customer Company</span></label>
+            <div class="control">
+                <input type="text" id="customer_company" name="customer_company" value="" title="First Name" class="input-text required-entry" data-validate="{required:true}" autocomplete="off" aria-required="true">
+            </div>
+        </div>-->
+    </fieldset>
+  <?php if ($block->getShowAddressFields()): ?>
+      <fieldset class="fieldset address">
+          <legend class="legend"><span><?= $block->escapeHtml(__('Address Information')) ?></span></legend><br>
+          <input type="hidden" name="create_address" value="1" />
+
+        <?php $_company = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Company') ?>
+        <?php if ($_company->isEnabled()): ?>
+          <?= $_company->setCompany($block->getFormData()->getCompany())->toHtml() ?>
+        <?php endif ?>
+
+        <?php $_telephone = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Telephone') ?>
+        <?php if ($_telephone->isEnabled()): ?>
+          <?= $_telephone->setTelephone($block->getFormData()->getTelephone())->toHtml() ?>
+        <?php endif ?>
+
+        <?php $_fax = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Fax') ?>
+        <?php if ($_fax->isEnabled()): ?>
+          <?= $_fax->setFax($block->getFormData()->getFax())->toHtml() ?>
+        <?php endif ?>
+
+        <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
+
+          <div class="field street required">
+              <label for="street_1" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?></span></label>
+              <div class="control">
+                  <input type="text"  data-validate="{'noHtmlTags':true}" name="street[]" value="<?= $block->escapeHtmlAttr($block->getFormData()->getStreet(0)) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?>" id="street_1" class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
+                  <div class="nested">
+                    <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
+                    <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
+                        <div class="field additional">
+                            <label class="label" for="street_<?= /* @noEscape */ $_i ?>">
+                                <span><?= $block->escapeHtml(__('Address')) ?></span>
+                            </label>
+                            <div class="control">
+                                <input type="text"data-validate="{'noHtmlTags':true}"  name="street[]" value="<?= $block->escapeHtml($block->getFormData()->getStreetLine($_i - 1)) ?>" title="<?= $block->escapeHtmlAttr(__('Street Address %1', $_i)) ?>" id="street_<?= /* @noEscape */ $_i ?>" class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
+                            </div>
+                        </div>
+                    <?php endfor; ?>
+                  </div>
+              </div>
+          </div>
+
+          <div class="field city required">
+              <label for="city" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?></span></label>
+              <div class="control">
+                  <input type="text" data-validate="{'noHtmlTags':true}" name="city" value="<?= $block->escapeHtmlAttr($block->getFormData()->getCity()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city')) ?>" id="city">
+              </div>
+          </div>
+
+          <div class="field region required">
+              <label for="region_id" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?></span></label>
+              <div class="control">
+                  <select id="region_id" name="region_id" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="validate-select" style="display:none;">
+                      <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
+                  </select>
+                  <input type="text" id="region" name="region" value="<?= $block->escapeHtml($block->getRegion()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>" style="display:none;">
+              </div>
+          </div>
+
+          <div class="field zip required">
+              <label for="zip" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?></span></label>
+              <div class="control">
+                  <input type="text" data-validate="{'noHtmlTags':true}" name="postcode" value="<?= $block->escapeHtmlAttr($block->getFormData()->getPostcode()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>" id="zip" class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode')) ?>">
+              </div>
+          </div>
+
+          <div class="field country required">
+              <label for="country" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('country_id') ?></span></label>
+              <div class="control">
+                <?= $block->getCountryHtmlSelect() ?>
+              </div>
+          </div>
+        <?php $addressAttributes = $block->getChildBlock('customer_form_address_user_attributes');?>
+        <?php if ($addressAttributes): ?>
+          <?php $addressAttributes->setEntityType('customer_address'); ?>
+          <?php $addressAttributes->setFieldIdFormat('address:%1$s')->setFieldNameFormat('address[%1$s]');?>
+          <?php $block->restoreSessionData($addressAttributes->getMetadataForm(), 'address');?>
+          <?= $addressAttributes->setShowContainer(false)->toHtml() ?>
+        <?php endif;?>
+          <input type="hidden" name="default_billing" value="1">
+          <input type="hidden" name="default_shipping" value="1">
+      </fieldset>
+
+  <?php endif; ?>
+    <fieldset class="fieldset create account" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
+        <legend class="legend"><span><?= $block->escapeHtml(__('Sign-in Information')) ?></span></legend><br>
+        <div class="field email required">
+            <label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
+            <div class="control">
+                <input type="email" name="email" autocomplete="email" id="email_address" value="<?= $block->escapeHtmlAttr($block->getFormData()->getEmail()) ?>" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" class="input-text" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true, 'noHtmlTags': true}">
+            </div>
+        </div>
+        <div class="field password required">
+            <label for="password" class="label"><span><?= $block->escapeHtml(__('Password')) ?></span></label>
+            <div class="control">
+                <input type="password" name="password" id="password"
+                       title="<?= $block->escapeHtmlAttr(__('Password')) ?>"
+                       class="input-text"
+                       data-password-min-length="<?= $block->escapeHtmlAttr($block->getMinimumPasswordLength()) ?>"
+                       data-password-min-character-sets="<?= $block->escapeHtmlAttr($block->getRequiredCharacterClassesNumber()) ?>"
+                       data-validate="{required:true, 'validate-customer-password':true, 'noHtmlTags': true}"
+                       autocomplete="off">
+                <div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite">
+                    <div id="password-strength-meter" class="password-strength-meter">
+                      <?= $block->escapeHtml(__('Password Strength')) ?>:
+                        <span id="password-strength-meter-label" data-role="password-strength-meter-label">
+                            <?= $block->escapeHtml(__('No Password')) ?>
+                        </span>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+        <div class="field confirmation required">
+            <label for="password-confirmation" class="label"><span><?= $block->escapeHtml(__('Confirm Password')) ?></span></label>
+            <div class="control">
+                <input type="password" name="password_confirmation" title="<?= $block->escapeHtmlAttr(__('Confirm Password')) ?>" id="password-confirmation" class="input-text" data-validate="{required:true, equalTo:'#password', 'noHtmlTags': true}" data-msg-equalTo="Your passwords do not match." autocomplete="off">
+            </div>
+        </div>
+      <?= $block->getChildHtml('form_additional_info') ?>
+    </fieldset>
+    <div class="actions-toolbar">
+        <div class="primary">
+            <button type="submit" class="action submit primary" title="<?= $block->escapeHtmlAttr(__('Create an Account')) ?>"><span><?= $block->escapeHtml(__('Create an Account')) ?></span></button>
+        </div>
+        <div class="secondary">
+            <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a>
+        </div>
+    </div>
+</form>
+<script>
+    require([
+        'jquery',
+        'mage/mage',
+        'jquery/validate',
+        'mage/translate'
+    ], function($){
+
+        var dataForm = $('#form-validate');
+        var ignore = <?= /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null' ?>;
+        $.validator.addMethod(
+        "noHtmlTags",
+        function(value, element) {
+            return this.optional(element) || !/[<>]/g.test(value);
+        },
+        $.mage.__("HTML tags are not allowed.")
+    );
+        dataForm.mage('validation', {
+          <?php if ($_dob->isEnabled()): ?>
+            errorPlacement: function(error, element) {
+                if (element.prop('id').search('full') !== -1) {
+                    var dobElement = $(element).parents('.customer-dob'),
+                        errorClass = error.prop('class');
+                    error.insertAfter(element.parent());
+                    dobElement.find('.validate-custom').addClass(errorClass)
+                        .after('<div class="' + errorClass + '"></div>');
+                }
+                else {
+                    error.insertAfter(element);
+                }
+            },
+            ignore: ':hidden:not(' + ignore + ')'
+          <?php else: ?>
+            ignore: ignore ? ':hidden:not(' + ignore + ')' : ':hidden'
+          <?php endif ?>
+        }).find('input:text').attr('autocomplete', 'off');
+
+    });
+</script>
+<?php if ($block->getShowAddressFields()): ?>
+
+  <?php if(isset($StateCollection) && !empty($StateCollection) ) { ?>
+        <script type="text/x-magento-init">
+    {
+        "#country": {
+            "regionUpdater": {
+                "optionalRegionAllowed": <?= /* @noEscape */ $block->getConfig('general/region/display_all') ? 'true' : 'false' ?>,
+                "regionListId": "#region_id",
+                "regionInputId": "#region",
+                "postcodeId": "#zip",
+                "form": "#form-validate",
+                "regionJson": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>,
+                "defaultRegion": "<?php echo $StateCollection['region_id']; ?>",
+                "countriesWithOptionalZip": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getCountriesWithOptionalZip(true) ?>
+            }
+        }
+    }
+</script>
+  <?php } else { ?>
+        <script type="text/x-magento-init">
+    {
+        "#country": {
+            "regionUpdater": {
+                "optionalRegionAllowed": <?= /* @noEscape */ $block->getConfig('general/region/display_all') ? 'true' : 'false' ?>,
+                "regionListId": "#region_id",
+                "regionInputId": "#region",
+                "postcodeId": "#zip",
+                "form": "#form-validate",
+                "regionJson": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>,
+                "defaultRegion": "<?= (int) $block->getFormData()->getRegionId() ?>",
+                "countriesWithOptionalZip": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getCountriesWithOptionalZip(true) ?>
+            }
+        }
+    }
+</script>
+  <?php } ?>
+<?php endif; ?>
+
+<script type="text/x-magento-init">
+    {
+        ".field.password": {
+            "passwordStrengthIndicator": {
+                "formSelector": "form.form-create-account"
+            }
+        }
+    }
+</script>
\ No newline at end of file
--- a/app/design/frontend/DCKAP/DDI/Magento_Customer/templates/widget/telephone.phtml	2025-07-10 09:17:17.150701399 +0530
+++ b/app/design/frontend/DCKAP/DDI/Magento_Customer/templates/widget/telephone-new.phtml	2025-07-10 09:46:13.051651206 +0530
@@ -1,33 +1,34 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-
-/** @var \Magento\Customer\Block\Widget\Telephone $block */
-?>
-
-<div class="field telephone <?= $block->isRequired() ? 'required' : '' ?>">
-    <label for="telephone" class="label">
-        <span>
-            <?= $block->escapeHtml(__('Phone Number')) ?>
-        </span>
-    </label>
-    <div class="control">
-        <?php
-            $_validationClass = $block->escapeHtmlAttr(
-                $this->helper('Magento\Customer\Helper\Address')
-                     ->getAttributeValidationClass('telephone')
-            );
-        ?>
-        <input type="text"
-               name="telephone"
-               id="telephone"
-               value="<?= $block->escapeHtmlAttr($block->getTelephone()) ?>"
-               title="<?= $block->escapeHtmlAttr(__('Phone Number')) ?>"
-               class="input-text <?= $_validationClass ?: '' ?>" minlength="10" maxlength="15"
-        >
-    </div>
-</div>
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+
+/** @var \Magento\Customer\Block\Widget\Telephone $block */
+?>
+
+<div class="field telephone <?= $block->isRequired() ? 'required' : '' ?>">
+    <label for="telephone" class="label">
+        <span>
+            <?= $block->escapeHtml(__('Phone Number')) ?>
+        </span>
+    </label>
+    <div class="control">
+        <?php
+            $_validationClass = $block->escapeHtmlAttr(
+                $this->helper('Magento\Customer\Helper\Address')
+                     ->getAttributeValidationClass('telephone')
+            );
+        ?>
+        <input type="text"
+               name="telephone"
+               id="telephone"
+               data-validate="{required:true, 'noHtmlTags':true}"
+               value="<?= $block->escapeHtmlAttr($block->getTelephone()) ?>"
+               title="<?= $block->escapeHtmlAttr(__('Phone Number')) ?>"
+               class="input-text <?= $_validationClass ?: '' ?>" minlength="10" maxlength="15"
+        >
+    </div>
+</div>
--- a/app/design/frontend/DCKAP/DDI/Magento_Customer/templates/widget/company.phtml	2025-07-10 09:16:45.390691711 +0530
+++ b/app/design/frontend/DCKAP/DDI/Magento_Customer/templates/widget/company-new.phtml	2025-07-10 09:46:25.822119533 +0530
@@ -1,31 +1,32 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/** @var \Magento\Customer\Block\Widget\Company $block */
-?>
-<div class="field company <?= $block->isRequired() ? 'required' : '' ?>">
-    <label for="company" class="label">
-        <span>
-            <?= $block->escapeHtml(__('Company')) ?>
-        </span>
-    </label>
-    <div class="control">
-            <?php
-            $_validationClass = $block->escapeHtmlAttr(
-                $this->helper(\Magento\Customer\Helper\Address::class)
-                     ->getAttributeValidationClass('company')
-            );
-            ?>
-        <input type="text"
-               name="company"
-               id="company"
-			   maxlength="30"
-               value="<?= $block->escapeHtmlAttr($block->getCompany()) ?>"
-               title="<?= $block->escapeHtmlAttr(__('Company')) ?>"
-               class="input-text <?= $_validationClass ?: '' ?>"
-         >
-    </div>
-</div>
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Customer\Block\Widget\Company $block */
+?>
+<div class="field company <?= $block->isRequired() ? 'required' : '' ?>">
+    <label for="company" class="label">
+        <span>
+            <?= $block->escapeHtml(__('Company')) ?>
+        </span>
+    </label>
+    <div class="control">
+            <?php
+            $_validationClass = $block->escapeHtmlAttr(
+                $this->helper(\Magento\Customer\Helper\Address::class)
+                     ->getAttributeValidationClass('company')
+            );
+            ?>
+        <input type="text"
+               name="company"
+               id="company"
+               data-validate="{required:true, 'noHtmlTags':true}"
+			   maxlength="30"
+               value="<?= $block->escapeHtmlAttr($block->getCompany()) ?>"
+               title="<?= $block->escapeHtmlAttr(__('Company')) ?>"
+               class="input-text <?= $_validationClass ?: '' ?>"
+         >
+    </div>
+</div>
--- /dev/null	2025-06-16 20:01:41.560604023 +0530
+++ b/app/design/frontend/DCKAP/DDI/Magento_Customer/templates/widget/fax.phtml	2025-07-10 10:40:29.427103477 +0530
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Customer\Block\Widget\Fax $block */
+?>
+
+<div class="field fax <?= $block->isRequired() ? 'required' : '' ?>">
+    <label for="fax" class="label">
+        <span>
+            <?= $block->escapeHtml(__('Fax')) ?>
+        </span>
+    </label>
+    <div class="control">
+            <?php
+            $_validationClass = $block->escapeHtmlAttr(
+                $this->helper(\Magento\Customer\Helper\Address::class)
+                     ->getAttributeValidationClass('fax')
+            );
+            ?>
+        <input type="text"
+               name="fax"
+               id="fax"
+               data-validate="{required:true, 'noHtmlTags':true}"
+               value="<?= $block->escapeHtmlAttr($block->getFax()) ?>"
+               title="<?= $block->escapeHtmlAttr(__('Fax')) ?>"
+               class="input-text <?= $_validationClass ?: '' ?>"
+        >
+    </div>
+</div>
--- /dev/null	2025-06-16 20:01:41.560604023 +0530
+++ b/app/design/frontend/DCKAP/DDI/Magento_Customer/templates/widget/name.phtml	2025-07-10 10:41:23.855564148 +0530
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Customer\Block\Widget\Name $block */
+
+/*
+<?= $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')
+   ->setObject($block->getAddress())
+   ->toHtml() ?>
+
+For checkout/onepage/shipping.phtml:
+
+<?= $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')
+   ->setObject($block->getAddress())
+   ->setFieldIdFormat('shipping:%s')
+   ->setFieldNameFormat('shipping[%s]')
+   ->toHtml() ?>
+*/
+
+$prefix = $block->showPrefix();
+$middle = $block->showMiddlename();
+$suffix = $block->showSuffix();
+?>
+<?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()): ?>
+<div class="field required fullname <?= $block->escapeHtmlAttr($block->getContainerClassName()) ?>">
+    <label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label">
+      <span><?= $block->escapeHtml(__('Name')) ?></span>
+    </label>
+    <div class="control">
+        <fieldset class="fieldset fieldset-fullname">
+        <div class="fields">
+<?php endif; ?>
+
+    <?php if ($prefix): ?>
+        <div class="field field-name-prefix<?= $block->isPrefixRequired() ? ' required' : '' ?>">
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>">
+              <span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span>
+            </label>
+            <div class="control">
+                <?php if ($block->getPrefixOptions() === false): ?>
+                    <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
+                           name="<?= $block->escapeHtmlAttr($block->getFieldName('prefix')) ?>"
+                           value="<?= $block->escapeHtmlAttr($block->getObject()->getPrefix()) ?>"
+                           title="<?= $block->escapeHtmlAttr($block->getStoreLabel('prefix')) ?>"
+                           class="input-text
+                           <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>"
+                           <?= $block->isPrefixRequired() ? ' data-validate="{required:true}"' : '' ?>>
+                <?php else: ?>
+                    <select id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
+                            name="<?= $block->escapeHtmlAttr($block->getFieldName('prefix')) ?>"
+                            title="<?= $block->escapeHtmlAttr($block->getStoreLabel('prefix')) ?>"
+                            class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>"
+                            <?= $block->isPrefixRequired() ? ' data-validate="{required:true}"' : '' ?> >
+                        <?php foreach ($block->getPrefixOptions() as $_option): ?>
+                            <option value="<?= $block->escapeHtmlAttr(__($_option)) ?>"
+                              <?php if ($block->getObject()->getPrefix() == $_option): ?>
+                                selected="selected"<?php endif; ?>>
+                                <?= $block->escapeHtml(__($_option)) ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                <?php endif; ?>
+            </div>
+        </div>
+    <?php endif; ?>
+        <div class="field field-name-firstname required">
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>">
+              <span><?= $block->escapeHtml($block->getStoreLabel('firstname')) ?></span>
+            </label>
+            <div class="control">
+                <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"
+                       name="<?= $block->escapeHtmlAttr($block->getFieldName('firstname')) ?>"
+                       value="<?= $block->escapeHtmlAttr($block->getObject()->getFirstname()) ?>"
+                       title="<?= $block->escapeHtmlAttr($block->getStoreLabel('firstname')) ?>"
+                       class="input-text
+                        <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('firstname')) ?>"
+                        <?= ($block->getAttributeValidationClass('firstname') == 'required-entry') ? '
+                       data-validate="{required:true, noHtmlTags:true}"' : '' ?>>
+            </div>
+        </div>
+    <?php if ($middle): ?>
+        <?php $isMiddlenameRequired = $block->isMiddlenameRequired(); ?>
+        <div class="field field-name-middlename<?= $isMiddlenameRequired ? ' required' : '' ?>">
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>">
+              <span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span>
+            </label>
+            <div class="control">
+                <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"
+                       name="<?= $block->escapeHtmlAttr($block->getFieldName('middlename')) ?>"
+                       value="<?= $block->escapeHtmlAttr($block->getObject()->getMiddlename()) ?>"
+                       title="<?= $block->escapeHtmlAttr($block->getStoreLabel('middlename')) ?>"
+                       class="input-text
+                       <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('middlename')) ?>"
+                       <?= $isMiddlenameRequired ? ' data-validate="{required:true, noHtmlTags:true}"' : '' ?>>
+            </div>
+        </div>
+    <?php endif; ?>
+        <div class="field field-name-lastname required">
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>">
+              <span><?= $block->escapeHtml($block->getStoreLabel('lastname')) ?></span>
+            </label>
+            <div class="control">
+                <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"
+                       name="<?= $block->escapeHtmlAttr($block->getFieldName('lastname')) ?>"
+                       value="<?= $block->escapeHtmlAttr($block->getObject()->getLastname()) ?>"
+                       title="<?= $block->escapeHtmlAttr($block->getStoreLabel('lastname')) ?>"
+                       class="input-text
+                        <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('lastname')) ?>"
+                        <?= ($block->getAttributeValidationClass('lastname') == 'required-entry') ? '
+                       data-validate="{required:true, noHtmlTags:true}"' : '' ?>>
+            </div>
+        </div>
+    <?php if ($suffix): ?>
+        <div class="field field-name-suffix<?= $block->isSuffixRequired() ? ' required' : '' ?>">
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>">
+              <span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span>
+            </label>
+            <div class="control">
+                <?php if ($block->getSuffixOptions() === false): ?>
+                    <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"
+                           name="<?= $block->escapeHtmlAttr($block->getFieldName('suffix')) ?>"
+                           value="<?= $block->escapeHtmlAttr($block->getObject()->getSuffix()) ?>"
+                           title="<?= $block->escapeHtmlAttr($block->getStoreLabel('suffix')) ?>"
+                           class="input-text
+                           <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>"
+                           <?= $block->isSuffixRequired() ? ' data-validate="{required:true}"' : '' ?>>
+                <?php else: ?>
+                    <select id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"
+                            name="<?= $block->escapeHtmlAttr($block->getFieldName('suffix')) ?>"
+                            title="<?= $block->escapeHtmlAttr($block->getStoreLabel('suffix')) ?>"
+                            class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>"
+                            <?= $block->isSuffixRequired() ? ' data-validate="{required:true}"' : '' ?>>
+                        <?php foreach ($block->getSuffixOptions() as $_option): ?>
+                            <option value="<?= $block->escapeHtmlAttr(__($_option)) ?>"
+                              <?php if ($block->getObject()->getSuffix() == $_option): ?>
+                                selected="selected"<?php endif; ?>>
+                                <?= $block->escapeHtml(__($_option)) ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                <?php endif; ?>
+            </div>
+        </div>
+    <?php endif; ?>
+
+    <?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()): ?>
+            </div>
+        </fieldset>
+    </div>
+</div>
+<?php endif; ?>
\ No newline at end of file