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

Merge pull request #1345 from prashant-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-08-23 13:34:43 +05:30 committed by GitHub
parent d36ae19c9a 5bc496d823
commit 9b625dbb9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php
View File

@ -19,7 +19,7 @@ class OrderInvoicesDataGrid extends DataGrid
public function prepareQueryBuilder()
{
$queryBuilder = DB::table('invoices')->select('id', 'order_id', 'state', 'grand_total', 'created_at');
$queryBuilder = DB::table('invoices')->select('id', 'order_id', 'state', 'base_grand_total', 'created_at');
$this->setQueryBuilder($queryBuilder);
}
@ -45,7 +45,7 @@ class OrderInvoicesDataGrid extends DataGrid
]);
$this->addColumn([
'index' => 'grand_total',
'index' => 'base_grand_total',
'label' => trans('admin::app.datagrid.grand-total'),
'type' => 'price',
'searchable' => true,

4
packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
View File

@ -28,6 +28,8 @@
<div class="form-container">
@csrf()
{!! view_render_event('bagisto.admin.settings.channel.create.before') !!}
<accordian :title="'{{ __('admin::app.settings.channels.general') }}'" :active="true">
<div slot="body">
@ -197,6 +199,8 @@
</div>
</div>
</accordian>
{!! view_render_event('bagisto.admin.settings.channel.create.after') !!}
</div>
</div>
</form>

4
packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
View File

@ -29,6 +29,8 @@
@csrf()
<input name="_method" type="hidden" value="PUT">
{!! view_render_event('bagisto.admin.settings.channel.edit.before') !!}
<accordian :title="'{{ __('admin::app.settings.channels.general') }}'" :active="true">
<div slot="body">
@ -212,6 +214,8 @@
</div>
</div>
</accordian>
{!! view_render_event('bagisto.admin.settings.channel.edit.after') !!}
</div>
</div>
</form>

5
packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php
View File

@ -28,8 +28,11 @@
<div class="form-container">
@csrf()
{!! view_render_event('bagisto.admin.settings.currencies.create.before') !!}
<accordian :title="'{{ __('admin::app.settings.currencies.general') }}'" :active="true">
<div slot="body">
<div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
<label for="code" class="required">{{ __('admin::app.settings.currencies.code') }}</label>
<input v-validate="'required|min:3|max:3'" class="control" id="code" name="code" value="{{ old('code') }}" data-vv-as="&quot;{{ __('admin::app.settings.currencies.code') }}&quot;" style="text-transform:uppercase" v-code/>
@ -41,9 +44,11 @@
<input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.settings.currencies.name') }}&quot;" value="{{ old('name') }}"/>
<span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
</div>
</div>
</accordian>
{!! view_render_event('bagisto.admin.settings.currencies.create.after') !!}
</div>
</div>
</form>

4
packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
View File

@ -29,6 +29,8 @@
@csrf()
<input name="_method" type="hidden" value="PUT">
{!! view_render_event('bagisto.admin.settings.currencies.edit.before') !!}
<accordian :title="'{{ __('admin::app.settings.currencies.general') }}'" :active="true">
<div slot="body">
@ -44,9 +46,11 @@
<input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.settings.currencies.name') }}&quot;" value="{{ old('name') ?: $currency->name }}"/>
<span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
</div>
</div>
</accordian>
{!! view_render_event('bagisto.admin.settings.currencies.edit.after') !!}
</div>
</div>
</form>

4
packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/create.blade.php
View File

@ -46,6 +46,8 @@
<tbody>
<tr>
{!! view_render_event('bagisto.admin.settings.exchangerate.create.before') !!}
<td>
{{ core()->getBaseCurrencyCode() }}
</td>
@ -69,6 +71,8 @@
<span class="control-error" v-if="errors.has('rate')">@{{ errors.first('rate') }}</span>
</div>
</td>
{!! view_render_event('bagisto.admin.settings.exchangerate.create.after') !!}
</tr>
</tbody>
</table>

4
packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php
View File

@ -47,6 +47,8 @@
<tbody>
<tr>
{!! view_render_event('bagisto.admin.settings.exchangerate.edit.before') !!}
<td>
{{ core()->getBaseCurrencyCode() }}
</td>
@ -70,6 +72,8 @@
<span class="control-error" v-if="errors.has('rate')">@{{ errors.first('rate') }}</span>
</div>
</td>
{!! view_render_event('bagisto.admin.settings.exchangerate.edit.after') !!}
<tr>
</tbody>
</table>

3
packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php
View File

@ -28,6 +28,8 @@
<div class="form-container">
@csrf()
{!! view_render_event('bagisto.admin.settings.inventory.create.before') !!}
<accordian :title="'{{ __('admin::app.settings.inventory_sources.general') }}'" :active="true">
<div slot="body">
@ -130,6 +132,7 @@
</div>
</accordian>
{!! view_render_event('bagisto.admin.settings.inventory.create.after') !!}
</div>
</div>
</form>

4
packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php
View File

@ -27,6 +27,9 @@
<div class="page-content">
<div class="form-container">
@csrf()
{!! view_render_event('bagisto.admin.settings.inventory.edit.before') !!}
<input name="_method" type="hidden" value="PUT">
<accordian :title="'{{ __('admin::app.settings.inventory_sources.general') }}'" :active="true">
@ -131,6 +134,7 @@
</div>
</accordian>
{!! view_render_event('bagisto.admin.settings.inventory.edit.after') !!}
</div>
</div>
</form>

4
packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
View File

@ -28,6 +28,8 @@
<div class="form-container">
@csrf()
{!! view_render_event('bagisto.admin.settings.locale.create.before') !!}
<accordian :title="'{{ __('admin::app.settings.locales.general') }}'" :active="true">
<div slot="body">
<div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
@ -50,6 +52,8 @@
</select>
<span class="control-error" v-if="errors.has('direction')">@{{ errors.first('direction') }}</span>
</div>
{!! view_render_event('bagisto.admin.settings.locale.create.after') !!}
</div>
</accordian>

5
packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
View File

@ -27,6 +27,9 @@
<div class="page-content">
<div class="form-container">
@csrf()
{!! view_render_event('bagisto.admin.settings.locale.edit.before') !!}
<input name="_method" type="hidden" value="PUT">
<accordian :title="'{{ __('admin::app.settings.locales.general') }}'" :active="true">
@ -53,9 +56,11 @@
</select>
<span class="control-error" v-if="errors.has('direction')">@{{ errors.first('direction') }}</span>
</div>
</div>
</accordian>
{!! view_render_event('bagisto.admin.settings.locale.edit.after') !!}
</div>
</div>
</form>

5
packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
View File

@ -26,6 +26,9 @@
<div class="page-content">
<div class="form-container">
@csrf()
{!! view_render_event('bagisto.admin.settings.slider.create.before') !!}
<div class="control-group" :class="[errors.has('title') ? 'has-error' : '']">
<label for="title" class="required">{{ __('admin::app.settings.sliders.title') }}</label>
<input type="text" class="control" name="title" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.settings.sliders.title') }}&quot;">
@ -64,6 +67,8 @@
<span class="control-error" v-if="errors.has('content')">@{{ errors.first('content') }}</span>
</div>
{!! view_render_event('bagisto.admin.settings.slider.create.after') !!}
</div>
</div>
</form>

3
packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
View File

@ -28,6 +28,8 @@
@csrf()
{!! view_render_event('bagisto.admin.settings.slider.edit.before') !!}
<div class="control-group" :class="[errors.has('title') ? 'has-error' : '']">
<label for="title" class="required">{{ __('admin::app.settings.sliders.title') }}</label>
<input type="text" class="control" name="title" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.settings.sliders.title') }}&quot;" value="{{ $slider->title ?: old('title') }}">
@ -69,6 +71,7 @@
<span class="control-error" v-if="errors.has('content')">@{{ errors.first('content') }}</span>
</div>
{!! view_render_event('bagisto.admin.settings.slider.edit.after') !!}
</div>
</div>
</form>

10
packages/Webkul/Discount/src/Helpers/Catalog/Apply.php
View File

@ -13,7 +13,7 @@ use Webkul\Discount\Helpers\Catalog\Sale;
* Apply - Applies catalog rule to products intended in the rules
*
* @author Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
* @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
* @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
*/
class Apply extends Sale
{
@ -119,10 +119,8 @@ class Apply extends Sale
$this->setSale($rule, $productIDs);
}
}
// dd($result, 'processing done');
} else {
// handle the deceased rules here
// handle the deceased rules here or call the declutter handler over here
// dd($this->deceased);
}
}
@ -196,6 +194,8 @@ class Apply extends Sale
$winnerRuleId = $this->breakTie($previousRuleID, $newRuleID, $product);
$discountAmount = $this->getDiscountAmount($product, $rule);
$data = [
'catalog_rule_id' => $rule->id,
'starts_from' => $rule->starts_from,
@ -204,7 +204,7 @@ class Apply extends Sale
'channel_id' => $channelId,
'product_id' => $productID,
'action_code' => $rule->action_code,
'action_amount' => $discountPrice
'action_amount' => $discountAmount
];
if ($rule->id == $winnerRuleId) {