TPS/elektronika_bagisto
TPS
/
elektronika_bagisto
6
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

/account/profile/edit updated

This commit is contained in:
mrNikto9 2022-06-11 15:40:43 +05:00
parent 6ecbcc46d6
commit fdc9d142f3
4 changed files with 9 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/TPS/Shop/src/Resources/views/shop/customers/account/address/country-state.blade.php
View File

@ -13,7 +13,7 @@
<script type="text/x-template" id="country-state-template">
<div>
<div class="control-group" :class="[errors.has('country') ? 'has-error' : '']">
<!-- <div class="control-group" :class="[errors.has('country') ? 'has-error' : '']">
<label for="country" class="required">
{{ __('shop::app.customer.account.address.create.country') }}
</label>
@ -28,7 +28,7 @@
<span class="control-error" v-if="errors.has('country')">
@{{ errors.first('country') }}
</span>
</div>
</div> -->
<div class="control-group" :class="[errors.has('state') ? 'has-error' : '']">
<label for="state" class="required">

24
packages/TPS/Shop/src/Resources/views/shop/customers/account/address/index.blade.php
View File

@ -62,13 +62,9 @@
</div>
<div class="content-block-main-wrapper">
<textarea class="content-block-main-wrapper-text"
spellcheck="false">{{ $address->address1 }},{{ $address->city }},{{ $address->state }},{{ core()->country_name($address->country) }} {{ $address->postcode }},{{ __('shop::app.customer.account.address.index.contact') }}: {{ $address->phone }}</textarea>
spellcheck="false">{{ $address->state }} , {{ $address->address1 }} , {{ __('shop::app.customer.account.address.index.contact') }}: {{ $address->phone }}</textarea>
<div class="control-links mt-20">
<span>
<a href="{{ route('customer.address.edit', $address->id) }}">
{{ __('shop::app.customer.account.address.index.edit') }}
</a>
</span>
<span>
<a href="javascript:void(0);" onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}')">
@ -117,14 +113,6 @@
</div>
<div class="profile-content-block">
<div class="profile-content-block-inner">
<span>{{ __('shop::app.customer.account.address.create.vat_id') }} + {{ __('shop::app.customer.account.address.create.vat_help_note') }}</span>
<input type="text" class="fetch-input" name="vat_id">
<span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
</div>
</div>
@ -155,14 +143,6 @@
</div>
<div class="profile-content-block">
<div class="profile-content-block-inner">
<span>{{ __('shop::app.customer.account.address.create.postcode') }}</span>
<input type="text" class="fetch-input" name="postcode">
<span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
</div>
</div>
<div class="profile-content-block">

7
packages/TPS/Shop/src/Resources/views/shop/customers/account/profile/edit.blade.php
View File

@ -157,16 +157,11 @@
</div>
<!-- <div class="profile-content-inner-bottom-second">
<div class="profile-content-inner-bottom-second" style="padding-bottom: 10rem;">
<div>
<input class="checkout-button save-button" type="submit" value="{{ __('shop::app.customer.account.profile.submit') }}">
</div>
</div> -->
<div class="profile-content-inner-bottom-second" style="padding-bottom:60px;">
<div>
<button type="button" class="checkout-button save-button" ><span>Сохранить</span></button>
</div>
</div>
</form>

8
packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
View File

@ -33,12 +33,12 @@ class CustomerAddressRequest extends FormRequest
'last_name' => ['required', new AlphaNumericSpace],
'address1' => ['required', 'array'],
'address1.*' => ['required', new Address],
'country' => [new AlphaNumericSpace],
// 'country' => [new AlphaNumericSpace],
'state' => [new AlphaNumericSpace],
'city' => ['required'],
'postcode' => ['numeric'],
// 'city' => ['required'],
// 'postcode' => ['numeric'],
'phone' => ['required', new PhoneNumber],
'vat_id' => [new VatIdRule()],
// 'vat_id' => [new VatIdRule()],
];
}