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

Issue #247 (Displaying wrong number of products and sales in category, on dashboard)

This commit is contained in:
jitendra 2018-11-30 12:15:10 +05:30
parent 66639afb6c
commit 4e8081ed58
6 changed files with 9 additions and 52725 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,6 +211,7 @@ class DashboardController extends Controller
->where('category_translations.locale', app()->getLocale()) ->where('category_translations.locale', app()->getLocale())
->where('order_items.created_at', '>=', $this->startDate) ->where('order_items.created_at', '>=', $this->startDate)
->where('order_items.created_at', '<=', $this->endDate) ->where('order_items.created_at', '<=', $this->endDate)
->where('order_items.qty_ordered', '>', 0)
->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')

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

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

3963
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -1,16 +1,4 @@
{ {
<<<<<<< HEAD
"/js/shop.js": "/js/shop.js",
"/css/shop.css": "/css/shop.css"
}
=======
<<<<<<< HEAD
"/js/shop.js": "/js/shop.js",
"/css/shop.css": "/css/shop.css"
}
=======
"/js/shop.js": "/js/shop.js?id=c6ba9f43bd31f175a665", "/js/shop.js": "/js/shop.js?id=c6ba9f43bd31f175a665",
"/css/shop.css": "/css/shop.css?id=2a9e3addb8dd8df86f03" "/css/shop.css": "/css/shop.css?id=26b555ebe5720cc6639c"
} }
>>>>>>> 2a2b1e8ec4f3e110fca0b4926f090ed506b81ce5
>>>>>>> master

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

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