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

conflict resolve

This commit is contained in:
rahul shukla 2018-10-23 17:24:27 +05:30
parent 489c1cdd1b cc62c225d8
commit de0ea34e8a
66 changed files with 1993 additions and 1092 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Kernel.php
View File

@ -14,12 +14,10 @@ class Kernel extends HttpKernel
* @var array
*/
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\App\Http\Middleware\TrustProxies::class,
// \Illuminate\Session\Middleware\StartSession::class,
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
\App\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
];
/**
@ -29,9 +27,6 @@ class Kernel extends HttpKernel
*/
protected $middlewareGroups = [
'web' => [
\App\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,

2
config/database.php
View File

@ -50,7 +50,7 @@ return [
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'prefix' => '',
'strict' => true,
'strict' => false,
'engine' => 'InnoDB ROW_FORMAT=DYNAMIC',
],

35
packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php
View File

@ -27,10 +27,10 @@ class ExchangeRatesDataGrid
return DataGrid::make([
'name' => 'Exchange Rates',
'table' => 'currency_exchange_rates',
'select' => 'id',
'table' => 'currency_exchange_rates as cer',
'select' => 'cer.id',
'perpage' => 5,
'aliased' => false, //use this with false as default and true in case of joins
'aliased' => true, //use this with false as default and true in case of joins
'massoperations' =>[
[
@ -56,13 +56,13 @@ class ExchangeRatesDataGrid
],
'join' => [
// [
// 'join' => 'leftjoin',
// 'table' => 'roles as r',
// 'primaryKey' => 'u.role_id',
// 'condition' => '=',
// 'secondaryKey' => 'r.id',
// ]
[
'join' => 'leftjoin',
'table' => 'currencies as curr',
'primaryKey' => 'cer.target_currency',
'condition' => '=',
'secondaryKey' => 'curr.id',
]
],
//use aliasing on secodary columns if join is performed
@ -70,39 +70,38 @@ class ExchangeRatesDataGrid
'columns' => [
[
'name' => 'id',
'name' => 'cer.id',
'alias' => 'exchID',
'type' => 'number',
'label' => 'Rate ID',
'sortable' => true,
],
[
'name' => 'target_currency',
'alias' => 'exchTargetCurrency',
'name' => 'curr.name',
'alias' => 'currencyname',
'type' => 'string',
'label' => 'Target Currency',
'label' => 'Currency Name',
'sortable' => true,
],
[
'name' => 'rate',
'name' => 'cer.rate',
'alias' => 'exchRate',
'type' => 'string',
'label' => 'Exchange Rate',
],
],
//don't use aliasing in case of filters
'filterable' => [
[
'column' => 'id',
'column' => 'cer.id',
'alias' => 'exchId',
'type' => 'number',
'label' => 'Rate ID',
],
[
'column' => 'target_currency',
'column' => 'curr.name',
'alias' => 'exchTargetCurrency',
'type' => 'string',
'label' => 'Target Currency',

151
packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
View File

@ -6,7 +6,7 @@ use Illuminate\View\View;
use Webkul\Ui\DataGrid\Facades\DataGrid;
/**
* Order DataGrid
* orderDataGrid
*
* @author Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
* @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
@ -17,19 +17,19 @@ class OrderDataGrid
/**
* The Data Grid implementation.
*
* @var AttributeDataGrid
* for countries
* @var orderDataGrid
* for orders
*/
public function createCategoryDataGrid()
public function createOrderDataGrid()
{
return DataGrid::make([
'name' => 'Orders',
'table' => 'orders as ord',
'select' => 'ord.id',
'name' => 'orders',
'table' => 'orders as or',
'select' => 'or.id',
'perpage' => 5,
'aliased' => true, //use this with false as default and true in case of joins
'aliased' => false,
//True in case of joins else aliasing key required on all cases
'massoperations' =>[
[
@ -40,118 +40,89 @@ class OrderDataGrid
],
],
'actions' => [
[
'type' => 'Edit',
'route' => route('admin.datagrid.delete'),
'confirm_text' => 'Do you really want to do this?',
'icon' => 'icon pencil-lg-icon',
], [
'type' => 'Delete',
'route' => route('admin.datagrid.delete'),
'confirm_text' => 'Do you really want to do this?',
'icon' => 'icon trash-icon',
],
],
'actions' => [ ],
'join' => [
[
'join' => 'leftjoin',
'table' => 'category_translations as ct',
'primaryKey' => 'cat.id',
'condition' => '=',
'secondaryKey' => 'ct.category_id',
], [
'join' => 'leftjoin',
'table' => 'category_translations as cta',
'primaryKey' => 'cat.parent_id',
'condition' => '=',
'secondaryKey' => 'cta.category_id',
],
],
'join' => [],
//use aliasing on secodary columns if join is performed
'columns' => [
[
'name' => 'cat.id',
'alias' => 'catID',
'name' => 'or.id',
'alias' => 'orderid',
'type' => 'number',
'label' => 'Category ID',
'label' => 'ID',
'sortable' => true,
], [
'name' => 'ct.name',
'alias' => 'catName',
'name' => 'or.customer_first_name',
'alias' => 'oafirstname',
'type' => 'string',
'label' => 'Category Name',
'label' => 'Billed To',
'sortable' => false,
], [
'name' => 'cat.position',
'alias' => 'catPosition',
'name' => 'or.base_grand_total',
'alias' => 'orbasegrandtotal',
'type' => 'string',
'label' => 'Category Position',
'sortable' => false,
], [
'name' => 'cta.name',
'alias' => 'parentName',
'type' => 'string',
'label' => 'Parent Name',
'sortable' => true,
], [
'name' => 'cat.status',
'alias' => 'catStatus',
'type' => 'string',
'label' => 'Visible in Menu',
'label' => 'Base Total',
'sortable' => true,
'wrapper' => function ($value) {
if($value == 0)
return "False";
else
return "True";
return core()->currency($value);
}
], [
'name' => 'or.grand_total',
'alias' => 'oagrandtotal',
'type' => 'string',
'label' => 'Grand Total',
'sortable' => false,
'wrapper' => function ($value) {
return core()->currency($value);
}
], [
'name' => 'or.status',
'alias' => 'orstatus',
'type' => 'string',
'label' => 'Status',
'sortable' => true,
'wrapper' => function ($value) {
if($value == 'completed')
return '<span class="badge badge-md badge-success">Completed</span>';
else if($value == "cancelled")
return '<span class="badge badge-md badge-danger">Completed</span>';
else if($value == "closed")
return '<span class="badge badge-md badge-info">Completed</span>';
else if($value == "pending")
return '<span class="badge badge-md badge-warning">Pending</span>';
},
],
],
'filterable' => [
[
'column' => 'cat.id',
'alias' => 'catID',
'column' => 'or.id',
'alias' => 'orderid',
'type' => 'number',
'label' => 'Category ID',
'label' => 'ID',
], [
'column' => 'ct.name',
'alias' => 'catName',
'name' => 'or.status',
'alias' => 'orstatus',
'type' => 'string',
'label' => 'Category Name',
], [
'column' => 'cta.name',
'alias' => 'parentName',
'type' => 'string',
'label' => 'Parent Name',
], [
'column' => 'cat.status',
'alias' => 'catStatus',
'type' => 'string',
'label' => 'Visible in Menu',
],
'label' => 'Status'
]
],
//don't use aliasing in case of searchables
'searchable' => [
[
'column' => 'cat.id',
'column' => 'or.id',
'alias' => 'orderid',
'type' => 'number',
'label' => 'Category ID',
'label' => 'ID',
], [
'column' => 'ct.name',
'name' => 'or.status',
'alias' => 'orstatus',
'type' => 'string',
'label' => 'Category Name',
], [
'column' => 'cat.status',
'type' => 'string',
'label' => 'Visible in Menu',
'label' => 'Status'
]
],
@ -173,7 +144,7 @@ class OrderDataGrid
public function render()
{
return $this->createCategoryDataGrid()->render();
return $this->createOrderDataGrid()->render();
}
}

163
packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
View File

@ -3,7 +3,7 @@
namespace Webkul\Admin\DataGrids;
use Illuminate\View\View;
use Webkul\Ui\DataGrid\Facades\ProductGrid;
use Webkul\Ui\DataGrid\Facades\DataGrid;
use Webkul\Channel\Repositories\ChannelRepository;
use Webkul\Product\Repositories\ProductRepository;
/**
@ -16,27 +16,21 @@ use Webkul\Product\Repositories\ProductRepository;
class ProductDataGrid
{
/**
* The Data Grid implementation.
* @var ProductDataGrid
* The Data Grid implementation @var ProductDataGrid
* for Products
*/
public function createProductDataGrid()
{
return ProductGrid::make([
return DataGrid::make([
'name' => 'Products',
'table' => 'products as prods',
'select' => 'prods.id',
'perpage' => 10,
'table' => 'products_grid as prods',
'select' => 'prods.product_id',
'perpage' => 5,
'aliased' => true, //use this with false as default and true in case of joins
'massoperations' =>[
// [
// 'route' => route('admin.datagrid.delete'),
// 'method' => 'DELETE',
// 'label' => 'Delete',
// 'type' => 'button',
// ],
//check other grid for configuration and make of your own
],
'actions' => [
@ -53,43 +47,7 @@ class ProductDataGrid
],
],
'attributeColumns' => [
'name', 'price'
],
'join' => [
[
'join' => 'leftjoin',
'table' => 'attribute_families as attfam',
'primaryKey' => 'prods.attribute_family_id',
'condition' => '=',
'secondaryKey' => 'attfam.id',
],
//for getting the attribute values.
// [
// 'join' => 'leftjoin',
// 'table' => 'product_attribute_values as pav',
// 'primaryKey' => 'prods.id',
// 'condition' => '=',
// 'secondaryKey' => 'pav.product_id',
// 'withAttributes' => [
// 'condition' => [
// 'attribute_id' => 2,
// 'select' => 'name',
// ]
// ]
// ],
// for getting the inventory quantity of a product
[
'join' => 'leftjoin',
'table' => 'product_inventories as pi',
'primaryKey' => 'prods.id',
'condition' => '=',
'secondaryKey' => 'pi.product_id',
],
],
//use aliasing on secodary columns if join is performed
@ -97,28 +55,52 @@ class ProductDataGrid
'columns' => [
//name, alias, type, label, sortable
[
'name' => 'prods.id',
'alias' => 'productID',
'type' => 'number',
'name' => 'prods.product_id',
'alias' => 'id',
'type' => 'string',
'label' => 'ID',
'sortable' => true,
],
[
], [
'name' => 'prods.sku',
'alias' => 'productCode',
'alias' => 'productSku',
'type' => 'string',
'label' => 'SKU',
'sortable' => true,
],
[
'name' => 'attfam.name',
'alias' => 'FamilyName',
], [
'name' => 'prods.name',
'alias' => 'ProductName',
'type' => 'string',
'label' => 'Family Name',
'sortable' => true,
],
[
'name' => 'pi.qty',
'label' => 'Product Name',
'sortable' => false,
], [
'name' => 'prods.type',
'alias' => 'ProductType',
'type' => 'string',
'label' => 'Product Type',
'sortable' => false,
], [
'name' => 'prods.status',
'alias' => 'ProductStatus',
'type' => 'string',
'label' => 'Product Status',
'sortable' => false,
'wrapper' => function ($value) {
if($value == 1)
return 'Active';
else
return 'Inactive';
},
], [
'name' => 'prods.price',
'alias' => 'ProductPrice',
'type' => 'string',
'label' => 'Product Price',
'sortable' => false,
'wrapper' => function ($value) {
return core()->formatBasePrice($value);
},
], [
'name' => 'prods.quantity',
'alias' => 'ProductQuantity',
'type' => 'string',
'label' => 'Product Quantity',
@ -127,57 +109,50 @@ class ProductDataGrid
],
'filterable' => [
//column, type, and label
//column, alias, type, and label
[
'column' => 'prods.id',
'column' => 'prods.product_id',
'alias' => 'productID',
'type' => 'number',
'label' => 'ID',
],
[
], [
'column' => 'prods.sku',
'alias' => 'productCode',
'alias' => 'productSku',
'type' => 'string',
'label' => 'SKU',
],
[
'column' => 'attfam.name',
'alias' => 'FamilyName',
], [
'column' => 'prods.name',
'alias' => 'ProductName',
'type' => 'string',
'label' => 'Family Name',
],
[
'column' => 'pi.qty',
'alias' => 'ProductQuantity',
'type' => 'number',
'label' => 'Product Quatity',
],
'label' => 'Product Name',
], [
'column' => 'prods.type',
'alias' => 'ProductType',
'type' => 'string',
'label' => 'Product Type',
]
],
//don't use aliasing in case of searchables
'searchable' => [
//column, type and label
[
'column' => 'prods.id',
'column' => 'prods.product_id',
'type' => 'number',
'label' => 'ID',
],
[
], [
'column' => 'prods.sku',
'type' => 'string',
'label' => 'SKU',
],
[
'column' => 'attfam.name',
], [
'column' => 'prods.name',
'type' => 'string',
'label' => 'Family Name',
],
[
'column' => 'pi.qty',
'label' => 'Product Name',
], [
'column' => 'prods.type',
'type' => 'string',
'label' => 'Product Quatity',
],
'label' => 'Product Type',
]
],
//list of viable operators that will be used

17
packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php
View File

@ -68,29 +68,25 @@ class RolesDataGrid
//use aliasing on secodary columns if join is performed
'columns' => [
[
'name' => 'id',
'alias' => 'roleId',
'type' => 'number',
'label' => 'ID',
'sortable' => true,
],
[
], [
'name' => 'name',
'alias' => 'roleName',
'type' => 'string',
'label' => 'Name',
'sortable' => true,
],
[
], [
'name' => 'permission_type',
'alias' => 'rolePermissionType',
'type' => 'string',
'label' => 'Permission Type',
'sortable' => true,
],
],
//don't use aliasing in case of filters
@ -101,14 +97,12 @@ class RolesDataGrid
'alias' => 'roleId',
'type' => 'number',
'label' => 'ID',
],
[
], [
'column' => 'name',
'alias' => 'roleName',
'type' => 'string',
'label' => 'Name',
],
[
], [
'column' => 'permission_type',
'alias' => 'rolePermissionType',
'type' => 'string',
@ -123,8 +117,7 @@ class RolesDataGrid
'column' => 'name',
'type' => 'string',
'label' => 'Name',
],
[
], [
'column' => 'permission_type',
'type' => 'string',
'label' => 'Permission Type',

18
packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
View File

@ -111,13 +111,7 @@ class UserDataGrid
'label' => 'Role Name',
'sortable' => true,
],
[
'name' => 'r.id',
'alias' => 'xc',
'type' => 'string',
'label' => 'Role ID',
'sortable' => true,
],
],
//don't use aliasing in case of filters
'filterable' => [
@ -133,12 +127,7 @@ class UserDataGrid
'type' => 'number',
'label' => 'Admin ID'
],
[
'column' => 'r.id',
'alias' => 'xc',
'type' => 'number',
'label' => 'Role ID'
]
],
//don't use aliasing in case of searchables
'searchable' => [
@ -146,8 +135,7 @@ class UserDataGrid
'column' => 'u.email',
'type' => 'string',
'label' => 'E-Mail'
],
[
], [
'column' => 'u.name',
'type' => 'string',
'label' => 'Name'

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

@ -5,6 +5,12 @@ namespace Webkul\Admin\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\DB;
use Carbon\Carbon;
use Webkul\Sales\Repositories\OrderRepository as Order;
use Webkul\Sales\Repositories\OrderItemRepository as OrderItem;
use Webkul\Customer\Repositories\CustomerRepository as Customer;
use Webkul\Product\Repositories\ProductInventoryRepository as ProductInventory;
/**
* Dashboard controller
@ -21,14 +27,275 @@ class DashboardController extends Controller
*/
protected $_config;
public function __construct()
/**
* OrderRepository object
*
* @var array
*/
protected $order;
/**
* OrderItemRepository object
*
* @var array
*/
protected $orderItem;
/**
* CustomerRepository object
*
* @var array
*/
protected $customer;
/**
* ProductInventoryRepository object
*
* @var array
*/
protected $productInventory;
/**
* string object
*
* @var array
*/
protected $startDate;
/**
* string object
*
* @var array
*/
protected $lastStartDate;
/**
* string object
*
* @var array
*/
protected $endDate;
/**
* string object
*
* @var array
*/
protected $lastEndDate;
/**
* Create a new controller instance.
*
* @param Webkul\Sales\Repositories\OrderRepository $order
* @param Webkul\Sales\Repositories\OrderItemRepository $orderItem
* @param Webkul\Customer\Repositories\CustomerRepository $customer
* @param Webkul\Product\Repositories\ProductInventoryRepository $productInventory
* @return void
*/
public function __construct(
Order $order,
OrderItem $orderItem,
Customer $customer,
ProductInventory $productInventory
)
{
$this->_config = request('_config');
$this->middleware('admin');
$this->order = $order;
$this->orderItem = $orderItem;
$this->customer = $customer;
$this->productInventory = $productInventory;
}
public function getPercentageChange($previous, $current)
{
if(!$previous)
return $current ? 100 : 0;
return ($current - $previous) / $previous * 100;
}
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
return view('admin::dashboard.index');
$this->setStartEndDate();
$statistics = [
'total_customers' => [
'previous' => $previous = $this->customer->scopeQuery(function($query) {
return $query->where('customers.created_at', '>=', $this->lastStartDate)
->where('customers.created_at', '<=', $this->lastEndDate);
})->count(),
'current' => $current = $this->customer->scopeQuery(function($query) {
return $query->where('customers.created_at', '>=', $this->startDate)
->where('customers.created_at', '<=', $this->endDate);
})->count(),
'progress' => $this->getPercentageChange($previous, $current)
],
'total_orders' => [
'previous' => $previous = $this->order->scopeQuery(function($query) {
return $query->where('orders.created_at', '>=', $this->lastStartDate)
->where('orders.created_at', '<=', $this->lastEndDate);
})->count(),
'current' => $current = $this->order->scopeQuery(function($query) {
return $query->where('orders.created_at', '>=', $this->startDate)
->where('orders.created_at', '<=', $this->endDate);
})->count(),
'progress' => $this->getPercentageChange($previous, $current)
],
'total_sales' => [
'previous' => $previous = $this->order->scopeQuery(function($query) {
return $query->where('orders.created_at', '>=', $this->lastStartDate)
->where('orders.created_at', '<=', $this->lastEndDate);
})->sum('base_grand_total'),
'current' => $current = $this->order->scopeQuery(function($query) {
return $query->where('orders.created_at', '>=', $this->startDate)
->where('orders.created_at', '<=', $this->endDate);
})->sum('base_grand_total'),
'progress' => $this->getPercentageChange($previous, $current)
],
'avg_sales' => [
'previous' => $previous = $this->order->scopeQuery(function($query) {
return $query->where('orders.created_at', '>=', $this->lastStartDate)
->where('orders.created_at', '<=', $this->lastEndDate);
})->avg('base_grand_total'),
'current' => $current = $this->order->scopeQuery(function($query) {
return $query->where('orders.created_at', '>=', $this->startDate)
->where('orders.created_at', '<=', $this->endDate);
})->avg('base_grand_total'),
'progress' => $this->getPercentageChange($previous, $current)
],
'top_selling_categories' => $this->getTopSellingCategories(),
'top_selling_products' => $this->getTopSellingProducts(),
'customer_with_most_sales' => $this->getCustomerWithMostSales(),
'stock_threshold' => $this->getStockThreshold(),
];
foreach (core()->getTimeInterval($this->startDate, $this->endDate) as $interval) {
$statistics['sale_graph']['label'][] = $interval['start']->format('d M');
$total = number_format($this->order->scopeQuery(function($query) use($interval) {
return $query->where('orders.created_at', '>=', $interval['start'])
->where('orders.created_at', '<=', $interval['end']);
})->sum('base_grand_total'), 2);
$statistics['sale_graph']['total'][] = $total;
$statistics['sale_graph']['formated_total'][] = core()->formatBasePrice($total);
}
return view($this->_config['view'], compact('statistics'))->with(['startDate' => $this->startDate, 'endDate' => $this->endDate]);
}
}
/**
* Returns the list of top selling categories
*
* @return mixed
*/
public function getTopSellingCategories()
{
return $this->orderItem->getModel()
->leftJoin('products', 'order_items.product_id', 'products.id')
->leftJoin('product_categories', 'products.id', 'product_categories.product_id')
->leftJoin('categories', 'product_categories.category_id', 'categories.id')
->leftJoin('category_translations', 'categories.id', 'category_translations.category_id')
->where('category_translations.locale', app()->getLocale())
->where('order_items.created_at', '>=', $this->startDate)
->where('order_items.created_at', '<=', $this->endDate)
->addSelect(DB::raw('SUM(qty_ordered) as total_qty_ordered'))
->addSelect(DB::raw('COUNT(products.id) as total_products'))
->addSelect('order_items.id', 'categories.id as category_id', 'category_translations.name')
->groupBy('category_id')
->orderBy('total_qty_ordered', 'DESC')
->limit(5)
->get();
}
/**
* Return stock threshold.
*
* @return mixed
*/
public function getStockThreshold()
{
return $this->productInventory->getModel()
->leftJoin('products', 'product_inventories.product_id', 'products.id')
->select(DB::raw('SUM(qty) as total_qty'))
->addSelect('product_inventories.product_id')
->where('products.type', '!=', 'configurable')
->groupBy('product_id')
->orderBy('total_qty', 'ASC')
->limit(5)
->get();
}
/**
* Returns top selling products
* @return mixed
*/
public function getTopSellingProducts()
{
return $this->orderItem->getModel()
->select(DB::raw('SUM(qty_ordered) as total_qty_ordered'))
->addSelect('id', 'product_id', 'product_type', 'name')
->where('order_items.created_at', '>=', $this->startDate)
->where('order_items.created_at', '<=', $this->endDate)
->whereNull('parent_id')
->groupBy('product_id')
->orderBy('total_qty_ordered', 'DESC')
->limit(5)
->get();
}
/**
* Returns top selling products
*
* @return mixed
*/
public function getCustomerWithMostSales()
{
return $this->order->getModel()
->select(DB::raw('SUM(base_grand_total) as total_base_grand_total'))
->addSelect(DB::raw('COUNT(id) as total_orders'))
->addSelect('id', 'customer_id', 'customer_email', 'customer_first_name', 'customer_last_name')
->where('orders.created_at', '>=', $this->startDate)
->where('orders.created_at', '<=', $this->endDate)
->groupBy('customer_email')
->orderBy('total_base_grand_total', 'DESC')
->limit(5)
->get();
}
/**
* Sets start and end date
*
* @return void
*/
public function setStartEndDate()
{
$this->startDate = request()->get('start')
? Carbon::createFromTimeString(request()->get('start') . " 00:00:01")
: Carbon::createFromTimeString(Carbon::now()->subDays(30)->format('Y-m-d') . " 00:00:01");
$this->endDate = request()->get('end')
? Carbon::createFromTimeString(request()->get('end') . " 23:59:59")
: Carbon::now();
if($this->endDate > Carbon::now())
$this->endDate = Carbon::now();
$this->lastStartDate = clone $this->startDate;
$this->lastEndDate = clone $this->endDate;
$this->lastStartDate->subDays($this->lastStartDate->diffInDays($this->lastEndDate));
$this->lastEndDate->subDays($this->lastStartDate->diffInDays($this->lastEndDate));
}
}

14
packages/Webkul/Admin/src/Http/routes.php
View File

@ -2,6 +2,8 @@
Route::group(['middleware' => ['web']], function () {
Route::prefix('admin')->group(function () {
Route::get('/grid', 'Webkul\Product\Http\Controllers\ProductController@test');
// Login Routes
Route::get('/login', 'Webkul\User\Http\Controllers\SessionController@create')->defaults('_config', [
'view' => 'admin::users.sessions.create'
@ -37,17 +39,15 @@ Route::group(['middleware' => ['web']], function () {
])->name('admin.session.destroy');
// Dashboard Route
Route::get('dashboard', 'Webkul\Admin\Http\Controllers\DashboardController@index')->name('admin.dashboard.index');
Route::get('dashboard', 'Webkul\Admin\Http\Controllers\DashboardController@index')->defaults('_config', [
'view' => 'admin::dashboard.index'
])->name('admin.dashboard.index');
//Customers Management Routes
Route::get('customers', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config', [
'view' => 'admin::customers.index'
])->name('admin.customer.index');
Route::get('customers/orders', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config',[
'view' => 'admin::customers.orders.index'
])->name('admin.customer.orders.index');
Route::get('customers/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@create')->defaults('_config',[
'view' => 'admin::customers.create'
])->name('admin.customer.create');
@ -158,6 +158,8 @@ Route::group(['middleware' => ['web']], function () {
// Catalog Routes
Route::prefix('catalog')->group(function () {
Route::get('/sync', 'Webkul\Product\Http\Controllers\ProductController@sync');
// Catalog Product Routes
Route::get('/products', 'Webkul\Product\Http\Controllers\ProductController@index')->defaults('_config', [
'view' => 'admin::catalog.products.index'
@ -405,7 +407,6 @@ Route::group(['middleware' => ['web']], function () {
Route::get('/inventory_sources/delete/{id}', 'Webkul\Inventory\Http\Controllers\InventorySourceController@destroy')->name('admin.inventory_sources.delete');
// Channel Routes
Route::get('/channels', 'Webkul\Core\Http\Controllers\ChannelController@index')->defaults('_config', [
'view' => 'admin::settings.channels.index'
@ -491,7 +492,6 @@ Route::group(['middleware' => ['web']], function () {
//tax category ends
//tax rate
Route::get('tax-rates', 'Webkul\Tax\Http\Controllers\TaxRateController@index')->defaults('_config', [
'view' => 'admin::tax.tax-rates.index'

143
packages/Webkul/Admin/src/Listeners/Product.php Normal file
View File

@ -0,0 +1,143 @@
<?php
namespace Webkul\Admin\Listeners;
use Webkul\Product\Repositories\ProductRepository;
use Webkul\Product\Repositories\ProductGridRepository;
use Webkul\Product\Helpers\Price;
/**
* Products Event handler
*
* @author Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
* @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
*/
class Product {
/**
* Product Repository Object
*/
protected $product;
/**
* Price Object
*
* @var array
*/
Protected $price;
/**
* Product Grid Repository Object
*/
protected $productGrid;
public function __construct(ProductRepository $product, ProductGridRepository $productGrid, Price $price)
{
$this->product = $product;
$this->productGrid = $productGrid;
$this->price = $price;
}
/**
* Creates a new entry in the product grid whenever a new product is created.
*
* @return boolean
*/
public function afterProductCreated($product) {
$gridObject = [];
$gridObject = [
'product_id' => $product->id,
'sku' => $product->sku,
'type' => $product->type,
'attribute_family_name' => $product->toArray()['attribute_family']['name'],
];
if($this->productGrid->create($gridObject)) {
return true;
} else {
return false;
}
}
/**
* Event before the product update
*
* @return boolean
*/
public function beforeProductUpdate($productId) {
return true;
}
/**
* Event after the product update
*
* @var collection product
*
* return boolean
*/
public function afterProductUpdate($product) {
//update product grid here
$this->productGrid->updateWhere($product);
return true;
}
/**
* Event after deletion of the product
*
* @return boolean
*/
public function afterProductDelete($productId) {
return true;
}
/**
* Fill attributes for that product after the creation
*
* @return boolean
*/
public function fillAttribute() {
}
public function sync() {
$gridObject = [];
foreach($this->product->all() as $product) {
$gridObject = [
'product_id' => $product->id,
'sku' => $product->sku,
'type' => $product->type,
'name' => $product->name,
'attribute_family_name' => $product->toArray()['attribute_family']['name'],
'price' => $this->price->getMinimalPrice($product),
'status' => $product->status
];
if($product->type == 'configurable') {
$gridObject['quantity'] = 0;
} else {
$qty = 0;
foreach($product->toArray()['inventories'] as $inventorySource) {
$qty = $qty + $inventorySource['qty'];
}
$gridObject['quantity'] = $qty;
$qty = 0;
}
$this->productGrid->create($gridObject);
$gridObject = [];
}
return true;
}
}

2
packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php
View File

@ -46,6 +46,6 @@ class NewInvoiceNotification extends Mailable
return $this->to($order->customer_email, $order->customer_full_name)
->subject(trans('admin::app.mail.invoice.subject', ['order_id' => $order->id]))
->view('admin::emails.sales.new-invoice');
->view('shop::emails.sales.new-invoice');
}
}

2
packages/Webkul/Admin/src/Mail/NewOrderNotification.php
View File

@ -43,6 +43,6 @@ class NewOrderNotification extends Mailable
{
return $this->to($this->order->customer_email, $this->order->customer_full_name)
->subject(trans('admin::app.mail.order.subject'))
->view('admin::emails.sales.new-order');
->view('shop::emails.sales.new-order');
}
}

2
packages/Webkul/Admin/src/Mail/NewShipmentNotification.php
View File

@ -46,6 +46,6 @@ class NewShipmentNotification extends Mailable
return $this->to($order->customer_email, $order->customer_full_name)
->subject(trans('admin::app.mail.shipment.subject', ['order_id' => $order->id]))
->view('admin::emails.sales.new-shipment');
->view('shop::emails.sales.new-shipment');
}
}

16
packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
View File

@ -67,17 +67,17 @@ class AdminServiceProvider extends ServiceProvider
$subMenus = $tabs = [];
if (count($keys) > 1) {
$subMenus = [
'items' => $menu->sortItems(array_get($menu->items, current($keys) . '.children')),
'current' => $menu->current,
'currentKey' => $menu->currentKey
];
'items' => $menu->sortItems(array_get($menu->items, current($keys) . '.children')),
'current' => $menu->current,
'currentKey' => $menu->currentKey
];
if (count($keys) > 2) {
$tabs = [
'items' => $menu->sortItems(array_get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children')),
'current' => $menu->current,
'currentKey' => $menu->currentKey
];
'items' => $menu->sortItems(array_get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children')),
'current' => $menu->current,
'currentKey' => $menu->currentKey
];
}
}

20
packages/Webkul/Admin/src/Providers/EventServiceProvider.php
View File

@ -24,6 +24,26 @@ class EventServiceProvider extends ServiceProvider
'sort' => 2,
'icon-class' => 'sales-icon',
], [
'key' => 'sales.orders',
'name' => 'Orders',
'route' => 'admin.sales.orders.index',
'sort' => 1,
'icon-class' => '',
],
// [
// 'key' => 'sales.shipments',
// 'name' => 'Shipments',
// 'route' => 'admin.sales.orders.index',
// 'sort' => 2,
// 'icon-class' => '',
// ], [
// 'key' => 'sales.invoices',
// 'name' => 'Invoices',
// 'route' => 'admin.sales.orders.index',
// 'sort' => 3,
// 'icon-class' => '',
// ],
[
'key' => 'catalog',
'name' => 'Catalog',
'route' => 'admin.catalog.products.index',

10
packages/Webkul/Admin/src/Resources/assets/js/components/date.vue
View File

@ -22,12 +22,16 @@
},
mounted () {
var this_this = this;
var element = this.$el.getElementsByTagName('input')[0];
this.datepicker = new Flatpickr(
element, {
allowInput: true,
altFormat: 'Y-m-d H:i:s',
dateFormat: 'Y-m-d H:i:s'
altFormat: 'Y-m-d',
dateFormat: 'Y-m-d',
onChange: function(selectedDates, dateStr, instance) {
this_this.$emit('onChange', dateStr)
},
});
}
};

41
packages/Webkul/Admin/src/Resources/assets/js/components/datetime.vue
View File

@ -10,25 +10,30 @@
import Flatpickr from "flatpickr";
export default {
props: {
name: String,
value: String
},
props: {
name: String,
value: String
},
data() {
return {
datepicker: null
};
},
data() {
return {
datepicker: null
};
},
mounted() {
var element = this.$el.getElementsByTagName("input")[0];
this.datepicker = new Flatpickr(element, {
allowInput: true,
altFormat: "Y-m-d H:i:s",
dateFormat: "Y-m-d H:i:s",
enableTime: true
});
}
mounted() {
var this_this = this;
var element = this.$el.getElementsByTagName("input")[0];
this.datepicker = new Flatpickr(element, {
allowInput: true,
altFormat: "Y-m-d H:i:s",
dateFormat: "Y-m-d H:i:s",
enableTime: true,
onChange: function(selectedDates, dateStr, instance) {
this_this.$emit('onChange', dateStr)
},
});
}
};
</script>

417
packages/Webkul/Admin/src/Resources/assets/sass/app.scss vendored
View File

@ -258,273 +258,174 @@ body {
// admin dashboard css
.dashboard-content {
.dashboard {
.dashboard-stats {
display: flex;
.page-header {
margin-bottom: 0 !important;
padding-bottom: 15px;
border-bottom: 1px solid $border-color;
}
.graph-category {
display: flex;
margin-top: 25px;
.page-content {
margin-top: 15px;
}
.card {
height: 445px;
background: #FFFFFF;
border: 1px solid #E7E7E7;
box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08);
border-radius: 2px;
padding: 20px 0px 0px 20px;
.card-title {
font-size: 14px;
color: #A2A2A2;
letter-spacing: -0.26px;
text-transform: uppercase;
}
.card-info {
width: 100%;
height: 100%;
display: inline-block;
&.center {
text-align: center;
}
ul {
li {
border-bottom: 1px solid $border-color;
width: 100%;
display: inline-block;
padding: 10px 0;
position: relative;
.image {
height: 60px;
width: 60px;
float: left;
margin-right: 15px;
&.product {
background: #F2F2F2;
}
img {
width: 100%;
}
}
.description {
margin-top: 10px;
.name {
color: #0041FF;
}
.info {
color: #3A3A3A;
margin-top: 5px;
}
}
.icon.angle-right-icon {
position: absolute;
right: 30px;
top: 50%;
margin-top: -8px;
}
&:last-child {
border-bottom: 0;
}
}
}
.no-result-found {
margin-top: 146px;
p {
margin: 0;
color: #A2A2A2;
}
}
}
}
.dashboard-stats {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
grid-auto-rows: auto;
grid-column-gap: 30px;
grid-row-gap: 15px;
.dashboard-card {
height: 100px;
background: #FFFFFF;
border: 1px solid #E7E7E7;
box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08);
border-radius: 5px;
position: relative;
padding: 15px;
.title {
font-size: 14px;
color: #A2A2A2;
text-transform: uppercase;
}
.data {
padding-top: 3px;
font-size: 32px;
color: #0041FF;
.progress {
font-size: 14px;
color: #8E8E8E;
float: right;
margin-top: 9px;
.icon {
vertical-align: middle;
}
}
}
}
}
.graph-stats {
margin-top: 30px;
width: 100%;
display: inline-block;
.left-card-container {
float: left;
width: 75%;
padding-right: 9px;
}
.right-card-container {
float: left;
width: 25%;
padding-left: 21px;
}
}
.sale-stock {
display: flex;
margin-top: 25px;
width: 100%;
display: inline-block;
display: grid;
grid-template-columns: repeat(auto-fill, minmax(435px, 1fr));
grid-auto-rows: auto;
grid-column-gap: 30px;
grid-row-gap: 15px;
margin-top: 30px;
}
}
// admin dashboard css ends here
// admin dashboard component
.dashboard-card {
height: 100px;
width: 22%;
background: #FFFFFF;
border: 1px solid #E7E7E7;
box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08);
border-radius: 5px;
.visitor-content {
padding: 15px;
.title {
span {
padding-top:10px;
font-size: 14px;
color: #A2A2A2;
letter-spacing: -0.26px;
}
}
.data {
padding-top: 3px;
span {
font-size: 32px;
color: #0041FF;
letter-spacing: -0.6px;
img {
margin-left: 75px;
height: 24px;
width:24px;
}
}
span.right {
padding-top: 12px;
float: right;
font-size: 14px;
color: #8E8E8E;
letter-spacing: -0.7px;
}
}
}
}
.dashboard-card:nth-last-child(1) {
margin-left: 30px;
}
.dashboard-card:nth-last-child(2) {
margin-left: 30px;
}
.dashboard-card:nth-last-child(3) {
margin-left: 30px;
}
.dashboard-graph {
height: 413px;
width: 70.5%;
background: #FFFFFF;
border: 1px solid #E7E7E7;
box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08);
border-radius: 2px;
}
.sale {
height: 465px;
width: 30.1%;
background: #FFFFFF;
border: 1px solid #E7E7E7;
box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08);
border-radius: 2px;
.top-sale {
margin-left: 20px;
margin-top: 27px;
.title {
span {
font-size: 14px;
color: #A2A2A2;
letter-spacing: -0.26px;
}
}
.sale-info {
ul {
li {
.pro-attribute{
display: flex;
margin-top: 10px;
.pro-img {
height: 60px;
width: 60px;
border: 1px solid green;
}
.product-description {
margin-left: 15px;
margin-top: 8px;
width: 75%;
.product-name {
span {
font-size: 14px;
color: #0041FF;
letter-spacing: -0.26px;
}
.right-side {
float: right;
margin-top: 10px;
height: 20px;
width: 20px;
}
}
.product-info {
span {
font-size: 14px;
color: #3A3A3A;
letter-spacing: -0.26px;
}
}
}
}
.horizontal-rule {
border: .5px solid #A2A2A2;
opacity: 0.2;
margin-top: 10px;
}
}
li:last-child {
.horizontal-rule {
display: none;
}
}
}
}
}
}
.sale:nth-last-child(1) {
margin-left: 31px;
}
.sale:nth-last-child(2) {
margin-left: 31px;
}
// admin dashboard css ends here
.performing-category {
height: 413px;
width: 22%;
margin-left: 30px;
background: #FFFFFF;
border: 1px solid #E7E7E7;
box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08);
border-radius: 2px;
.category {
margin-left: 20px;
margin-top: 20px;
.title {
span {
font-size: 14px;
color: #A2A2A2;
letter-spacing: -0.26px;
}
}
.category-info {
margin-top: 30px;
ul {
li {
.category-list {
margin-top: 10px;
.cat-name {
span {
font-size: 16px;
color: #0041FF;
letter-spacing: -0.3px;
}
.right-side {
float: right;
margin-right: 12px;
margin-top: 10px;
height: 20px;
width: 20px;
}
}
.product-info {
margin-top: 5px;
span {
font-size: 16px;
color: #3A3A3A;
letter-spacing: -0.3px;
}
}
.horizon-rule {
margin-top: 8px;
border: .7px solid #D8D8D8;
}
}
}
li:last-child {
.category-list {
.horizon-rule {
display: none;
}
}
}
}
}
}
}
// customer oder css for admin start here
.sale-container {

29
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -7,7 +7,25 @@ return [
'state' => 'State'
],
'dashboard' => [
'title' => 'Dashboard'
'title' => 'Dashboard',
'from' => 'From',
'to' => 'To',
'total-customers' => 'Total Customers',
'total-orders' => 'Total Orders',
'total-sale' => 'Total Sale',
'average-sale' => 'Average Order Sale',
'increased' => ':progress% Increased',
'decreased' => ':progress% Decreased',
'sales' => 'Sales',
'top-performing-categories' => 'Top Performing Categories',
'product-count' => ':count Products',
'top-selling-products' => 'Top Selling Products',
'sale-count' => ':count Sales',
'customer-with-most-sales' => 'Customer With Most Sales',
'order-count' => ':count Orders',
'revenue' => 'Revenue :total',
'stock-threshold' => 'Stock Threshold',
'qty-left' => ':qty Left',
],
'account' => [
'title' => 'My Account',
@ -32,6 +50,8 @@ return [
'title' => 'Reset Password',
'title' => 'Reset Password',
'email' => 'Registered Email',
'password' => 'Password',
'confirm-password' => 'Confirm Password',
'back-link-title' => 'Back to Sign In',
'submit-btn-title' => 'Reset Password'
],
@ -471,6 +491,13 @@ return [
'summary' => 'Summary of Shipment',
'carrier' => 'Carrier',
'tracking-number' => 'Tracking Number'
],
'forget-password' => [
'dear' => 'Dear :name',
'info' => 'You are receiving this email because we received a password reset request for your account.',
'reset-password' => 'Reset Password',
'final-summary' => 'If you did not request a password reset, no further action is required.',
'thanks' => 'Thanks!'
]
],
'error' => [

835
packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php
View File

@ -5,497 +5,452 @@
@stop
@section('content-wrapper')
<div class="content full-page">
<h1>Dashboard</h1>
<div class="dashboard-content">
<div class="content full-page dashboard">
<div class="page-header">
<div class="page-title">
<h1>{{ __('admin::app.dashboard.title') }}</h1>
</div>
<div class="page-action">
<date-filter></date-filter>
</div>
</div>
<div class="page-content">
<div class="dashboard-stats">
<div class="dashboard-card">
<div class="visitor-content">
<div class="title">
<span>NEW VISITORS </span>
</div>
<div class="data">
<span>450 </span>
<span>
<img src="{{asset('themes/default/assets/images/complete.svg')}}" />
</span>
<span class="right">
12.5% Increased
</span>
</div>
<div class="title">
{{ __('admin::app.dashboard.total-customers') }}
</div>
<div class="data">
{{ $statistics['total_customers']['current'] }}
<span class="progress">
@if ($statistics['total_customers']['progress'] < 0)
<span class="icon graph-down-icon"></span>
{{ __('admin::app.dashboard.decreased', [
'progress' => -number_format($statistics['total_customers']['progress'], 1)
])
}}
@else
<span class="icon graph-up-icon"></span>
{{ __('admin::app.dashboard.increased', [
'progress' => number_format($statistics['total_customers']['progress'], 1)
])
}}
@endif
</span>
</div>
</div>
<div class="dashboard-card">
<div class="visitor-content">
<div class="title">
<span>NEW VISITORS </span>
</div>
<div class="data">
<span>450 </span>
<span>
<img src="{{asset('themes/default/assets/images/complete.svg')}}" />
</span>
<span class="right">
12.5% Increased
</span>
</div>
<div class="title">
{{ __('admin::app.dashboard.total-orders') }}
</div>
<div class="data">
{{ $statistics['total_orders']['current'] }}
<span class="progress">
@if ($statistics['total_orders']['progress'] < 0)
<span class="icon graph-down-icon"></span>
{{ __('admin::app.dashboard.decreased', [
'progress' => -number_format($statistics['total_orders']['progress'], 1)
])
}}
@else
<span class="icon graph-up-icon"></span>
{{ __('admin::app.dashboard.increased', [
'progress' => number_format($statistics['total_orders']['progress'], 1)
])
}}
@endif
</span>
</div>
</div>
<div class="dashboard-card">
<div class="visitor-content">
<div class="title">
<span>NEW VISITORS </span>
</div>
<div class="data">
<span>450 </span>
<span>
<img src="{{asset('themes/default/assets/images/complete.svg')}}" />
</span>
<span class="right">
12.5% Increased
</span>
</div>
<div class="title">
{{ __('admin::app.dashboard.total-sale') }}
</div>
<div class="data">
{{ core()->formatBasePrice($statistics['total_sales']['current']) }}
<span class="progress">
@if ($statistics['total_sales']['progress'] < 0)
<span class="icon graph-down-icon"></span>
{{ __('admin::app.dashboard.decreased', [
'progress' => -number_format($statistics['total_sales']['progress'], 1)
])
}}
@else
<span class="icon graph-up-icon"></span>
{{ __('admin::app.dashboard.increased', [
'progress' => number_format($statistics['total_sales']['progress'], 1)
])
}}
@endif
</span>
</div>
</div>
<div class="dashboard-card">
<div class="visitor-content">
<div class="title">
<span>NEW VISITORS </span>
</div>
<div class="data">
<span>450 </span>
<span>
<img src="{{asset('themes/default/assets/images/complete.svg')}}" />
</span>
<span class="right">
12.5% Increased
</span>
</div>
<div class="title">
{{ __('admin::app.dashboard.average-sale') }}
</div>
<div class="data">
{{ core()->formatBasePrice($statistics['avg_sales']['current']) }}
<span class="progress">
@if ($statistics['avg_sales']['progress'] < 0)
<span class="icon graph-down-icon"></span>
{{ __('admin::app.dashboard.decreased', [
'progress' => -number_format($statistics['avg_sales']['progress'], 1)
])
}}
@else
<span class="icon graph-up-icon"></span>
{{ __('admin::app.dashboard.increased', [
'progress' => number_format($statistics['avg_sales']['progress'], 1)
])
}}
@endif
</span>
</div>
</div>
</div>
<div class="graph-category">
<div class="dashboard-graph">
</div>
<div class="graph-stats">
<div class="performing-category">
<div class="category">
<div class="title">
<span> TOP PERFORMING CATEGORIES </span>
<div class="left-card-container graph">
<div class="card">
<div class="card-title" style="margin-bottom: 30px;">
{{ __('admin::app.dashboard.sales') }}
</div>
<div class="category-info">
<ul>
<div class="card-info">
<li>
<div class="category-list">
<div class="cat-name">
<span> Men </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span>250 Products . 290 Sales </span>
</div>
<div class="horizon-rule">
</div>
</div>
</li>
<li>
<div class="category-list">
<div class="cat-name">
<span> Women </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span>375 Products . 350 Sales </span>
</div>
<div class="horizon-rule">
</div>
</div>
</li>
<li>
<div class="category-list">
<div class="cat-name">
<span> Electronics </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span>200 Products . 214 Sales </span>
</div>
<div class="horizon-rule">
</div>
</div>
</li>
<li>
<div class="category-list">
<div class="cat-name">
<span> Accessories </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span>180 Products . 180 Sales </span>
</div>
<div class="horizon-rule">
</div>
</div>
</li>
</ul>
<canvas id="myChart" style="width: 100%; height: 87%"></canvas>
</div>
</div>
</div>
<div class="right-card-container category">
<div class="card">
<div class="card-title">
{{ __('admin::app.dashboard.top-performing-categories') }}
</div>
<div class="card-info {{ !count($statistics['top_selling_categories']) ? 'center' : '' }}">
<ul>
@foreach ($statistics['top_selling_categories'] as $item)
<li>
<a href="{{ route('admin.catalog.categories.edit', $item->category_id) }}">
<div class="description">
<div class="name">
{{ $item->name }}
</div>
<div class="info">
{{ __('admin::app.dashboard.product-count', ['count' => $item->total_products]) }}
&nbsp;.&nbsp;
{{ __('admin::app.dashboard.sale-count', ['count' => $item->total_qty_ordered]) }}
</div>
</div>
<span class="icon angle-right-icon"></span>
</a>
</li>
@endforeach
</ul>
@if (!count($statistics['top_selling_categories']))
<div class="no-result-found">
<i class="icon no-result-icon"></i>
<p>{{ __('admin::app.common.no-result-found') }}</p>
</div>
@endif
</div>
</div>
</div>
</div>
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
<div class="sale-stock">
<div class="sale">
<div class="top-sale">
<div class="title">
<span> TOP SELLING PRODUCTS </span>
</div>
<div class="card">
<div class="card-title">
{{ __('admin::app.dashboard.top-selling-products') }}
</div>
<div class="sale-info">
<ul>
<li>
<div class="pro-attribute">
<div class="pro-img">
<!-- <span class="icon settings-icon"></span> -->
</div>
<div class="product-description">
<div class="product-name">
<span> Men's Olive Denim Jacket </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span>250 Sales . In Stock - 500 </span>
</div>
</div>
</div>
<div class="horizontal-rule">
</div>
</li>
<div class="card-info {{ !count($statistics['top_selling_products']) ? 'center' : '' }}">
<ul>
<li>
<div class="pro-attribute">
<div class="pro-img">
<!-- <span class="icon settings-icon"></span> -->
</div>
<div class="product-description">
<div class="product-name">
<span> Apple iPhone 8 Plus - 64GB </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span>250 Sales . In Stock - 500 </span>
</div>
</div>
</div>
<div class="horizontal-rule">
</div>
</li>
@foreach ($statistics['top_selling_products'] as $item)
<li>
<a href="{{ route('admin.catalog.products.edit', $item->product_id) }}">
<div class="product image">
<?php $productBaseImage = $productImageHelper->getProductBaseImage($item->product); ?>
<li>
<div class="pro-attribute">
<div class="pro-img">
<!-- <span class="icon settings-icon"></span> -->
<img class="item-image" src="{{ $productBaseImage['small_image_url'] }}" />
</div>
<div class="product-description">
<div class="product-name">
<span> Long Lenngth Printed Shrug </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span>250 Products . In Stock - 500 </span>
</div>
</div>
</div>
<div class="horizontal-rule">
</div>
</li>
<li>
<div class="pro-attribute">
<div class="pro-img">
<!-- <span class="icon settings-icon"></span> -->
</div>
<div class="product-description">
<div class="product-name">
<span> Black Round Neck T-Shirt for Men </span>
<span class="icon angle-right-icon right-side"></span>
<div class="description">
<div class="name">
{{ $item->name }}
</div>
<div class="product-info">
<span>250 Products . In Stock - 500 </span>
</div>
</div>
</div>
<div class="horizontal-rule">
</div>
</li>
<li>
<div class="pro-attribute">
<div class="pro-img">
<!-- <span class="icon settings-icon"></span> -->
</div>
<div class="product-description">
<div class="product-name">
<span> Men's Linnen Shirt -Regular Fit </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span>250 Products . In Stock - 500 </span>
<div class="info">
{{ __('admin::app.dashboard.sale-count', ['count' => $item->total_qty_ordered]) }}
</div>
</div>
</div>
<div class="horizontal-rule">
</div>
<span class="icon angle-right-icon"></span>
</a>
</li>
</ul>
</div>
@endforeach
</ul>
@if (!count($statistics['top_selling_products']))
<div class="no-result-found">
<i class="icon no-result-icon"></i>
<p>{{ __('admin::app.common.no-result-found') }}</p>
</div>
@endif
</div>
</div>
<div class="sale">
<div class="top-sale">
<div class="title">
<span> CUSTOMERS WITH MOST SALES </span>
</div>
<div class="sale-info">
<ul>
<li>
<div class="pro-attribute">
<div class="pro-img">
<!-- <span class="icon settings-icon"></span> -->
</div>
<div class="product-description">
<div class="product-name">
<span> Emma Wagner </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span> 24 Orders . Revenue $450.00 </span>
</div>
</div>
</div>
<div class="horizontal-rule">
</div>
</li>
<li>
<div class="pro-attribute">
<div class="pro-img">
<!-- <span class="icon settings-icon"></span> -->
</div>
<div class="product-description">
<div class="product-name">
<span> Emma Wagner </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span> 24 Orders . Revenue $450.00 </span>
</div>
</div>
</div>
<div class="horizontal-rule">
</div>
</li>
<li>
<div class="pro-attribute">
<div class="pro-img">
<!-- <span class="icon settings-icon"></span> -->
</div>
<div class="product-description">
<div class="product-name">
<span> Emma Wagner </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span> 24 Orders . Revenue $450.00 </span>
</div>
</div>
</div>
<div class="horizontal-rule">
</div>
</li>
<li>
<div class="pro-attribute">
<div class="pro-img">
<!-- <span class="icon settings-icon"></span> -->
</div>
<div class="product-description">
<div class="product-name">
<span> Emma Wagner </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span> 24 Orders . Revenue $450.00 </span>
</div>
</div>
</div>
<div class="horizontal-rule">
</div>
</li>
<li>
<div class="pro-attribute">
<div class="pro-img">
<!-- <span class="icon settings-icon"></span> -->
</div>
<div class="product-description">
<div class="product-name">
<span> Emma Wagner </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span> 24 Orders . Revenue $450.00 </span>
</div>
</div>
</div>
<div class="horizontal-rule">
</div>
</li>
</ul>
</div>
<div class="card">
<div class="card-title">
{{ __('admin::app.dashboard.customer-with-most-sales') }}
</div>
<div class="card-info {{ !count($statistics['customer_with_most_sales']) ? 'center' : '' }}">
<ul>
@foreach ($statistics['customer_with_most_sales'] as $item)
<li>
@if ($item->customer_id)
<a href="{{ route('admin.customer.edit', $item->customer_id) }}">
@endif
<div class="image">
<span class="icon profile-pic-icon"></span>
</div>
<div class="description">
<div class="name">
{{ $item->customer_full_name }}
</div>
<div class="info">
{{ __('admin::app.dashboard.order-count', ['count' => $item->total_orders]) }}
&nbsp;.&nbsp;
{{ __('admin::app.dashboard.revenue', [
'total' => core()->formatBasePrice($item->total_base_grand_total)
])
}}
</div>
</div>
<span class="icon angle-right-icon"></span>
@if ($item->customer_id)
</a>
@endif
</li>
@endforeach
</ul>
@if (!count($statistics['customer_with_most_sales']))
<div class="no-result-found">
<i class="icon no-result-icon"></i>
<p>{{ __('admin::app.common.no-result-found') }}</p>
</div>
@endif
</div>
</div>
<div class="sale">
<div class="top-sale">
<div class="title">
<span> TOP SELLING PRODUCTS </span>
</div>
<div class="sale-info">
<ul>
<li>
<div class="pro-attribute">
<div class="pro-img">
<!-- <span class="icon settings-icon"></span> -->
</div>
<div class="product-description">
<div class="product-name">
<span> Men's Olive Denim Jacket </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span>7 left </span>
</div>
</div>
</div>
<div class="horizontal-rule">
</div>
</li>
<li>
<div class="pro-attribute">
<div class="pro-img">
<!-- <span class="icon settings-icon"></span> -->
</div>
<div class="product-description">
<div class="product-name">
<span> Apple iPhone 8 Plus - 64GB </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span>250 Sales . In Stock - 500 </span>
</div>
</div>
</div>
<div class="horizontal-rule">
</div>
</li>
<li>
<div class="pro-attribute">
<div class="pro-img">
<!-- <span class="icon settings-icon"></span> -->
</div>
<div class="product-description">
<div class="product-name">
<span> Long Lenngth Printed Shrug </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span>250 Products . In Stock - 500 </span>
</div>
</div>
</div>
<div class="horizontal-rule">
</div>
</li>
<li>
<div class="pro-attribute">
<div class="pro-img">
<!-- <span class="icon settings-icon"></span> -->
</div>
<div class="product-description">
<div class="product-name">
<span> Black Round Neck T-Shirt for Men </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span>250 Products . In Stock - 500 </span>
</div>
</div>
</div>
<div class="horizontal-rule">
</div>
</li>
<li>
<div class="pro-attribute">
<div class="pro-img">
<!-- <span class="icon settings-icon"></span> -->
</div>
<div class="product-description">
<div class="product-name">
<span> Men's Linnen Shirt -Regular Fit </span>
<span class="icon angle-right-icon right-side"></span>
</div>
<div class="product-info">
<span>250 Products . In Stock - 500 </span>
</div>
</div>
</div>
<div class="horizontal-rule">
</div>
</li>
</ul>
</div>
<div class="card">
<div class="card-title">
{{ __('admin::app.dashboard.stock-threshold') }}
</div>
<div class="card-info {{ !count($statistics['stock_threshold']) ? 'center' : '' }}">
<ul>
@foreach ($statistics['stock_threshold'] as $item)
<li>
<a href="{{ route('admin.catalog.products.edit', $item->product_id) }}">
<div class="image">
<?php $productBaseImage = $productImageHelper->getProductBaseImage($item->product); ?>
<img class="item-image" src="{{ $productBaseImage['small_image_url'] }}" />
</div>
<div class="description">
<div class="name">
{{ $item->product->name }}
</div>
<div class="info">
{{ __('admin::app.dashboard.qty-left', ['qty' => $item->total_qty]) }}
</div>
</div>
<span class="icon angle-right-icon"></span>
</a>
</li>
@endforeach
</ul>
@if (!count($statistics['stock_threshold']))
<div class="no-result-found">
<i class="icon no-result-icon"></i>
<p>{{ __('admin::app.common.no-result-found') }}</p>
</div>
@endif
</div>
</div>
</div>
</div>
</div>
@stop
@push('scripts')
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js"></script>
<script type="text/x-template" id="date-filter-template">
<div>
<div class="control-group date">
<date @onChange="applyFilter('start', $event)"><input type="text" class="control" id="start_date" value="{{ $startDate->format('Y-m-d') }}" placeholder="{{ __('admin::app.dashboard.from') }}" v-model="start"/></date>
</div>
<div class="control-group date">
<date @onChange="applyFilter('end', $event)"><input type="text" class="control" id="end_date" value="{{ $endDate->format('Y-m-d') }}" placeholder="{{ __('admin::app.dashboard.to') }}" v-model="end"/></date>
</div>
</div>
</script>
<script>
Vue.component('date-filter', {
template: '#date-filter-template',
data: () => ({
start: "{{ $startDate->format('Y-m-d') }}",
end: "{{ $endDate->format('Y-m-d') }}",
}),
methods: {
applyFilter(field, date) {
this[field] = date;
window.location.href = "?start=" + this.start + '&end=' + this.end;
}
}
});
$(document).ready(function () {
var ctx = document.getElementById("myChart").getContext('2d');
var data = @json($statistics['sale_graph']);
var myChart = new Chart(ctx, {
type: 'bar',
data: {
labels: data['label'],
datasets: [{
data: data['total'],
backgroundColor: 'rgba(34, 201, 93, 1)',
borderColor: 'rgba(34, 201, 93, 1)',
borderWidth: 1
}]
},
options: {
responsive: true,
legend: {
display: false
},
scales: {
xAxes: [{
maxBarThickness: 20,
gridLines : {
display : false,
drawBorder: false,
},
ticks: {
beginAtZero: true,
fontColor: 'rgba(162, 162, 162, 1)'
}
}],
yAxes: [{
gridLines: {
drawBorder: false,
},
ticks: {
padding: 20,
beginAtZero: true,
fontColor: 'rgba(162, 162, 162, 1)'
}
}]
},
tooltips: {
mode: 'index',
intersect: false,
displayColors: false,
callbacks: {
label: function(tooltipItem, dataTemp) {
return data['formated_total'][tooltipItem.index];
}
}
}
}
});
});
</script>
@endpush

2
packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php
View File

@ -7,6 +7,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="csrf-token" content="{{ csrf_token() }}">
<link rel="icon" sizes="16x16" href="{{ asset('vendor/webkul/ui/assets/images/favicon.ico') }}" />
<link rel="stylesheet" href="{{ asset('vendor/webkul/admin/assets/css/admin.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/webkul/ui/assets/css/ui.css') }}">

7
packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php
View File

@ -1,10 +1,10 @@
@extends('admin::layouts.master')
@extends('admin::layouts.content')
@section('page_title')
{{ __('admin::app.sales.orders.title') }}
@stop
@section('content-wrapper')
@section('content')
<div class="content full-page">
<div class="page-header">
<div class="page-title">
@ -16,7 +16,8 @@
</div>
<div class="page-content">
@inject('orderGrid', 'Webkul\Admin\DataGrids\OrderDataGrid')
{!! $orderGrid->render() !!}
</div>
</div>
@stop

131
packages/Webkul/Checkout/src/Cart.php
View File

@ -159,9 +159,14 @@ class Cart {
*
* @return void
*/
public function add($id, $data)
public function add($id, $data, $prepared = false, $preparedData = [])
{
$itemData = $this->prepareItemData($id, $data);
if($prepared == false) {
$itemData = $this->prepareItemData($id, $data);
}
else {
$itemData = $preparedData;
}
if(!$itemData) {
return false;
@ -172,7 +177,7 @@ class Cart {
$cartItems = $cart->items;
//check the isset conditions as collection empty object will mislead the condition and errorhandling case.
//check the isset conditions as collection empty object will mislead the condition and error handling case.
if(isset($cartItems) && $cartItems->count()) {
foreach($cartItems as $cartItem) {
if($product->type == "simple") {
@ -202,6 +207,12 @@ class Cart {
} else if($product->type == "configurable") {
if($cartItem->type == "configurable") {
$temp = $this->cartItem->findOneByField('parent_id', $cartItem->id);
if($prepared == true) {
$data['selected_configurable_option'] = $preparedData['parent']['product_id'];
}
if($temp->product_id == $data['selected_configurable_option']) {
$child = $temp->child;
@ -252,11 +263,23 @@ class Cart {
if(isset($cart)) {
$this->cart->delete($cart->id);
} else {
return $this->createNewCart($id, $data);
if($prepared == false) {
return $this->createNewCart($id, $data);
}
else {
return $this->createNewCart($id, $data, true, $preparedData);
}
}
}
} else {
return $this->createNewCart($id, $data);
// return $this->createNewCart($id, $data);
if($prepared == false) {
return $this->createNewCart($id, $data);
}
else {
return $this->createNewCart($id, $data, true, $preparedData);
}
}
}
@ -268,9 +291,12 @@ class Cart {
*
* @return Booleans
*/
public function createNewCart($id, $data)
public function createNewCart($id, $data, $prepared = false, $preparedData = [])
{
$itemData = $this->prepareItemData($id, $data);
if($prepared == false)
$itemData = $this->prepareItemData($id, $data);
else
$itemData = $preparedData;
//if the item data is not valid to be processed it will be returning false
if($itemData == false) {
@ -297,7 +323,13 @@ class Cart {
$cartData['cart_currency_code'] = core()->getCurrentCurrencyCode();
//set the cart items and quantity
$cartData['items_count'] = 1;
$cartData['items_qty'] = $data['quantity'];
if($prepared == false) {
$cartData['items_qty'] = $data['quantity'];
} else {
$cartData['items_qty'] = 1;
}
//create the cart instance in the database
if($cart = $this->cart->create($cartData)) {
@ -306,7 +338,11 @@ class Cart {
if ($product->type == "configurable") {
//parent item entry
$itemData['parent']['additional'] = json_encode($data);
if($prepared == false) {
$itemData['parent']['additional'] = json_encode($data);
} else {
$itemData['parent']['additional'] = json_encode($preparedData);
}
if($parent = $this->cartItem->create($itemData['parent'])) {
//child item entry
@ -953,17 +989,78 @@ class Cart {
* Move a wishlist item to cart
*/
public function moveToCart($productId) {
$data = [
'product' => $productId,
'quantity' => 1,
];
$product = $this->product->find($productId);
$result = $this->add($productId, $data);
if($product->parent_id == null ||$product->parent_id == 'null') {
$data = [
'product' => $productId,
'quantity' => 1,
];
if($result instanceof Collection || $result == true) {
return true;
$result = $this->add($productId, $data);
if($result instanceof Collection || $result == true) {
return true;
} else {
return false;
}
} else {
return false;
//in case the product added is a configurable product.
$result = $this->moveConfigurableFromWishlistToCart($product->parent_id, $product->id);
if(is_array($result)) {
$data['quantity'] = 1;
$data['selected_configurable_option'] = $product->parent_id;
$moved = $this->add($data['selected_configurable_option'], $data, true, $result);
if($moved) {
return true;
} else {
return false;
}
}
}
}
/**
* Move a configurable product from wishlist to cart.
*
* @return mixed
*/
public function moveConfigurableFromWishlistToCart($configurableproductId, $productId) {
$product = $this->product->find($configurableproductId);
$child = $childData = null;
if($product->type == 'configurable') {
$child = $this->product->findOneByField('id', $productId);
$childData = [
'product_id' => $configurableproductId,
'sku' => $child->sku,
'name' => $child->name,
'type' => 'simple'
];
}
$price = ($product->type == 'configurable' ? $child->price : $product->price);
$parentData = [
'sku' => $product->sku,
'product_id' => $productId,
'quantity' => 1,
'type' => $product->type,
'name' => $product->name,
'price' => core()->convertPrice($price),
'base_price' => $price,
'total' => core()->convertPrice($price),
'base_total' => $price,
'weight' => $weight = ($product->type == 'configurable' ? $child->weight : $product->weight),
'total_weight' => $weight,
'base_total_weight' => $weight
];
return ['parent' => $parentData, 'child' => $childData];
}
}

73
packages/Webkul/Core/src/Core.php
View File

@ -512,4 +512,77 @@ class Core
return $collection;
}
/**
* Returns time intervals
*
* @return array
*/
public function getTimeInterval($startDate, $endDate) {
$timeIntervals = [];
$totalDays = $startDate->diffInDays($endDate);
$totalMonths = $startDate->diffInMonths($endDate);
$startWeekDay = Carbon::createFromTimeString($this->xWeekRange($startDate, 0) . ' 00:00:01');
$endWeekDay = Carbon::createFromTimeString($this->xWeekRange($endDate, 1) . ' 23:59:59');
$totalWeeks = $startWeekDay->diffInWeeks($endWeekDay);
if($totalMonths > 5) {
for ($i = 0; $i < $totalMonths; $i++) {
$date = clone $startDate;
$date->addMonths($i);
$start = Carbon::createFromTimeString($date->format('Y-m-d') . ' 00:00:01');
$end = $totalMonths - 1 == $i
? $endDate
: Carbon::createFromTimeString($date->format('Y-m-d') . ' 23:59:59');
$timeIntervals[] = ['start' => $start, 'end' => $end, 'formatedDate' => $date->format('M')];
}
} elseif($totalWeeks > 6) {
for ($i = 0; $i < $totalWeeks; $i++) {
$date = clone $startDate;
$date->addWeeks($i);
$start = $i == 0
? $startDate
: Carbon::createFromTimeString($this->xWeekRange($date, 0) . ' 00:00:01');
$end = $totalWeeks - 1 == $i
? $endDate
: Carbon::createFromTimeString($this->xWeekRange($date, 1) . ' 23:59:59');
$timeIntervals[] = ['start' => $start, 'end' => $end, 'formatedDate' => $date->format('d M')];
}
} else {
for ($i = 0; $i < $totalDays; $i++) {
$date = clone $startDate;
$date->addDays($i);
$start = Carbon::createFromTimeString($date->format('Y-m-d') . ' 00:00:01');
$end = Carbon::createFromTimeString($date->format('Y-m-d') . ' 23:59:59');
$timeIntervals[] = ['start' => $start, 'end' => $end, 'formatedDate' => $date->format('d M')];
}
}
return $timeIntervals;
}
/**
* @return string
*/
public function xWeekRange($date, $day) {
$ts = strtotime($date);
if(!$day) {
$start = (date('D', $ts) == 'Sun') ? $ts : strtotime('last sunday', $ts);
return date('Y-m-d', $start);
} else {
$end = (date('D', $ts) == 'Sat') ? $ts : strtotime('next saturday', $ts);
return date('Y-m-d', $end);
}
}
}

1
packages/Webkul/Core/src/Database/Migrations/2018_07_20_054542_create_currency_exchange_rates_table.php
View File

@ -16,7 +16,6 @@ class CreateCurrencyExchangeRatesTable extends Migration
Schema::create('currency_exchange_rates', function (Blueprint $table) {
$table->increments('id');
$table->decimal('rate', 10, 5);
$table->integer('target_currency')->unique()->unsigned();
$table->foreign('target_currency')->references('id')->on('currencies')->onDelete('cascade');
$table->timestamps();

36
packages/Webkul/Core/src/Eloquent/Repository.php
View File

@ -87,7 +87,41 @@ abstract class Repository extends BaseRepository {
*/
public function count()
{
return $this->model->count();
$this->applyCriteria();
$this->applyScope();
$total = $this->model->count();
$this->resetModel();
return $total;
}
/**
* @return mixed
*/
public function sum($columns)
{
$this->applyCriteria();
$this->applyScope();
$sum = $this->model->sum($columns);
$this->resetModel();
return $sum;
}
/**
* @return mixed
*/
public function avg($columns)
{
$this->applyCriteria();
$this->applyScope();
$avg = $this->model->avg($columns);
$this->resetModel();
return $avg;
}
/**

8
packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
View File

@ -51,20 +51,20 @@ class RegistrationController extends Controller
*/
public function create(Request $request)
{
// dd(request()->input());
$request->validate([
'first_name' => 'string|required',
'last_name' => 'string|required',
'email' => 'email|required',
'password' => 'confirmed|min:6|required',
'agreement' => 'confirmed'
'agreement' => 'required'
]);
$data = request()->input();
$data['password'] = bcrypt($data['password']);
$data['channel_id'] = core()->getCurrentChannel()->id;
if ($this->customer->create($data)) {
session()->flash('success', 'Account created successfully.');
@ -72,11 +72,9 @@ class RegistrationController extends Controller
return redirect()->route($this->_config['redirect']);
} else {
session()->flash('error', 'Cannot Create Your Account.');
return redirect()->back();
}
}
}

21
packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
View File

@ -133,7 +133,6 @@ class WishlistController extends Controller
* @return response
*/
public function addconfigurable($urlkey) {
dd($urlkey);
session()->flash('warning', trans('Select options before adding to wishlist'));
return redirect()->route('shop.products.index', $urlkey);
}
@ -155,16 +154,24 @@ class WishlistController extends Controller
public function move($productId) {
$result = Cart::moveToCart($productId);
$wishlist = $this->wishlist->findWhere(['customer_id' => auth()->guard('customer')->user()->id, 'product_id' => $productId]);
if($result) {
$wishlist = $this->wishlist->findWhere(['customer_id' => auth()->guard('customer')->user()->id, 'product_id' => $productId]);
if($this->wishlist->delete($wishlist[0]->id)) {
session()->flash('success', 'Item Moved To Cart Successfully');
if($this->wishlist->delete($wishlist[0]->id)) {
Cart::collectTotals();
return redirect()->back();
session()->flash('success', 'Item Moved To Cart Successfully');
return redirect()->back();
} else {
session()->flash('error', 'Item Cannot Be Moved To Cart Successfully');
return redirect()->back();
}
} else {
session()->flash('error', 'Item Cannot Be Moved To Cart Successfully');
Session('error', 'Cannot Add The Product To Wishlist Due To Unknown Problems, Please Checkback Later');
return redirect()->back();
}
}
}
}

4
packages/Webkul/Customer/src/Models/Customer.php
View File

@ -18,9 +18,9 @@ class Customer extends Authenticatable
protected $table = 'customers';
protected $fillable = ['channel_id', 'first_name', 'last_name', 'gender', 'date_of_birth','phone','email','password','customer_group_id','subscribed_to_news_letter'];
protected $fillable = ['first_name', 'channel_id', 'last_name', 'gender', 'date_of_birth', 'phone', 'email', 'password', 'customer_group_id', 'subscribed_to_news_letter'];
protected $hidden = ['password','remember_token'];
protected $hidden = ['password', 'remember_token'];
protected $with = ['customerGroup'];

7
packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php
View File

@ -21,8 +21,9 @@ class CustomerResetPassword extends ResetPassword
}
return (new MailMessage)
->line('You are receiving this email because we received a password reset request for your account.')
->action('Reset Password', route('customer.reset-password.create', $this->token))
->line('If you did not request a password reset, no further action is required.');
->view('shop::emails.customer.forget-password')->with([
'user_name' => $notifiable->name,
'token' => $this->token
]);
}
}

3
packages/Webkul/Customer/src/Resources/lang/en/app.php
View File

@ -10,4 +10,7 @@ return [
'empty' => 'You Don\'t Have Any Items In Your Wishlist',
'select-options' => 'Need To Select Options Before Adding To Wishlist'
],
'reviews' => [
'empty' => 'You Haven\'t Reviewed Any Product Yet'
]
];

40
packages/Webkul/Product/src/Database/Migrations/2018_10_22_111807_create_products_grid.php Normal file
View File

@ -0,0 +1,40 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateProductsGrid extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('products_grid', function (Blueprint $table) {
$table->increments('id');
$table->integer('product_id')->unsigned();
$table->foreign('product_id')->references('id')->on('products')->onDelete('cascade');
$table->string('sku')->nullable();
$table->string('type')->nullable();
$table->string('name')->nullable();
$table->string('quantity')->default(0);
$table->string('cost')->default(0);
$table->string('price')->nullable();
$table->string('status')->nullable();
$table->string('attribute_family_name')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('products_grid');
}
}

33
packages/Webkul/Product/src/Http/Controllers/ProductController.php
View File

@ -6,9 +6,11 @@ use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Webkul\Product\Http\Requests\ProductForm;
use Webkul\Product\Repositories\ProductRepository as Product;
use Webkul\Product\Repositories\ProductGridRepository as ProductGrid;
use Webkul\Attribute\Repositories\AttributeFamilyRepository as AttributeFamily;
use Webkul\Category\Repositories\CategoryRepository as Category;
use Webkul\Inventory\Repositories\InventorySourceRepository as InventorySource;
use Event;
/**
* Product controller
@ -53,6 +55,13 @@ class ProductController extends Controller
*/
protected $product;
/**
* ProductGrid Repository object
*
* @var array
*/
protected $productGrid;
/**
* Create a new controller instance.
*
@ -66,7 +75,8 @@ class ProductController extends Controller
AttributeFamily $attributeFamily,
Category $category,
InventorySource $inventorySource,
Product $product)
Product $product,
ProductGrid $productGrid)
{
$this->attributeFamily = $attributeFamily;
@ -76,6 +86,8 @@ class ProductController extends Controller
$this->product = $product;
$this->productGrid = $productGrid;
$this->_config = request('_config');
}
@ -112,6 +124,9 @@ class ProductController extends Controller
*/
public function store()
{
//before store of the product
// Event::fire('product.save.before', false);
if(!request()->get('family') && request()->input('type') == 'configurable' && request()->input('sku') != '') {
return redirect(url()->current() . '?family=' . request()->input('attribute_family_id') . '&sku=' . request()->input('sku'));
}
@ -130,6 +145,9 @@ class ProductController extends Controller
$product = $this->product->create(request()->all());
//after store of the product
Event::fire('product.save.after', $product);
session()->flash('success', 'Product created successfully.');
return redirect()->route($this->_config['redirect'], ['id' => $product->id]);
@ -161,8 +179,14 @@ class ProductController extends Controller
*/
public function update(ProductForm $request, $id)
{
// before update of product
// Event::fire('product.update.before', $id);
$this->product->update(request()->all(), $id);
//after update of product
Event::fire('product.update.after', $this->product->find($id));
session()->flash('success', 'Product updated successfully.');
return redirect()->route($this->_config['redirect']);
@ -178,8 +202,15 @@ class ProductController extends Controller
{
$this->product->delete($id);
//before update of product
Event::fire('product.delete.after', $id);
session()->flash('success', 'Product deleted successfully.');
return redirect()->back();
}
public function sync() {
Event::fire('products.datagrid.create', true);
}
}

19
packages/Webkul/Product/src/Models/ProductGrid.php Normal file
View File

@ -0,0 +1,19 @@
<?php
namespace Webkul\Product\Models;
use Illuminate\Database\Eloquent\Model;
use Webkul\Product\Models\Product;
class ProductGrid extends Model
{
protected $table = 'products_grid';
protected $fillable = ['product_id', 'sku', 'type', 'attribute_family_name', 'name', 'quantity', 'cost', 'price', 'status'];
public $timestamps = false;
public function product() {
return $this->belongsTo(Product::class, 'product_id');
}
}

22
packages/Webkul/Product/src/Models/ProductInventory.php
View File

@ -10,19 +10,7 @@ class ProductInventory extends Model
public $timestamps = false;
protected $fillable = ['qty', 'product_id', 'inventory_source_id'];
/**
* Use by cart for
* checking the
* inventory source
* status
*
* @return Collection
*/
// public function checkInventoryStatus() {
// return $this->leftjoin('inventory_sources', 'inventory_sources.id', 'inventory_source_id')->select('status')->where('status', '=','1');
// }
/**
* Get the product attribute family that owns the product.
*/
@ -30,4 +18,12 @@ class ProductInventory extends Model
{
return $this->belongsTo(InventorySource::class);
}
/**
* Get the product that owns the product inventory.
*/
public function product()
{
return $this->belongsTo(Product::class);
}
}

15
packages/Webkul/Product/src/Providers/ProductServiceProvider.php
View File

@ -6,6 +6,7 @@ use Illuminate\Support\ServiceProvider;
use Illuminate\Routing\Router;
use Webkul\Product\Models\Product;
use Webkul\Product\Observers\ProductObserver;
use Event;
class ProductServiceProvider extends ServiceProvider
{
@ -18,6 +19,18 @@ class ProductServiceProvider extends ServiceProvider
{
$this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations');
Event::listen('products.datagrid.create', 'Webkul\Admin\Listeners\Product@sync');
Event::listen('product.save.after', 'Webkul\Admin\Listeners\Product@afterProductCreated');
Event::listen('product.update.before',
'Webkul\Admin\Listeners\Product@beforeProductUpdate');
Event::listen('product.update.after',
'Webkul\Admin\Listeners\Product@afterProductUpdate');
Event::listen('product.delete.after', 'Webkul\Admin\Listeners\Product@afterProductDelete');
Product::observe(ProductObserver::class);
}
@ -28,6 +41,6 @@ class ProductServiceProvider extends ServiceProvider
*/
public function register()
{
}
}

114
packages/Webkul/Product/src/Repositories/ProductGridRepository.php Normal file
View File

@ -0,0 +1,114 @@
<?php
namespace Webkul\Product\Repositories;
use Illuminate\Container\Container as App;
use Webkul\Core\Eloquent\Repository;
use Webkul\Product\Repositories\ProductRepository as Product;
use Webkul\Product\Helpers\Price;
/**
* Product Repository
*
* @author Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
* @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
*/
class ProductGridRepository extends Repository
{
protected $product;
/**
* Price Object
*
* @var array
*/
Protected $price;
public function __construct(
Product $product,
Price $price,
App $app
)
{
$this->product = $product;
$this->price = $price;
parent::__construct($app);
}
public function model() {
return 'Webkul\Product\Models\ProductGrid';
}
public function updateWhere($product) {
if($product->type == "simple") {
$gridObject = [
'sku' => $product->sku,
'name' => $product->name,
'attribute_family_name' => $product->toArray()['attribute_family']['name'],
'price' => $this->price->getMinimalPrice($product),
'status' => $product->status
];
$qty = 0;
if($product->parent_id == 'null') {
$gridObject['type'] = $product->type;
}
foreach($product->toArray()['inventories'] as $inventorySource) {
$qty = $qty + $inventorySource['qty'];
}
$gridObject['quantity'] = $qty;
return $this->getModel()->where('product_id', $product->id)->update($gridObject);
} else if($product->type == "configurable") {
$gridObject = [
'sku' => $product->sku,
'type' => $product->type,
'name' => $product->name,
'attribute_family_name' => $product->toArray()['attribute_family']['name'],
'price' => $this->price->getMinimalPrice($product),
'status' => $product->status
];
$qty = 0;
$gridObject['quantity'] = $qty;
$this->getModel()->where('product_id', $product->id)->update($gridObject);
$variants = $product->variants;
foreach($variants as $variant) {
$gridObject = [];
$gridObject = [
'sku' => $variant->sku,
'name' => $variant->name,
'attribute_family_name' => $variant->toArray()['attribute_family']['name'],
'price' => $this->price->getMinimalPrice($variant),
'status' => $variant->status
];
if($variant->type == 'configurable') {
$gridObject['quantity'] = 0;
} else {
$qty = 0;
foreach($variant->toArray()['inventories'] as $inventorySource) {
$qty = $qty + $inventorySource['qty'];
}
$gridObject['quantity'] = $qty;
}
return $this->getModel()->where('product_id', $product->id)->update($gridObject);
}
}
return false;
}
}

1
packages/Webkul/Sales/src/Models/OrderItem.php
View File

@ -4,6 +4,7 @@ namespace Webkul\Sales\Models;
use Illuminate\Database\Eloquent\Model;
use Webkul\Sales\Contracts\OrderItem as OrderItemContract;
use Webkul\Product\Models\Product;
class OrderItem extends Model implements OrderItemContract
{

2
packages/Webkul/Shop/src/Http/routes.php
View File

@ -76,7 +76,7 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function
//Reset Password create
Route::get('/reset-password/{token}', 'Webkul\Customer\Http\Controllers\ResetPasswordController@create')->defaults('_config', [
'view' => 'shop::customers.signup.reset-password'
])->name('password.reset');
])->name('customer.reset-password.create');
Route::post('/reset-password', 'Webkul\Customer\Http\Controllers\ResetPasswordController@store')->defaults('_config', [
'redirect' => 'customer.session.index'

4
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

@ -586,7 +586,7 @@ section.slider-block {
}
.header-bottom {
height: 48px;
height: 47px;
margin-left: auto;
margin-right: auto;
border-top: 1px solid $border-color;
@ -596,7 +596,7 @@ section.slider-block {
ul.nav {
display: block;
font-size:16px;
height: 48px;
// height: 48px;
max-width: 100%;
width: auto;
margin-left: auto;

11
packages/Webkul/Shop/src/Resources/assets/sass/icons.scss vendored
View File

@ -7,7 +7,7 @@
background-image:URL('../images/icon-dropdown-left.svg');
width: 8px;
height: 8px;
margin-left:auto;
margin-left: auto;
margin-bottom: 2px;
}
@ -15,7 +15,14 @@
background-image:URL('../images/icon-menu-close.svg');
width: 24px;
height: 24px;
margin-left:auto;
margin-left: auto;
}
.icon-menu-close-adj {
background-image:URL('../images/cross-icon-adj.svg');
width: 32px;
height: 32px;
margin-left: auto;
}
.grid-view-icon {

1
packages/Webkul/Shop/src/Resources/lang/en/app.php
View File

@ -17,7 +17,6 @@ return [
'add-review-page-title' => 'Add Review',
'write-review' => 'Write a review',
'review-title' => 'Give Your Review a Title',
'empty' => 'You Haven\'t Reviewed Any Product Yet'
],
'customer' => [

42
packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
View File

@ -21,35 +21,33 @@
</div>
<div class="account-items-list">
@if(!is_null($reviews))
@if(!$reviews->isEmpty())
@foreach($reviews as $review)
<div class="account-item-card mt-15 mb-15">
<div class="media-info">
<?php $image = $productImageHelper->getGalleryImages($review->product); ?>
<img class="media" src="{{ $image[0]['small_image_url'] }}" />
<div class="account-item-card mt-15 mb-15">
<div class="media-info">
<?php $image = $productImageHelper->getGalleryImages($review->product); ?>
<img class="media" src="{{ $image[0]['small_image_url'] }}" />
<div class="info mt-20">
<div class="product-name">{{$review->product->name}}</div>
<div class="info mt-20">
<div class="product-name">{{$review->product->name}}</div>
<div>
@for($i=0 ; $i < $review->rating ; $i++)
<span class="icon star-icon"></span>
@endfor
</div>
<div>
@for($i=0 ; $i < $review->rating ; $i++)
<span class="icon star-icon"></span>
@endfor
</div>
<div>
{{ $review->comment }}
<div>
{{ $review->comment }}
</div>
</div>
</div>
<div class="operations">
</div>
</div>
<div class="operations">
</div>
</div>
<div class="horizontal-rule mb-10 mt-10"></div>
<div class="horizontal-rule mb-10 mt-10"></div>
@endforeach
@else
<div class="empty">

2
packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
View File

@ -53,4 +53,4 @@
</div>
</div>
</div>
@endsection
@endsection

34
packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php Normal file
View File

@ -0,0 +1,34 @@
@component('admin::emails.layouts.master')
<div style="text-align: center;">
<a href="{{ config('app.url') }}">
<img src="{{ bagisto_asset('vendor/webkul/shop/assets/images/logo.svg') }}">
</a>
</div>
<div style="padding: 30px;">
<div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.dear', ['name' => $user_name]) }},
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.info') }}
</p>
<p style="text-align: center;padding: 20px 0;">
<a href="{{ route('admin.reset-password.create', $token) }}" style="padding: 10px 20px;background: #0041FF;color: #ffffff;text-transform: uppercase;text-decoration: none; font-size: 16px">
{{ __('admin::app.mail.forget-password.reset-password') }}
</a>
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.final-summary') }}
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.thanks') }}
</p>
</div>
</div>
@endcomponent

34
packages/Webkul/Shop/src/Resources/views/emails/customer/forget-password.blade.php Normal file
View File

@ -0,0 +1,34 @@
@component('admin::emails.layouts.master')
<div style="text-align: center;">
<a href="{{ config('app.url') }}">
<img src="{{ bagisto_asset('vendor/webkul/shop/assets/images/logo.svg') }}">
</a>
</div>
<div style="padding: 30px;">
<div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.dear', ['name' => $user_name]) }},
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.info') }}
</p>
<p style="text-align: center;padding: 20px 0;">
<a href="{{ route('customer.reset-password.create', $token) }}" style="padding: 10px 20px;background: #0041FF;color: #ffffff;text-transform: uppercase;text-decoration: none; font-size: 16px">
{{ __('admin::app.mail.forget-password.reset-password') }}
</a>
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.final-summary') }}
</p>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{{ __('admin::app.mail.forget-password.thanks') }}
</p>
</div>
</div>
@endcomponent

0
packages/Webkul/Admin/src/Resources/views/emails/layouts/master.blade.php → packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php
View File

0
packages/Webkul/Admin/src/Resources/views/emails/sales/new-invoice.blade.php → packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php
View File

0
packages/Webkul/Admin/src/Resources/views/emails/sales/new-order.blade.php → packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
View File

0
packages/Webkul/Admin/src/Resources/views/emails/sales/new-shipment.blade.php → packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
View File

4
packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php
View File

@ -1,3 +1,3 @@
<button class="btn btn-lg btn-primary buynow">
<a href="/buynow" class="btn btn-lg btn-primary buynow" style="text-align: center;">
{{ __('shop::app.products.buy-now') }}
</button>
</a>

15
packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php
View File

@ -109,6 +109,21 @@
} else {
this.selectedProductId = attribute.options[attribute.selectedIndex].allowedProducts[0];
}
var prevLink = $('#wishlist-changer').attr('href');
if(this.selectedProductId != '') {
var splitted = prevLink.split("/");
var lastItem = splitted.pop();
lastItem = this.selectedProductId;
var joined = splitted.join('/');
var newWishlistUrl = joined+'/'+lastItem;
$('#wishlist-changer').attr('href', newWishlistUrl);
}
} else {
attribute.selectedIndex = 0;

2
packages/Webkul/Shop/src/Resources/views/products/wishlist.blade.php
View File

@ -1,5 +1,5 @@
@auth('customer')
<a class="add-to-wishlist" href="{{ route('customer.wishlist.add', $product->id) }}">
<a class="add-to-wishlist" href="{{ route('customer.wishlist.add', $product->id) }}" id="wishlist-changer">
<span class="icon wishlist-icon"></span>
</a>
@endauth

1
packages/Webkul/Ui/src/DataGrid/DataGrid.php
View File

@ -546,7 +546,6 @@ class DataGrid
{
foreach ($this->columns as $column) {
if ($column->filter) { // if the filter bag in array exists then these will be applied.
dd($column);
if (count($column->filter['condition']) == count($column->filter['condition'], COUNT_RECURSIVE)) {
$this->query->{$column->filter['function']}(...$column->filter['condition']);
} else {

1
packages/Webkul/Ui/src/DataGrid/ProductGrid.php
View File

@ -685,7 +685,6 @@ class ProductGrid
{
foreach ($this->columns as $column) {
if ($column->filter) { // if the filter bag in array exists then these will be applied.
dd($column);
if (count($column->filter['condition']) == count($column->filter['condition'], COUNT_RECURSIVE)) {
$this->query->{$column->filter['function']}(...$column->filter['condition']);
} else {

16
packages/Webkul/Ui/src/Resources/assets/images/Icon-Calendar.svg Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
<title>Icon-Calendar</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Icon-Calendar" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g transform="translate(3.000000, 2.000000)">
<path d="M2,9 L4,9 L4,11 L2,11 L2,9 Z M5,9 L7,9 L7,11 L5,11 L5,9 Z M8,9 L10,9 L10,11 L8,11 L8,9 Z M11,9 L13,9 L13,11 L11,11 L11,9 Z M14,9 L16,9 L16,11 L14,11 L14,9 Z M2,12 L4,12 L4,14 L2,14 L2,12 Z M5,12 L7,12 L7,14 L5,14 L5,12 Z M8,12 L10,12 L10,14 L8,14 L8,12 Z M11,12 L13,12 L13,14 L11,14 L11,12 Z M14,12 L16,12 L16,14 L14,14 L14,12 Z M11,15 L13,15 L13,17 L11,17 L11,15 Z M2,15 L4,15 L4,17 L2,17 L2,15 Z M5,15 L7,15 L7,17 L5,17 L5,15 Z M8,15 L10,15 L10,17 L8,17 L8,15 Z" id="Combined-Shape" fill="#8E8E8E"></path>
<rect id="Rectangle-6" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x="0" y="2" width="18" height="18" rx="2"></rect>
<path d="M0,7 L17.2233522,7" id="Path-2" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M5.05517578,0.0166015625 L5.05517578,2" id="Path-3" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M13,0 L13,1.91914536" id="Path-3-Copy" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

14
packages/Webkul/Ui/src/Resources/assets/images/Icon-Graph-Green.svg Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
<title>Icon-Graph-Green</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Icon-Graph-Green" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g transform="translate(8.000000, 5.000000)" stroke="#00C357" stroke-width="2">
<path d="M4,0 L4,14" id="Path-2"></path>
<path d="M4,0 L0,4" id="Path-3"></path>
<path d="M7.92330631,0 L3.92330631,4" id="Path-3-Copy" transform="translate(5.961653, 2.000000) scale(-1, 1) translate(-5.961653, -2.000000) "></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 881 B

14
packages/Webkul/Ui/src/Resources/assets/images/Icon-Graph-Red.svg Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
<title>Icon-Graph-Red</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Icon-Graph-Red" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g transform="translate(12.500000, 12.000000) scale(1, -1) translate(-12.500000, -12.000000) translate(8.000000, 5.000000)" stroke="#FC6868" stroke-width="2">
<path d="M4,0 L4,14" id="Path-2"></path>
<path d="M4,0 L0,4" id="Path-3"></path>
<path d="M7.92330631,0 L3.92330631,4" id="Path-3-Copy" transform="translate(5.961653, 2.000000) scale(-1, 1) translate(-5.961653, -2.000000) "></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 956 B

15
packages/Webkul/Ui/src/Resources/assets/images/Profile-Pic.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
<title>Profile-Pic</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Profile-Pic" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g>
<circle id="Oval-3" fill="#E7E7E7" cx="24" cy="24" r="24"></circle>
<g id="Icon-Profile" transform="translate(12.000000, 11.000000)" stroke="#8E8E8E" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
<path d="M4,21 C4.49209809,17.0536884 7.85848859,14 11.9381062,14 C16.0177239,14 19.3841144,17.0536884 19.8762125,21 L4,21 Z M11.9381062,11 C9.72896725,11 7.93810625,9.209139 7.93810625,7 C7.93810625,4.790861 9.72896725,3 11.9381062,3 C14.1472452,3 15.9381062,4.790861 15.9381062,7 C15.9381062,9.209139 14.1472452,11 11.9381062,11 Z" id="Combined-Shape"></path>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

39
packages/Webkul/Ui/src/Resources/assets/images/limited-icon.svg Normal file
View File

@ -0,0 +1,39 @@
<svg xmlns="http://www.w3.org/2000/svg" width="47" height="41.969" viewBox="0 0 47 41.969">
<metadata><?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c140 79.160451, 2017/05/06-01:08:21 ">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""/>
</rdf:RDF>
</x:xmpmeta>
<?xpacket end="w"?></metadata>
<defs>
<style>
.cls-1 {
fill: #c7c7c7;
fill-rule: evenodd;
}
</style>
</defs>
<path id="Rounded_Rectangle_1" data-name="Rounded Rectangle 1" class="cls-1" d="M1246.4,242h-41.75a2.635,2.635,0,0,1-2.25-4.049c0.91-1.614,19.26-33.851,20.83-36.6a2.581,2.581,0,0,1,4.53,0c1.15,1.981,19.6,34.342,20.88,36.685A2.623,2.623,0,0,1,1246.4,242Zm-1.4-2h-39c-1.61,0-2.33-.36-1.38-2.038,0.73-1.3,17.65-31.586,19-33.863,1.69-2.849,2.17-2.784,3.75,0,0.95,1.658,17.57,31.947,18.63,33.9C1246.78,239.431,1246.77,240,1245,240Zm-19-24a1,1,0,0,1,1,1v11a1,1,0,0,1-2,0V217A1,1,0,0,1,1226,216Zm0,15a1,1,0,1,1-1,1A1,1,0,0,1,1226,231Z" transform="translate(-1202 -200.031)"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

40
packages/Webkul/Ui/src/Resources/assets/sass/app.scss vendored
View File

@ -462,6 +462,19 @@ h2 {
}
}
&.date, &.datetime {
&::after {
background-image: url("../images/Icon-Calendar.svg");
width: 24px;
height: 24px;
content: '';
display: inline-block;
vertical-align: middle;
margin-left: -34px;
margin-top: 2px;
}
}
.control-info {
display: block;
font-style: italic;
@ -773,37 +786,39 @@ h2 {
}
.badge {
background: #E7E7E7;
@include border-radius(2px);
@include border-radius(50px);
color: white;
padding: 8px;
color: #000311;
display: inline-block;
&.label-sm {
&.badge-sm {
padding: 5px;
}
&.label-md {
padding: 8px;
&.badge-md {
padding: 3px 10px;
}
&.label-lg {
&.badge-lg {
padding: 11px;
}
&.label-xl {
&.badge-xl {
padding: 14px;
}
&.success {
&.badge-success {
background-color: $success-color;
}
&.danger {
&.badge-info {
background-color: $brand-color;
}
&.badge-danger {
background-color: $danger-color;
}
&.warning {
&.badge-warning {
background-color: $warning-color;
}
}
@ -836,7 +851,6 @@ h2 {
}
.remove-image {
// display: none;
background-image: linear-gradient(-180deg, rgba(0,0,0,0.08) 0%, rgba(0,0,0,0.24) 100%);
@include border-radius(0 0 4px 4px);
position: absolute;

24
packages/Webkul/Ui/src/Resources/assets/sass/icons.scss vendored
View File

@ -190,6 +190,30 @@
height: 13px;
}
.profile-pic-icon {
background-image: url("../images/Profile-Pic.svg");
width: 60px;
height: 60px;
}
.graph-up-icon {
background-image: url("../images/Icon-Graph-Green.svg");
width: 24px;
height: 24px;
}
.graph-down-icon {
background-image: url("../images/Icon-Graph-Red.svg");
width: 24px;
height: 24px;
}
.no-result-icon {
background-image: url("../images/limited-icon.svg");
width: 52px;
height: 47px;
}
.active {
.dashboard-icon {
background-image: url("../images/Icon-Dashboard-Active.svg");

4
packages/Webkul/Ui/src/Resources/views/datagrid/table/body.blade.php
View File

@ -18,7 +18,7 @@
@foreach ($columns as $column)
<td class="">{!! $column->render($result) !!}</td>
@endforeach
@if(count($actions))
<td class="action">
@foreach($actions as $action)
<a @if($action['type'] == "Edit") href="{{ url()->current().'/edit/'.$result->id }}" @elseif($action['type']=="Delete") href="{{ url()->current().'/delete/'.$result->id }}" @endif class="Action-{{ $action['type'] }}" id="{{ $result->id }}" onclick="return confirm_click('{{ $action['confirm_text'] }}');">
@ -26,7 +26,7 @@
</a>
@endforeach
</td>
@endif
</tr>
@endforeach
</tbody>

8
packages/Webkul/Ui/src/Resources/views/datagrid/table/head.blade.php
View File

@ -98,8 +98,10 @@
</th>
@endif
@endforeach
<th>
{{ __('ui::app.datagrid.actions') }}
</th>
@if(count($actions))
<th>
{{ __('ui::app.datagrid.actions') }}
</th>
@endif
</tr>
</thead>

8
packages/Webkul/User/src/Notifications/AdminResetPassword.php
View File

@ -7,7 +7,6 @@ use Illuminate\Auth\Notifications\ResetPassword;
class AdminResetPassword extends ResetPassword
{
/**
* Build the mail representation of the notification.
*
@ -21,8 +20,9 @@ class AdminResetPassword extends ResetPassword
}
return (new MailMessage)
->line('You are receiving this email because we received a password reset request for your account.')
->action('Reset Password', route('admin.reset-password.create', $this->token))
->line('If you did not request a password reset, no further action is required.');
->view('shop::emails.admin.forget-password')->with([
'user_name' => $notifiable->name,
'token' => $this->token
]);
}
}

10
public/themes/default/assets/css/shop.css vendored
View File

@ -18,6 +18,13 @@
margin-left: auto;
}
.icon-menu-close-adj {
background-image: URL("../images/cross-icon-adj.svg");
width: 32px;
height: 32px;
margin-left: auto;
}
.grid-view-icon {
background-image: URL("../images/icon-grid-view.svg");
width: 24px;
@ -1044,7 +1051,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
}
.header .header-bottom {
height: 48px;
height: 47px;
margin-left: auto;
margin-right: auto;
border-top: 1px solid #C7C7C7;
@ -1056,7 +1063,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
.header .header-bottom ul.nav {
display: block;
font-size: 16px;
height: 48px;
max-width: 100%;
width: auto;
margin-left: auto;