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

query optimization and hide of expose model

This commit is contained in:
rahul shukla 2020-01-25 17:00:31 +05:30
parent 212a32f302
commit cbaebaa388
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
View File

@ -301,6 +301,8 @@
@push('scripts')
<?php if ($field['type'] == 'country'): ?>
<script type="text/x-template" id="country-template">
<div>
@ -404,6 +406,8 @@
});
</script>
<?php endif; ?>
<script type="text/x-template" id="depends-template">
<div class="control-group" :class="[errors.has(name) ? 'has-error' : '']" v-if="this.isVisible">

7
packages/Webkul/Sales/src/Repositories/OrderRepository.php
View File

@ -6,7 +6,6 @@ use Illuminate\Container\Container as App;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Event;
use Webkul\Core\Eloquent\Repository;
use Webkul\Core\Models\CoreConfig;
use Webkul\Sales\Contracts\Order;
use Webkul\Sales\Models\Order as OrderModel;
@ -196,22 +195,20 @@ class OrderRepository extends Repository
*/
public function generateIncrementId()
{
$config = new CoreConfig();
foreach ([ 'Prefix' => 'prefix',
'Length' => 'length',
'Suffix' => 'suffix', ] as
$varSuffix => $confKey)
{
$var = "invoiceNumber{$varSuffix}";
$$var = $config->where('code', '=', "sales.orderSettings.order_number.order_number_{$confKey}")->first() ?: false;
$$var = core()->getConfigData('sales.orderSettings.order_number.order_number_'.$confKey) ?: false;
}
$lastOrder = $this->model->orderBy('id', 'desc')->limit(1)->first();
$lastId = $lastOrder ? $lastOrder->id : 0;
if ($invoiceNumberLength && ($invoiceNumberPrefix || $invoiceNumberSuffix)) {
$invoiceNumber = ($invoiceNumberPrefix->value) . sprintf("%0{$invoiceNumberLength->value}d", 0) . ($lastId + 1) . ($invoiceNumberSuffix->value);
$invoiceNumber = ($invoiceNumberPrefix) . sprintf("%0{$invoiceNumberLength}d", 0) . ($lastId + 1) . ($invoiceNumberSuffix);
} else {
$invoiceNumber = $lastId + 1;
}