Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

issue: default_address issue fixed. #9752

Merged
merged 3 commits into from
May 14, 2024
Merged

issue: default_address issue fixed. #9752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2f26c4
issue: default_address issue fixed.
suraj-webkul May 2, 2024
0c305c4
Minor: minor changes.
suraj-webkul May 2, 2024
1476a09
ui: ui issues fix.
suraj-webkul May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/Webkul/Admin/src/Resources/views/sales/orders/create/cart/address.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,9 +532,7 @@ class="primary-button"
let payload = {
billing: {
...this.getSelectedAddress('billing', params.billing.id),
...{
use_for_shipping: this.useBillingAddressForShipping
}
use_for_shipping: this.useBillingAddressForShipping,
},
};

Expand Down Expand Up @@ -584,7 +582,10 @@ class="primary-button"
address.id = null;
}

return address;
return {
...address,
default_address: 0,
};
},

moveToNextStep() {
Expand Down
6 changes: 3 additions & 3 deletions packages/Webkul/Admin/src/Resources/views/sales/orders/create/recent-order-items.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class="grid select-none gap-x-2.5 gap-y-1.5"
>
<!-- Details Toggler -->
<p
class="flex cursor-pointer items-center gap-1 text-sm"
class="flex cursor-pointer items-center gap-1 text-sm text-gray-800 dark:text-white"
@click="item.option_show = ! item.option_show"
>
@lang('admin::app.sales.orders.create.recent-order-items.see-details')
Expand All @@ -97,11 +97,11 @@ class="grid w-full gap-2"
v-show="item.option_show"
>
<div v-for="option in item.additional.attributes">
<p class="text-sm text-gray-600">
<p class="text-sm text-gray-600 dark:text-white">
@{{ option.attribute_name + ':' }}
</p>

<p class="text-sm font-medium text-gray-800">
<p class="text-sm font-medium text-gray-800 dark:text-white">
@{{ option.option_label }}
</p>
</div>
Expand Down