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

Merge pull request #561 from jitendra-webkul/jitendra 

Jitendra
This commit is contained in:
JItendra Singh 2019-02-11 15:20:54 +05:30 committed by GitHub
parent 802e52c30f 7bfb216bb0
commit 69ca02540b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Http/Controllers/DashboardController.php
View File

@ -215,7 +215,7 @@ class DashboardController extends Controller
->addSelect(DB::raw('SUM(qty_ordered) as total_qty_ordered')) ->addSelect(DB::raw('SUM(qty_ordered) as total_qty_ordered'))
->addSelect(DB::raw('COUNT(products.id) as total_products')) ->addSelect(DB::raw('COUNT(products.id) as total_products'))
->addSelect('order_items.id', 'categories.id as category_id', 'category_translations.name') ->addSelect('order_items.id', 'categories.id as category_id', 'category_translations.name')
->groupBy('category_id') ->groupBy('categories.id')
->orderBy('total_qty_ordered', 'DESC') ->orderBy('total_qty_ordered', 'DESC')
->limit(5) ->limit(5)
->get(); ->get();

2
packages/Webkul/Product/src/Repositories/ProductRepository.php
View File

@ -470,7 +470,7 @@ class ProductRepository extends Repository
} }
}); });
return $qb; return $qb->groupBy('product_flat.id');
})->paginate(isset($params['limit']) ? $params['limit'] : 9); })->paginate(isset($params['limit']) ? $params['limit'] : 9);
return $results; return $results;

2
packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
View File

@ -13,7 +13,7 @@
@if ($cart->selected_shipping_rate) @if ($cart->selected_shipping_rate)
<div class="item-detail"> <div class="item-detail">
<label>{{ __('shop::app.checkout.total.delivery-charges') }}</label> <label>{{ __('shop::app.checkout.total.delivery-charges') }}</label>
<label class="right">{{ core()->currency($cart->selected_shipping_rate->price) }}</label> <label class="right">{{ core()->currency($cart->selected_shipping_rate->base_price) }}</label>
</div> </div>
@endif @endif

3
public/installer/install.php
View File

@ -11,12 +11,13 @@
if (file_exists($envFile)) { if (file_exists($envFile)) {
// reading env content // reading env content
$str= file_get_contents($envFile); $str = file_get_contents($envFile);
// converting env content to key/value pair // converting env content to key/value pair
$data = explode(PHP_EOL,$str); $data = explode(PHP_EOL,$str);
$databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION']; $databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION'];
$key = $value = [];
if ($data) { if ($data) {
foreach ($data as $line) { foreach ($data as $line) {
$rowValues = explode('=', $line); $rowValues = explode('=', $line);