merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #577 from jitendra-webkul/jitendra 

Jitendra
This commit is contained in:
JItendra Singh 2019-02-15 11:34:01 +05:30 committed by GitHub
parent da8c5869fa 15fe87d72c
commit bf8122a739
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=7683c8f127f6ad2ac3ce",
"/js/admin.js": "/js/admin.js?id=da5ebef9c25a064e7ed6",
"/css/admin.css": "/css/admin.css?id=ccc39419fee98ed8ac7b"
}
}

2
packages/Webkul/Shop/publishable/assets/js/shop.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=0076f480705e7ce1f8e0",
"/js/shop.js": "/js/shop.js?id=e25827d4b84cbe5d76fb",
"/css/shop.css": "/css/shop.css?id=1c431c316ccb78d925aa"
}
}

4
packages/Webkul/Shop/src/Resources/views/checkout/onepage/payment.blade.php
View File

@ -10,6 +10,8 @@
@foreach ($paymentMethods as $payment)
{!! view_render_event('bagisto.shop.checkout.payment-method.before', ['payment' => $payment]) !!}
<span class="radio">
<input v-validate="'required'" type="radio" id="{{ $payment['method'] }}" name="payment[method]" value="{{ $payment['method'] }}" v-model="payment.method" @change="methodSelected()" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.payment-method') }}&quot;">
<label class="radio-view" for="{{ $payment['method'] }}"></label>
@ -18,6 +20,8 @@
<span class="control-info">{{ $payment['description'] }}</span>
{!! view_render_event('bagisto.shop.checkout.payment-method.after', ['payment' => $payment]) !!}
@endforeach
<span class="control-error" v-if="errors.has('payment-form.payment[method]')">

5
packages/Webkul/Shop/src/Resources/views/checkout/onepage/shipping.blade.php
View File

@ -9,6 +9,9 @@
<div class="control-group" :class="[errors.has('shipping-form.shipping_method') ? 'has-error' : '']">
@foreach ($shippingRateGroups as $rateGroup)
{!! view_render_event('bagisto.shop.checkout.shipping-method.before', ['rateGroup' => $rateGroup]) !!}
<h4 for="">{{ $rateGroup['carrier_title'] }}</h4>
@foreach ($rateGroup['rates'] as $rate)
@ -20,6 +23,8 @@
</span>
@endforeach
{!! view_render_event('bagisto.shop.checkout.shipping-method.after', ['rateGroup' => $rateGroup]) !!}
@endforeach
<span class="control-error" v-if="errors.has('shipping-form.shipping_method')">

2
packages/Webkul/Ui/publishable/assets/css/ui.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Ui/publishable/assets/js/ui.js vendored
View File

File diff suppressed because one or more lines are too long

6
packages/Webkul/Ui/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=d984bc35663c0fd9cf3f",
"/css/ui.css": "/css/ui.css?id=907ba1f195230c84e711"
}
"/js/ui.js": "/js/ui.js?id=8f9e12057b68b45d7046",
"/css/ui.css": "/css/ui.css?id=ec6e8734bcf3862ca9c7"
}

4
packages/Webkul/Ui/webpack.mix.js vendored
View File

@ -1,8 +1,8 @@
const { mix } = require("laravel-mix");
require("laravel-mix-merge-manifest");
// var publicPath = 'publishable/assets';
var publicPath = "../../../public/vendor/webkul/ui/assets";
var publicPath = 'publishable/assets';
// var publicPath = "../../../public/vendor/webkul/ui/assets";
mix.setPublicPath(publicPath).mergeManifest();
mix.disableNotifications();