diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php index bb32a82ff..7a0399cd1 100644 --- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php @@ -51,11 +51,8 @@ @elseif ($field['type'] == 'select') - - @endif @{{ errors.first('{!! $firstField !!}[{!! $secondField !!}][{!! $field['name'] !!}]') }} diff --git a/packages/Webkul/Shipping/src/Config/system.php b/packages/Webkul/Shipping/src/Config/system.php index 9f1553fc9..4b52a179b 100644 --- a/packages/Webkul/Shipping/src/Config/system.php +++ b/packages/Webkul/Shipping/src/Config/system.php @@ -97,5 +97,57 @@ return [ 'validation' => 'required' ] ] + ], [ + 'key' => 'sales.shipping', + 'name' => 'Shipping Origin', + 'sort' => 0 + ], [ + 'key' => 'sales.shipping.origin', + 'name' => 'Origin', + 'sort' => 0, + 'fields' => [ + [ + 'name' => 'country', + 'title' => 'Country', + 'type' => 'text', + 'validation' => 'required', + 'channel_based' => true, + 'locale_based' => false + ], [ + 'name' => 'state', + 'title' => 'State', + 'type' => 'text', + 'validation' => 'required', + 'channel_based' => true, + 'locale_based' => false + ], [ + 'name' => 'address1', + 'title' => 'Address Line 1', + 'type' => 'text', + 'validation' => 'required', + 'channel_based' => true, + 'locale_based' => false + ], [ + 'name' => 'address2', + 'title' => 'Address Line 2', + 'type' => 'text', + 'channel_based' => true, + 'locale_based' => false + ], [ + 'name' => 'zipcode', + 'title' => 'Zip', + 'type' => 'text', + 'validation' => 'required', + 'channel_based' => true, + 'locale_based' => false + ], [ + 'name' => 'city', + 'title' => 'City', + 'type' => 'text', + 'validation' => 'required', + 'channel_based' => true, + 'locale_based' => false + ] + ] ] ]; \ No newline at end of file