diff --git a/composer.json b/composer.json index 5bbba23f3..b67e85057 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,8 @@ "webkul/laravel-category": "self.version", "webkul/laravel-product": "self.version", "webkul/laravel-shop": "self.version", - "webkul/laravel-theme": "self.version" + "webkul/laravel-theme": "self.version", + "webkul/laravel-shipping": "self.version" }, "autoload": { "classmap": [ @@ -57,7 +58,9 @@ "Webkul\\Customer\\": "packages/Webkul/Customer/src", "Webkul\\Inventory\\": "packages/Webkul/Inventory/src", "Webkul\\Product\\": "packages/Webkul/Product/src", - "Webkul\\Theme\\": "packages/Webkul/Theme/src" + "Webkul\\Theme\\": "packages/Webkul/Theme/src", + "Webkul\\Cart\\": "packages/Webkul/Cart/src", + "Webkul\\Shipping\\": "packages/Webkul/Shipping/src" } }, "autoload-dev": { diff --git a/config/app.php b/config/app.php index d9aa90898..b0f6ebc94 100644 --- a/config/app.php +++ b/config/app.php @@ -172,6 +172,8 @@ return [ //Laravel Intervention Intervention\Image\ImageServiceProvider::class, + + //Repository Prettus\Repository\Providers\RepositoryServiceProvider::class, //Webkul packages @@ -187,7 +189,9 @@ return [ Webkul\Product\Providers\ProductServiceProvider::class, Webkul\Shop\Providers\ShopServiceProvider::class, Webkul\Customer\Providers\CustomerServiceProvider::class, - Webkul\Theme\Providers\ThemeServiceProvider::class + Webkul\Theme\Providers\ThemeServiceProvider::class, + Webkul\Cart\Providers\CartServiceProvider::class, + Webkul\Shipping\Providers\ShippingServiceProvider::class, ], /* diff --git a/config/carrier.php b/config/carrier.php new file mode 100644 index 000000000..c6da8a2f0 --- /dev/null +++ b/config/carrier.php @@ -0,0 +1,51 @@ + [ + [ + 'code' => 'flatrate_one', + 'title' => 'Flatrate One', + 'name' => 'fixed 20% discount for today', + 'description' => 'this is a flat rate', + 'status' => '1', + 'price' => '10', + 'type' => [ + 'per_unit' => 'Per Unit', + 'per order' => 'Per Order', + ], + 'class' => 'Webkul\Shipping\Helper\Rate', + ], + + [ + 'code' => 'flatrate_two', + 'title' => 'Flatrate Two', + 'name' => 'fixed 50% discount till 10/10/2018', + 'description' => 'this is a flat rate', + 'status' => '1', + 'price' => '100', + 'type' => [ + 'per unit' => 'Per Unit', + 'per order' => 'Per Order', + ], + 'class' => 'Webkul\Shipping\Helper\Rate', + ], + + [ + 'code' => 'flatrate_three', + 'title' => 'Flatrate Three', + 'name' => 'fixed 30% discount', + 'description' => 'this is a flat rate', + 'status' => '1', + 'price' => '1000', + 'type' => [ + 'per unit' => 'Per Unit', + 'per order' => 'Per Order', + ], + 'class' => 'Webkul\Shipping\Helper\Rate', + ] + ] + +] + +?> \ No newline at end of file diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php index 582ddc9e0..fcb325618 100644 --- a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php @@ -71,21 +71,21 @@ class ChannelDataGrid [ 'name' => 'id', - 'alias' => 'channel_id', + 'alias' => 'channelID', 'type' => 'number', 'label' => 'Channel ID', 'sortable' => true, ], [ 'name' => 'code', - 'alias' => 'channel_code', + 'alias' => 'channelCode', 'type' => 'string', 'label' => 'Channel Code', 'sortable' => true, ], [ 'name' => 'name', - 'alias' => 'channel_name', + 'alias' => 'channelName', 'type' => 'string', 'label' => 'Channel Name', 'sortable' => true, @@ -98,7 +98,7 @@ class ChannelDataGrid 'filterable' => [ [ 'column' => 'id', - 'alias' => 'channelId', + 'alias' => 'channelID', 'type' => 'number', 'label' => 'Channel ID', ], diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php new file mode 100644 index 000000000..0ac003829 --- /dev/null +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -0,0 +1,184 @@ + @rahul-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + +class CustomerDataGrid +{ + /** + * The CustomerDataGrid + * implementation. + * + * @var CustomerDataGrid + */ + + public function createCustomerDataGrid() + { + + return DataGrid::make([ + 'name' => 'Customer', + 'table' => 'customers', + 'select' => 'id', + 'perpage' => 10, + 'aliased' => false, //use this with false as default and true in case of joins + + 'massoperations' =>[ + [ + 'route' => route('admin.datagrid.delete'), + 'method' => 'DELETE', + 'label' => 'Delete', + 'type' => 'button', + ], + ], + + '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', + ], + ], + + 'join' => [ + // [ + // 'join' => 'leftjoin', + // 'table' => 'roles as r', + // 'primaryKey' => 'u.role_id', + // 'condition' => '=', + // 'secondaryKey' => 'r.id', + // ] + ], + + //use aliasing on secodary columns if join is performed + + 'columns' => [ + + [ + 'name' => 'id', + 'alias' => 'customerId', + 'type' => 'number', + 'label' => 'ID', + 'sortable' => true, + ], + [ + 'name' => 'first_name', + 'alias' => 'customerFirstName', + 'type' => 'string', + 'label' => 'Name', + 'sortable' => true, + ], + [ + 'name' => 'email', + 'alias' => 'customerEmail', + 'type' => 'string', + 'label' => 'Email', + 'sortable' => true, + ], + [ + 'name' => 'phone', + 'alias' => 'customerPhone', + 'type' => 'number', + 'label' => 'Phone', + 'sortable' => true, + ], + [ + 'name' => 'customer_group_id', + 'alias' => 'customerGroupId', + 'type' => 'number', + 'label' => 'Customer Group', + 'sortable' => true, + ], + ], + + //don't use aliasing in case of filters + + 'filterable' => [ + + [ + 'name' => 'id', + 'alias' => 'customerId', + 'type' => 'number', + 'label' => 'ID', + ], + [ + 'name' => 'first_name', + 'alias' => 'customerFirstName', + 'type' => 'string', + 'label' => 'Name', + ], + [ + 'name' => 'phone', + 'alias' => 'customerPhone', + 'type' => 'number', + 'label' => 'Phone', + ], + [ + 'name' => 'email', + 'alias' => 'customerEmail', + 'type' => 'string', + 'label' => 'Comment', + ], + [ + 'name' => 'customer_group_id', + 'alias' => 'customerGroupId', + 'type' => 'number', + 'label' => 'Status', + ], + ], + + //don't use aliasing in case of searchables + + 'searchable' => [ + [ + 'column' => 'first_name', + 'type' => 'string', + 'label' => 'Title', + ], + [ + 'column' => 'email', + 'type' => 'string', + 'label' => 'Rating', + ], + ], + + //list of viable operators that will be used + 'operators' => [ + 'eq' => "=", + 'lt' => "<", + 'gt' => ">", + 'lte' => "<=", + 'gte' => ">=", + 'neqs' => "<>", + 'neqn' => "!=", + 'like' => "like", + 'nlike' => "not like", + ], + // 'css' => [] + + ]); + + } + + public function render() + { + + return $this->createCustomerDataGrid()->render(); + + } +} \ No newline at end of file diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php new file mode 100644 index 000000000..f28a22b61 --- /dev/null +++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php @@ -0,0 +1,183 @@ + @rahul-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + +class CustomerReviewDataGrid +{ + /** + * The CustomerReviewDataGrid + * implementation. + * + * @var ReviewsDataGrid + * for Reviews + */ + + public function createCustomerReviewDataGrid() + { + + return DataGrid::make([ + 'name' => 'Review', + 'table' => 'product_reviews', + 'select' => 'id', + 'perpage' => 10, + 'aliased' => false, //use this with false as default and true in case of joins + + 'massoperations' =>[ + [ + 'route' => route('admin.datagrid.delete'), + 'method' => 'DELETE', + 'label' => 'Delete', + 'type' => 'button', + ], + ], + + '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', + ], + ], + + 'join' => [ + // [ + // 'join' => 'leftjoin', + // 'table' => 'roles as r', + // 'primaryKey' => 'u.role_id', + // 'condition' => '=', + // 'secondaryKey' => 'r.id', + // ] + ], + + //use aliasing on secodary columns if join is performed + + 'columns' => [ + + [ + 'name' => 'id', + 'alias' => 'reviewId', + 'type' => 'number', + 'label' => 'ID', + 'sortable' => true, + ], + [ + 'name' => 'title', + 'alias' => 'titleName', + 'type' => 'string', + 'label' => 'Title', + 'sortable' => true, + ], + [ + 'name' => 'rating', + 'alias' => 'productRating', + 'type' => 'number', + 'label' => 'Rating', + 'sortable' => true, + ], + [ + 'name' => 'comment', + 'alias' => 'productComment', + 'type' => 'string', + 'label' => 'Comment', + 'sortable' => true, + ], + [ + 'name' => 'status', + 'alias' => 'countryStatus', + 'type' => 'number', + 'label' => 'Status', + 'sortable' => true, + ], + + ], + + //don't use aliasing in case of filters + + 'filterable' => [ + [ + 'name' => 'id', + 'alias' => 'countryId', + 'type' => 'number', + 'label' => 'ID', + ], + [ + 'name' => 'title', + 'alias' => 'titleName', + 'type' => 'string', + 'label' => 'Title', + ], + [ + 'name' => 'rating', + 'alias' => 'productRating', + 'type' => 'number', + 'label' => 'Rating', + ], + [ + 'name' => 'comment', + 'alias' => 'productComment', + 'type' => 'string', + 'label' => 'Comment', + ], + [ + 'name' => 'status', + 'alias' => 'countryStatus', + 'type' => 'number', + 'label' => 'Code', + ], + ], + + //don't use aliasing in case of searchables + + 'searchable' => [ + [ + 'column' => 'title', + 'type' => 'string', + 'label' => 'Title', + ], + [ + 'column' => 'rating', + 'type' => 'number', + 'label' => 'Rating', + ], + ], + + //list of viable operators that will be used + 'operators' => [ + 'eq' => "=", + 'lt' => "<", + 'gt' => ">", + 'lte' => "<=", + 'gte' => ">=", + 'neqs' => "<>", + 'neqn' => "!=", + 'like' => "like", + 'nlike' => "not like", + ], + // 'css' => [] + + ]); + + } + + public function render() + { + return $this->createCustomerReviewDataGrid()->render(); + } +} \ No newline at end of file diff --git a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php index 5bad6e70a..876587c00 100644 --- a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php @@ -42,7 +42,7 @@ class InventorySourcesDataGrid 'actions' => [ [ 'type' => 'Edit', - 'route' => route('admin.datagrid.delete'), + 'route' => route('admin.datagrid.edit'), 'confirm_text' => 'Do you really edit this record?', 'icon' => 'icon pencil-lg-icon', ], [ @@ -110,7 +110,7 @@ class InventorySourcesDataGrid 'filterable' => [ [ 'column' => 'id', - 'alias' => 'inventoryId', + 'alias' => 'inventoryID', 'type' => 'number', 'label' => 'ID', ], diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index 63287c074..86d330715 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -6,7 +6,6 @@ use Illuminate\View\View; use Webkul\Ui\DataGrid\Facades\ProductGrid; use Webkul\Channel\Repositories\ChannelRepository; use Webkul\Product\Repositories\ProductRepository; - /** * Product DataGrid * @@ -24,7 +23,6 @@ class ProductDataGrid public function createProductDataGrid() { - return ProductGrid::make([ 'name' => 'Products', 'table' => 'products as prods', @@ -77,10 +75,15 @@ class ProductDataGrid 'primaryKey' => 'prods.id', 'condition' => '=', 'secondaryKey' => 'pav.product_id', - 'withAttributes' => true + 'withAttributes' => [ + 'condition' => [ + 'attribute_id' => 2, + 'select' => 'name', + ] + ] ], - //for getting the inventory quantity of a product + // for getting the inventory quantity of a product [ 'join' => 'leftjoin', 'table' => 'product_inventories as pi', @@ -120,17 +123,9 @@ class ProductDataGrid 'name' => 'pi.qty', 'alias' => 'ProductQuantity', 'type' => 'string', - 'label' => 'Product Quatity', + 'label' => 'Product Quantity', 'sortable' => false, ], - // [ - // 'name' => 'pav.attribute_id', - // 'alias' => 'AttributeID', - // 'type' => 'string', - // 'label' => 'Attribute ID', - // 'sortable' => false, - - // ], ], 'filterable' => [ @@ -156,7 +151,7 @@ class ProductDataGrid [ 'name' => 'pi.qty', 'alias' => 'ProductQuantity', - 'type' => 'string', + 'type' => 'number', 'label' => 'Product Quatity', ], ], diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php index aac865c69..361c6cb43 100644 --- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php @@ -100,24 +100,24 @@ class SliderDataGrid //don't use aliasing in case of filters 'filterable' => [ - // [ - // 'column' => 'id', - // 'alias' => 'locale_id', - // 'type' => 'number', - // 'label' => 'ID', - // ], - // [ - // 'column' => 'code', - // 'alias' => 'locale_code', - // 'type' => 'string', - // 'label' => 'Code', - // ], - // [ - // 'column' => 'name', - // 'alias' => 'locale_name', - // 'type' => 'string', - // 'label' => 'Name', - // ], + [ + 'column' => 'id', + 'alias' => 'locale_id', + 'type' => 'number', + 'label' => 'ID', + ], + [ + 'column' => 'code', + 'alias' => 'locale_code', + 'type' => 'string', + 'label' => 'Code', + ], + [ + 'column' => 'name', + 'alias' => 'locale_name', + 'type' => 'string', + 'label' => 'Name', + ], ], //don't use aliasing in case of searchables diff --git a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php new file mode 100644 index 000000000..be5b5c12e --- /dev/null +++ b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php @@ -0,0 +1,199 @@ + @prashant-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + +class TaxRateDataGrid +{ + /** + * The Tax Rule Data + * Grid implementation. + * + * @var TaxRateDataGrid + */ + public function createTaxRateDataGrid() + { + + return DataGrid::make([ + + 'name' => 'Tax Rates', + 'table' => 'tax_rates as tr', + 'select' => 'tr.id', + 'perpage' => 10, + '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', + ], + [ + 'route' => route('admin.datagrid.index'), + 'method' => 'POST', + 'label' => 'View Grid', + 'type' => 'select', + 'options' =>[ + 1 => 'Edit', + 2 => 'Set', + 3 => 'Change Status' + ] + ], + ], + 'actions' => [ + [ + 'type' => 'Edit', + 'route' => route('admin.datagrid.delete'), + 'confirm_text' => 'Do you really wanis?', + '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', + ], + ], + 'join' => [ + // [ + // 'join' => 'leftjoin', + // 'table' => 'roles as r', + // 'primaryKey' => 'u.role_id', + // 'condition' => '=', + // 'secondaryKey' => 'r.id', + // ] + ], + + //use aliasing on secodary columns if join is performed + 'columns' => [ + [ + 'name' => 'tr.id', + 'alias' => 'ID', + 'type' => 'number', + 'label' => 'ID', + 'sortable' => true, + ], + [ + 'name' => 'tr.identifier', + 'alias' => 'identifier', + 'type' => 'string', + 'label' => 'Identifier', + 'sortable' => true, + // 'wrapper' => function ($value, $object) { + // return '' . $object->Name . ''; + // }, + ], + [ + 'name' => 'tr.state', + 'alias' => 'state', + 'type' => 'string', + 'label' => 'State', + 'sortable' => true, + ], + [ + 'name' => 'tr.country', + 'alias' => 'country', + 'type' => 'string', + 'label' => 'Country', + 'sortable' => true, + ], + + [ + 'name' => 'tr.tax_rate', + 'alias' => 'tax_rate', + 'type' => 'number', + 'label' => 'Tax Rate', + 'sortable' => true, + ], + ], + //don't use aliasing in case of filters + 'filterable' => [ + [ + 'name' => 'tr.id', + 'alias' => 'ID', + 'type' => 'number', + 'label' => 'ID', + ], + [ + 'name' => 'tr.identifier', + 'alias' => 'identifier', + 'type' => 'string', + 'label' => 'Identifier', + ], + [ + 'name' => 'tr.state', + 'alias' => 'state', + 'type' => 'string', + 'label' => 'State', + ], + [ + 'name' => 'tr.country', + 'alias' => 'country', + 'type' => 'string', + 'label' => 'Country', + ], + + [ + 'name' => 'tr.tax_rate', + 'alias' => 'tax_rate', + 'type' => 'number', + 'label' => 'Tax Rate', + ], + ], + //don't use aliasing in case of searchables + 'searchable' => [ + [ + 'column' => 'tr.identifier', + 'type' => 'string', + 'label' => 'Identifier', + ], + [ + 'column' => 'tr.state', + 'type' => 'string', + 'label' => 'State', + ], + [ + 'column' => 'tr.country', + 'type' => 'string', + 'label' => 'Country', + ], + + [ + 'column' => 'tr.tax_rate', + 'type' => 'number', + 'label' => 'Tax Rate', + ], + ], + 'operators' => [ + 'eq' => "=", + 'lt' => "<", + 'gt' => ">", + 'lte' => "<=", + 'gte' => ">=", + 'neqs' => "<>", + 'neqn' => "!=", + 'like' => "like", + 'nlike' => "not like", + ], + // 'css' => [] + + ]); + + } + + public function render() { + + return $this->createTaxRateDataGrid()->render(); + + } +} \ No newline at end of file diff --git a/packages/Webkul/Admin/src/DataGrids/TaxRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxRuleDataGrid.php new file mode 100644 index 000000000..753cbc779 --- /dev/null +++ b/packages/Webkul/Admin/src/DataGrids/TaxRuleDataGrid.php @@ -0,0 +1,160 @@ + @prashant-webkul + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + +class TaxRuleDataGrid +{ + /** + * The Tax Rule Data + * Grid implementation. + * + * @var TaxRuleDataGrid + */ + public function createTaxRuleDataGrid() + { + + return DataGrid::make([ + + 'name' => 'Tax Rule', + 'table' => 'tax_categories as tr', + 'select' => 'tr.id', + 'perpage' => 10, + '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', + ], + [ + 'route' => route('admin.datagrid.index'), + 'method' => 'POST', + 'label' => 'View Grid', + 'type' => 'select', + 'options' =>[ + 1 => 'Edit', + 2 => 'Set', + 3 => 'Change Status' + ] + ], + ], + 'actions' => [ + [ + 'type' => 'Edit', + 'route' => route('admin.datagrid.delete'), + 'confirm_text' => 'Do you really wanis?', + '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', + ], + ], + 'join' => [ + // [ + // 'join' => 'leftjoin', + // 'table' => 'roles as r', + // 'primaryKey' => 'u.role_id', + // 'condition' => '=', + // 'secondaryKey' => 'r.id', + // ] + ], + + //use aliasing on secodary columns if join is performed + 'columns' => [ + [ + 'name' => 'tr.id', + 'alias' => 'ID', + 'type' => 'number', + 'label' => 'ID', + 'sortable' => true, + ], + [ + 'name' => 'tr.name', + 'alias' => 'Name', + 'type' => 'string', + 'label' => 'Name', + 'sortable' => true, + // 'wrapper' => function ($value, $object) { + // return '' . $object->Name . ''; + // }, + ], + [ + 'name' => 'tr.code', + 'alias' => 'code', + 'type' => 'string', + 'label' => 'Code', + 'sortable' => true, + ], + ], + //don't use aliasing in case of filters + 'filterable' => [ + [ + 'column' => 'tr.name', + 'alias' => 'Name', + 'type' => 'number', + 'label' => 'Name' + ], + [ + 'column' => 'tr.id', + 'alias' => 'ID', + 'type' => 'number', + 'label' => 'ID' + ], + [ + 'column' => 'tr.code', + 'alias' => 'code', + 'type' => 'string', + 'label' => 'Code' + ] + ], + //don't use aliasing in case of searchables + 'searchable' => [ + [ + 'column' => 'tr.code', + 'type' => 'string', + 'label' => 'Code' + ], + [ + 'column' => 'tr.name', + 'type' => 'string', + 'label' => 'Name' + ] + ], + 'operators' => [ + 'eq' => "=", + 'lt' => "<", + 'gt' => ">", + 'lte' => "<=", + 'gte' => ">=", + 'neqs' => "<>", + 'neqn' => "!=", + 'like' => "like", + 'nlike' => "not like", + ], + // 'css' => [] + + ]); + + } + + public function render() { + + return $this->createTaxRuleDataGrid()->render(); + + } +} \ No newline at end of file diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php index 2f195a248..85432930a 100644 --- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php @@ -25,6 +25,7 @@ class UserDataGrid { return DataGrid::make([ + 'name' => 'Admins', 'table' => 'admins as u', 'select' => 'u.id', @@ -38,23 +39,23 @@ class UserDataGrid 'label' => 'Delete', 'type' => 'button', ], - // [ - // 'route' => route('admin.datagrid.index'), - // 'method' => 'POST', - // 'label' => 'View Grid', - // 'type' => 'select', - // 'options' =>[ - // 1 => 'Edit', - // 2 => 'Set', - // 3 => 'Change Status' - // ] - // ], + [ + 'route' => route('admin.datagrid.index'), + 'method' => 'POST', + 'label' => 'View Grid', + 'type' => 'select', + 'options' =>[ + 1 => 'Edit', + 2 => 'Set', + 3 => 'Change Status' + ] + ], ], 'actions' => [ [ 'type' => 'Edit', 'route' => route('admin.datagrid.delete'), - 'confirm_text' => 'Do you really want to do this?', + 'confirm_text' => 'Do you really wanis?', 'icon' => 'icon pencil-lg-icon', ], [ @@ -83,8 +84,8 @@ class UserDataGrid 'label' => 'Admin ID', 'sortable' => true, 'wrapper' => function ($value, $object) { - return '' . $object->ID . ''; - }, + return '' . $object->ID . ''; + }, ], [ 'name' => 'u.name', @@ -93,8 +94,8 @@ class UserDataGrid 'label' => 'Name', 'sortable' => true, 'wrapper' => function ($value, $object) { - return '' . $object->Name . ''; - }, + return '' . $object->Name . ''; + }, ], [ 'name' => 'u.email', @@ -117,27 +118,6 @@ class UserDataGrid 'label' => 'Role ID', 'sortable' => true, ], - // [ - // 'name' => 'a.first_name', - // 'type' => 'string', - // 'label' => 'Admin Name', - // 'sortable' => true, - // 'filterable' => true, - // // will create on run time query - // // 'filter' => [ - // // 'function' => 'where', // orwhere - // // 'condition' => ['name', '=', 'Admin'] // multiarray - // // ], - // 'attributes' => [ - // 'class' => 'class-a class-b', - // 'data-attr' => 'whatever you want', - // 'onclick' => "window.alert('alert from datagrid column')" - // ], - // 'wrapper' => function ($value, $object) { - // return '' . $object->first_name . ''; - // }, - // ], - ], //don't use aliasing in case of filters 'filterable' => [ diff --git a/packages/Webkul/Admin/src/Datagrids/User.php b/packages/Webkul/Admin/src/Datagrids/User.php deleted file mode 100644 index dcc975ea8..000000000 --- a/packages/Webkul/Admin/src/Datagrids/User.php +++ /dev/null @@ -1,151 +0,0 @@ - 'Admins', - 'table' => 'admins as u', - 'select' => 'u.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', - ] - ], - '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', - ], - ], - 'join' => [ - [ - 'join' => 'leftjoin', - 'table' => 'roles as r', - 'primaryKey' => 'u.role_id', - 'condition' => '=', - 'secondaryKey' => 'r.id', - ] - ], - - //use aliasing on secodary columns if join is performed - 'columns' => [ - [ - 'name' => 'u.id', - 'alias' => 'ID', - 'type' => 'string', - 'label' => 'Admin ID', - 'sortable' => true, - 'wrapper' => function ($value, $object) { - return '' . $object->ID . ''; - }, - ], [ - 'name' => 'u.name', - 'alias' => 'Name', - 'type' => 'string', - 'label' => 'Name', - 'sortable' => true, - 'wrapper' => function ($value, $object) { - return '' . $object->Name . ''; - }, - ], [ - 'name' => 'u.email', - 'alias' => 'Email', - 'type' => 'string', - 'label' => 'E-Mail', - 'sortable' => true, - ], [ - 'name' => 'r.name', - 'alias' => 'xa', - 'type' => 'string', - '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' => [ - [ - 'column' => 'u.name', - 'alias' => 'Name', - 'type' => 'string', - 'label' => 'Name' - ], [ - 'column' => 'u.email', - 'alias' => 'Email', - 'type' => 'string', - 'label' => 'Email' - ], [ - 'column' => 'u.id', - 'alias' => 'ID', - 'type' => 'number', - 'label' => 'Admin ID' - ], [ - 'column' => 'r.id', - 'alias' => 'Role_ID', - 'type' => 'number', - 'label' => 'Role ID' - ] - ], - //don't use aliasing in case of searchables - 'searchable' => [ - [ - 'column' => 'u.email', - 'type' => 'string', - 'label' => 'E-Mail' - ], [ - 'column' => 'u.name', - 'type' => 'string', - 'label' => 'Name' - ] - ], - 'operators' => [ - 'eq' => "=", - 'lt' => "<", - 'gt' => ">", - 'lte' => "<=", - 'gte' => ">=", - 'neqs' => "<>", - 'neqn' => "!=", - 'like' => "like", - 'nlike' => "not like", - ], - ]); - } - - public function render() - { - return $this->createDatagrid()->render(); - } -} \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php index 22422ed62..5bee6cde8 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php @@ -24,6 +24,8 @@ class DashboardController extends Controller public function __construct() { $this->_config = request('_config'); + + $this->middleware('admin'); } public function index() { diff --git a/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php b/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php index 6b4d52397..de3fa9e8d 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php @@ -15,6 +15,7 @@ use Webkul\Ui\DataGrid\Facades\DataGrid; */ class DataGridController extends Controller { + /** * Display a listing of the resource. * diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index ffa52dcad..a98ff0be2 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -9,7 +9,7 @@ Route::group(['middleware' => ['web']], function () { Route::post('/login', 'Webkul\User\Http\Controllers\SessionController@store')->defaults('_config', [ 'redirect' => 'admin.dashboard.index' - ])->name('admin.forget-password.store'); + ])->name('admin.session.store'); // Forget Password Routes @@ -36,10 +36,52 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'admin.session.create' ])->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')->name('admin.dashboard.index'); + //Customers Management Routes + + Route::get('customer', 'Webkul\Core\Http\Controllers\CustomerController@index')->defaults('_config', [ + 'view' => 'admin::customers.index' + ])->name('admin.customer.index'); + + Route::get('customer/orders', 'Webkul\Core\Http\Controllers\CustomerController@index')->defaults('_config',[ + 'view' => 'admin::customers.orders.index' + ])->name('admin.customer.orders.index'); + + Route::get('customer/reviews', 'Webkul\Shop\Http\Controllers\ReviewController@index')->defaults('_config',[ + 'view' => 'admin::customers.review.index' + ])->name('admin.customer.review.index'); + + Route::get('customer/create', 'Webkul\Core\Http\Controllers\CustomerController@create')->defaults('_config',[ + 'view' => 'admin::customers.create' + ])->name('admin.customer.create'); + + Route::post('customer/create', 'Webkul\Core\Http\Controllers\CustomerController@store')->defaults('_config',[ + 'redirect' => 'admin.customer.index' + ])->name('admin.customer.store'); + + Route::get('customer/reviews/edit/{id}', 'Webkul\Shop\Http\Controllers\ReviewController@edit')->defaults('_config',[ + 'view' => 'admin::customers.review.edit' + ])->name('admin.customer.review.edit'); + + Route::put('customer/reviews/edit/{id}', 'Webkul\Shop\Http\Controllers\ReviewController@update')->defaults('_config', [ + 'redirect' => 'admin.customer.review.index' + ])->name('admin.customer.review.update'); + + Route::get('customer/edit/{id}', 'Webkul\Core\Http\Controllers\CustomerController@edit')->defaults('_config',[ + 'view' => 'admin::customers.edit' + ])->name('admin.customer.edit'); + + Route::put('customer/reviews/edit/{id}', 'Webkul\Core\Http\Controllers\CustomerController@update')->defaults('_config', [ + 'redirect' => 'admin.customer.index' + ])->name('admin.customer.update'); + + // dummy number i.e-1 is used for creating view only + + Route::get('customer/orders/1', 'Webkul\User\Http\Controllers\UserController@index')->defaults('_config', [ + 'view' => 'admin::customers.orders.order' + ])->name('admin.customer.orders.order'); // Catalog Routes Route::prefix('catalog')->group(function () { @@ -140,6 +182,8 @@ Route::group(['middleware' => ['web']], function () { Route::any('datagrid/massaction/delete', 'Webkul\Admin\Http\Controllers\DataGridController@massDelete')->name('admin.datagrid.delete'); + Route::any('datagrid/massaction/edit','Webkul\Admin\Http\Controllers\DataGridController@massUpdate')->name('admin.datagrid.edit'); + // User Routes Route::get('/users', 'Webkul\User\Http\Controllers\UserController@index')->defaults('_config', [ 'view' => 'admin::users.users.index' @@ -313,6 +357,56 @@ Route::group(['middleware' => ['web']], function () { Route::post('/slider/create','Webkul\Shop\Http\Controllers\SliderController@store')->defaults('_config',[ 'redirect' => 'admin::sliders.index' ])->name('admin.sliders.store'); + + //tax routes + Route::prefix('tax')->group(function () { + + Route::get('taxrule', 'Webkul\Core\Http\Controllers\TaxController@index')->defaults('_config', [ + 'view' => 'admin::tax.taxrule.index' + ])->name('admin.taxrule.index'); + + // tax rule routes + Route::get('taxrule/create', 'Webkul\Core\Http\Controllers\TaxCategoryController@show')->defaults('_config', [ + 'view' => 'admin::tax.taxrule.create.create' + ])->name('admin.taxrule.show'); + + Route::post('taxrule/create', 'Webkul\Core\Http\Controllers\TaxCategoryController@create')->defaults('_config', [ + 'redirect' => 'admin.taxrule.index' + ])->name('admin.taxrule.create'); + + Route::get('/taxrule/edit/{id}', 'Webkul\Core\Http\Controllers\TaxCategoryController@edit')->defaults('_config', [ + 'view' => 'admin::tax.taxrule.edit.edit' + ])->name('admin.taxrule.edit'); + + Route::put('/taxrule/edit/{id}', 'Webkul\Core\Http\Controllers\TaxCategoryController@update')->defaults('_config', [ + 'redirect' => 'admin.taxrule.index' + ])->name('admin.taxrule.update'); + + //tax rule ends + + //tax rate + + Route::get('taxrate', 'Webkul\Core\Http\Controllers\TaxRateController@index')->defaults('_config', [ + 'view' => 'admin::tax.taxrate.index' + ])->name('admin.taxrate.index'); + + Route::get('taxrate/create', 'Webkul\Core\Http\Controllers\TaxRateController@show')->defaults('_config', [ + 'view' => 'admin::tax.taxrate.create.taxrate' + ])->name('admin.taxrate.show'); + + Route::post('taxrate/create', 'Webkul\Core\Http\Controllers\TaxRateController@create')->defaults('_config', [ + 'redirect' => 'admin.taxrate.index' + ])->name('admin.taxrate.create'); + + Route::get('taxrate/edit/{id}', 'Webkul\Core\Http\Controllers\TaxRateController@edit')->defaults('_config', [ + 'view' => 'admin::tax.taxrate.edit.edit' + ])->name('admin.taxrate.store'); + + Route::put('taxrate/update/{id}', 'Webkul\Core\Http\Controllers\TaxRateController@update')->defaults('_config', [ + 'redirect' => 'admin.taxrate.index' + ])->name('admin.taxrate.update'); + }); + //tax rate ends }); }); }); diff --git a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php index 237924c66..accef9ceb 100644 --- a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php @@ -52,6 +52,18 @@ class EventServiceProvider extends ServiceProvider $menu->add('catalog.families', 'Families', 'admin.catalog.families.index', 4); + $menu->add('customers', 'Customers', 'admin.customer.index', 5, 'customer-icon'); + + $menu->add('customers.customers', 'Customers', 'admin.customer.index', 1, ''); + + $menu->add('customers.orders', 'Orders', 'admin.customer.orders.index', 2, ''); + + $menu->add('customers.reviews', 'Review', 'admin.customer.review.index', 3, ''); + + // $menu->add('customers.blocked_customer', 'Blocked Customers', 'admin.account.edit', 2, ''); + + // $menu->add('customers.allowed_customer', 'Allowed Customers', 'admin.account.edit', 4, ''); + $menu->add('configuration', 'Configure', 'admin.account.edit', 6, 'configuration-icon'); $menu->add('configuration.account', 'My Account', 'admin.account.edit', 1); @@ -77,6 +89,12 @@ class EventServiceProvider extends ServiceProvider $menu->add('settings.users.roles', 'Roles', 'admin.roles.index', 2, ''); $menu->add('settings.sliders', 'Create Sliders', 'admin.sliders.index', 8, ''); + + $menu->add('settings.tax', 'Taxes', 'admin.taxrule.index', 9, ''); + + $menu->add('settings.tax.taxrule', 'Add Tax Rules', 'admin.taxrule.index', 1, ''); + + $menu->add('settings.tax.taxrate', 'Add Tax Rates', 'admin.taxrate.index', 2, ''); }); } diff --git a/packages/Webkul/Admin/src/Resources/assets/images/Angle-Right.svg b/packages/Webkul/Admin/src/Resources/assets/images/Angle-Right.svg new file mode 100644 index 000000000..12f46305c --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/assets/images/Angle-Right.svg @@ -0,0 +1,10 @@ + + + + Angle-Right + Created with Sketch. + + + + + \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/assets/images/Icon-Graph-Green.svg b/packages/Webkul/Admin/src/Resources/assets/images/Icon-Graph-Green.svg new file mode 100644 index 000000000..ba589b67d --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/assets/images/Icon-Graph-Green.svg @@ -0,0 +1,14 @@ + + + + Icon-Graph-Green + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss index 2235e587f..506819344 100644 --- a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss @@ -249,3 +249,53 @@ body { // } // } // } + + + +// admin dashboard css + +.dashboard-content { + + .dashboard-stats { + display: flex; + + } + + .graph-category { + display: flex; + margin-top: 25px; + } + + .sale-stock { + display: flex; + margin-top: 25px; + } + +} + +// admin dashboard css ends here + + +// customer oder css for admin start here + +.order-place-detail { + + .order-account-information { + margin-left: 10px; + } + + .address { + margin-left: 10px; + } + + .payment-shipping{ + margin-left: 10px; + } + + .order-products{ + margin-left: 10px; + } +} + + +// customer oder css for admin end here diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index af15f95c7..37eafd1c0 100644 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -41,7 +41,7 @@ return [ 'all' => 'All' ], 'users' => [ - 'title' => 'Users', + 'title' => 'User', 'add-user-title' => 'Add User', 'edit-user-title' => 'Edit User', 'save-btn-title' => 'Save User', @@ -175,6 +175,43 @@ return [ 'meta_keywords' => 'Meta Keywords', ] ], + + 'configuration' => [ + 'tax' => [ + 'title' => 'Taxes', + 'add-title' => 'Add Tax Rule' + ], + 'taxrule' => [ + 'title' => 'Add Tax Rule', + 'create' => 'Create Tax Rule', + 'general' => 'Tax Rule', + 'select-channel' => 'Select Channel', + 'name' => 'Name', + 'code' => 'Code', + 'description' => 'Description', + 'select-taxrates' => 'Select Tax Rates', + 'edit' => [ + 'title' => 'Edit Tax Rule', + 'edit-button-title' => 'Edit Rule' + ] + ], + 'taxrate' => [ + 'title' => 'Add Tax Rate', + 'general' => 'Tax Rate', + 'identifier' => 'Identifier', + 'is_zip' => 'Enable Zip Range', + 'zip_from' => 'Zip From', + 'zip_to' => 'Zip To', + 'state' => 'State', + 'country' => 'Country', + 'tax_rate' => 'Rate', + 'edit' => [ + 'title' => 'Edit Tax Rate', + 'edit-button-title' => 'Edit Rate' + ] + ], + ], + 'settings' => [ 'locales' => [ 'title' => 'Locales', @@ -265,5 +302,24 @@ return [ 'content' => 'Content', 'channels' => 'Channel' ], + ], + 'customers' => [ + 'customers' => [ + 'title' => 'Customers', + 'first_name' => 'First Name', + 'last_name' => 'Last Name', + 'gender' => 'Gender', + 'email' => 'Email', + 'date_of_birth' => 'Date of Birth', + 'phone' => 'Phone', + 'customer_group' => 'Customer Group' + ], + 'reviews' => [ + 'title' => 'Title', + 'name' => 'Reviews', + 'rating' => 'Rating', + 'status' => 'Status', + 'comment' => 'Comment' + ] ] ]; \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php index 75f44f617..5eed7df25 100644 --- a/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php @@ -18,7 +18,7 @@
- +
@csrf() diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php index b6b37b540..836447e9d 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php @@ -73,9 +73,9 @@
- + - +
@@ -122,7 +122,7 @@
- +
- +
- +
- +
- +
@foreach(core()->getAllChannels() as $channelModel) - + @@ -31,7 +31,7 @@
+ @{{ errors.first('first_name') }} +
+ +
+ + + @{{ errors.first('last_name') }} +
+ +
+ + + @{{ errors.first('email') }} +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + + +@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php new file mode 100644 index 000000000..245b9bac6 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php @@ -0,0 +1,84 @@ +@extends('admin::layouts.content') + +@section('content') +
+
+ +
+
+

+ {{ __('admin::app.customers.customers.title') }} +

+
+ +
+ +
+
+ +
+ +
+ @csrf() + + + + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + customerGroup->id ?> + +
+ +
+ + +
+
+
+
+@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php new file mode 100644 index 000000000..475d8afcc --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php @@ -0,0 +1,28 @@ +@extends('admin::layouts.content') + +@section('page_title') + +@stop + +@section('content') + +
+
+
+

{{ __('admin::app.customers.customers.title') }}

+
+
+ + {{ __('Add Customer') }} + +
+
+ +
+ @inject('customer','Webkul\Admin\DataGrids\CustomerDataGrid') + {!! $customer->render() !!} +
+
+ +@stop + diff --git a/packages/Webkul/Admin/src/Resources/views/customers/orders/index.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/orders/index.blade.php new file mode 100644 index 000000000..9dd651cf4 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/customers/orders/index.blade.php @@ -0,0 +1,25 @@ +@extends('admin::layouts.content') + +@section('page_title') + +@stop + +@section('content') + +
+
+
+

Customers

+
+
+ + {{ __('Add Customer') }} + +
+
+ +
+
+
+ +@stop diff --git a/packages/Webkul/Admin/src/Resources/views/customers/orders/order.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/orders/order.blade.php new file mode 100644 index 000000000..da1b1081e --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/customers/orders/order.blade.php @@ -0,0 +1,353 @@ + +@extends('admin::layouts.master') + +@section('content-wrapper') + + +
+ +
+ +
+ +
+
+ Order Information + + Edit + +
+
+ + + + + + +
+ + + +
+ +
+ +
+ + + +
+ +
+
+ Shipping Address + + Edit + +
+
+
+ 0933 Crossing Suite 12B + Dallas , Texas + United States + 75001 +
+
+ +
+
+ Billing Address + + Edit + +
+
+
+ 0933 Crossing Suite 12B + Dallas , Texas + United States + 75001 +
+
+ +
+ + + +
+ +
+ +
+ +
+
+ Payment Information +
+
+ +
+
+ + Payment Method + +
+
+ + Bank Wire Transfer + +
+
+ +
+
+ + Currency + +
+
+ + US Dollar + +
+
+ +
+ +
+
+ Shipping Information +
+
+ +
+
+ + Shipping Method + +
+
+ + Flat Rate-Fixed-$10.00 + +
+
+ +
+
+ + Expected Delivery + +
+
+ + 3 Days + +
+
+ +
+ + +
+ +
+ +
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SKUProduct NameItem StatusPriceQtyRow total
PROD124Apple iPhone 7- White-32GBPacked (2)$350.002$700.00
PROD128Blue Linen T-Shirt for Men- Small- RedShipped (2)$45.002$35.00
+
+ +
+ +
+ +
+ + Subtotal + + + - + + + $805.00 + +
+ +
+ + Shipping & handling + + + - + + + $5.00 + +
+ +
+ + Discounts + + + - + + + $15.00 + +
+ +
+ + Grand Total + + + - + + + $15.00 + +
+ +
+ + Total Due + + + - + + + $15.00 + +
+ +
+ +
+ +
+ + +
+
+ +@stop + + + diff --git a/packages/Webkul/Admin/src/Resources/views/customers/review/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/review/edit.blade.php new file mode 100644 index 000000000..d51814fbf --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/customers/review/edit.blade.php @@ -0,0 +1,69 @@ +@extends('admin::layouts.content') + +@section('content') +
+
+ +
+
+

+ {{ __('admin::app.customers.reviews.name') }} +

+
+ +
+ +
+
+ +
+ +
+ @csrf() + + + + +
+ +
+ + +
+ +
+ + @for($i = 1; $i <= $review->rating ; $i++) + + + + @endfor +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+
+
+@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/customers/review/index.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/review/index.blade.php new file mode 100644 index 000000000..1afc63c69 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/customers/review/index.blade.php @@ -0,0 +1,27 @@ +@extends('admin::layouts.content') + +@section('page_title') + +@stop + +@section('content') + +
+
+
+

{{ __('admin::app.customers.reviews.name') }}

+
+
+ {{-- + {{ __('Add Customer') }} + --}} +
+
+ +
+ @inject('review','Webkul\Admin\DataGrids\CustomerReviewDataGrid') + {!! $review->render() !!} +
+
+ +@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php b/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php index df5850403..b0778f797 100644 --- a/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php @@ -3,5 +3,495 @@ @section('content-wrapper')

Dashboard

+ +
+ +
+ +
+
+
+ NEW VISITORS +
+
+ 450 + + + + + 12.5% Increased + +
+
+
+ +
+
+
+ NEW VISITORS +
+
+ 450 + + + + + 12.5% Increased + +
+
+
+ +
+
+
+ NEW VISITORS +
+
+ 450 + + + + + 12.5% Increased + +
+
+
+ +
+
+
+ NEW VISITORS +
+
+ 450 + + + + + 12.5% Increased + +
+
+
+ + + + + +
+ +
+
+
+ +
+
+
+ TOP PERFORMING CATEGORIES +
+ +
+ +
    + +
  • +
    +
    + Men + +
    +
    + 250 Products . 290 Sales +
    +
    +
    +
    +
    • + +
  • +
    +
    + Women + +
    +
    + 375 Products . 350 Sales +
    +
    +
    +
    +
    • + +
  • +
    +
    + Electronics + +
    +
    + 200 Products . 214 Sales +
    +
    +
    +
    +
    • + +
  • +
    +
    + Accessories + +
    +
    + 180 Products . 180 Sales +
    +
    +
    +
    +
    • +
+
+
+
+
+ +
+
+
+
+ TOP SELLING PRODUCTS +
+ +
+
    +
  • +
    +
    + +
    +
    +
    + Men's Olive Denim Jacket + +
    +
    + 250 Sales . In Stock - 500 +
    +
    +
    +
    +
    +
    • + +
  • +
    +
    + +
    +
    +
    + Apple iPhone 8 Plus - 64GB + +
    +
    + 250 Sales . In Stock - 500 +
    +
    +
    +
    +
    +
    • + +
  • +
    +
    + +
    +
    +
    + Long Lenngth Printed Shrug + +
    +
    + 250 Products . In Stock - 500 +
    +
    +
    +
    +
    +
    • + +
  • +
    +
    + +
    +
    +
    + Black Round Neck T-Shirt for Men + +
    +
    + 250 Products . In Stock - 500 +
    +
    +
    +
    +
    +
    • + +
  • +
    +
    + +
    +
    +
    + Men's Linnen Shirt -Regular Fit + +
    +
    + 250 Products . In Stock - 500 +
    +
    +
    +
    +
    +
    • +
+
+
+
+ +
+
+
+ CUSTOMERS WITH MOST SALES +
+ +
+
    +
  • +
    +
    + +
    +
    +
    + Emma Wagner + +
    +
    + 24 Orders . Revenue $450.00 +
    +
    +
    +
    +
    +
    • + +
  • +
    +
    + +
    +
    +
    + Emma Wagner + +
    +
    + 24 Orders . Revenue $450.00 +
    +
    +
    +
    +
    +
    • + +
  • +
    +
    + +
    +
    +
    + Emma Wagner + +
    +
    + 24 Orders . Revenue $450.00 +
    +
    +
    +
    +
    +
    • + +
  • +
    +
    + +
    +
    +
    + Emma Wagner + +
    +
    + 24 Orders . Revenue $450.00 +
    +
    + +
    +
    +
    +
    • + +
  • +
    +
    + +
    +
    +
    + Emma Wagner + +
    +
    + 24 Orders . Revenue $450.00 +
    +
    + +
    +
    +
    +
    • +
+
+
+
+ +
+
+
+ TOP SELLING PRODUCTS +
+ +
+
    +
  • +
    +
    + +
    +
    +
    + Men's Olive Denim Jacket + +
    +
    + 7 left +
    +
    +
    +
    +
    +
    • + +
  • +
    +
    + +
    +
    +
    + Apple iPhone 8 Plus - 64GB + + +
    +
    + 250 Sales . In Stock - 500 +
    +
    +
    +
    +
    +
    • + +
  • +
    +
    + +
    +
    +
    + Long Lenngth Printed Shrug + +
    +
    + 250 Products . In Stock - 500 +
    +
    + +
    +
    +
    +
    • + +
  • +
    +
    + +
    +
    +
    + Black Round Neck T-Shirt for Men + + +
    +
    + 250 Products . In Stock - 500 +
    +
    + +
    +
    +
    +
    • + +
  • +
    +
    + +
    +
    +
    + Men's Linnen Shirt -Regular Fit + +
    +
    + 250 Products . In Stock - 500 +
    +
    + +
    +
    +
    +
    • +
+
+
+
+ + + +
+
+ + + @stop diff --git a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php index bef0243e8..b59f4aef2 100644 --- a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php @@ -47,7 +47,7 @@ {{ $currency->name }} @endforeach - + @{{ errors.first('target_currency') }}
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php index 92ffef011..646e0bb72 100644 --- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php @@ -1,6 +1,12 @@ @extends('admin::layouts.content') +@section('page_title') + +@stop + @section('content') + +
diff --git a/packages/Webkul/Admin/src/Resources/views/tax/taxrate/create/taxrate.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/taxrate/create/taxrate.blade.php new file mode 100644 index 000000000..d3fb67007 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/tax/taxrate/create/taxrate.blade.php @@ -0,0 +1,93 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.configuration.taxrate.title') }} +@stop + +@section('content') +
+
+
+
+

{{ __('admin::app.configuration.taxrate.title') }}

+
+ +
+ +
+
+ +
+
+ @csrf() + + +
+ +
+ + + + + @{{ errors.first('identifier') }} +
+ +
+ + + + + + Enable Zip Range + +
+ +
+ + + + + @{{ errors.first('zip_from') }} +
+ +
+ + + + + @{{ errors.first('zip_to') }} +
+ +
+ + + + + @{{ errors.first('state') }} +
+ +
+ + + + + @{{ errors.first('country') }} +
+ +
+ + + + + @{{ errors.first('tax_rate') }} +
+ +
+ +
+
+
+
+@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/tax/taxrate/edit/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/taxrate/edit/edit.blade.php new file mode 100644 index 000000000..10608bb21 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/tax/taxrate/edit/edit.blade.php @@ -0,0 +1,93 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.configuration.taxrate.title') }} +@stop + +@section('content') +
+
+
+
+

{{ __('admin::app.configuration.taxrate.edit.title') }}

+
+ +
+ +
+
+ +
+
+ @method('PUT') + @csrf() + +
+ +
+ + + + + @{{ errors.first('identifier') }} +
+ +
+ + + + + + Enable Zip Range + +
+ +
+ + + + + @{{ errors.first('zip_from') }} +
+ +
+ + + + + @{{ errors.first('zip_to') }} +
+ +
+ + + + + @{{ errors.first('state') }} +
+ +
+ + + + + @{{ errors.first('country') }} +
+ +
+ + + + + @{{ errors.first('tax_rate') }} +
+ +
+ +
+
+
+
+@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/tax/taxrate/index.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/taxrate/index.blade.php new file mode 100644 index 000000000..940bb8427 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/tax/taxrate/index.blade.php @@ -0,0 +1,26 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.configuration.taxrate.title') }} +@stop + +@section('content') +
+
+
+

{{ __('admin::app.configuration.taxrate.title') }}

+
+ +
+ + {{ __('admin::app.configuration.taxrate.title') }} + +
+
+ +
+ @inject('taxrates', 'Webkul\Admin\DataGrids\TaxRateDataGrid') + {!! $taxrates->render() !!} +
+
+@endsection \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/tax/taxrule/create/create.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/taxrule/create/create.blade.php new file mode 100644 index 000000000..5b44da360 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/tax/taxrule/create/create.blade.php @@ -0,0 +1,87 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.configuration.taxrule.title') }} +@stop + +@section('content') +
+
+
+
+

{{ __('admin::app.configuration.taxrule.title') }}

+
+ +
+ +
+
+
+
+ @csrf() + + +
+ +
+ + + + + @{{ errors.first('channel') }} +
+ +
+ + + + + @{{ errors.first('code') }} +
+ +
+ + + + + @{{ errors.first('name') }} +
+ +
+ + + + + @{{ errors.first('description') }} +
+ +
+ + + + + @{{ errors.first('taxrates') }} +
+
+ + +
+
+ +
+
+@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/tax/taxrule/edit/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/taxrule/edit/edit.blade.php new file mode 100644 index 000000000..f062ee886 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/tax/taxrule/edit/edit.blade.php @@ -0,0 +1,99 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.configuration.taxrate.title') }} +@stop + +@section('content') +
+
+
+
+

{{ __('admin::app.configuration.taxrule.edit.title') }}

+
+ +
+ +
+
+ +
+
+ @csrf() + @method('PUT') + +
+ +
+ + + + + @{{ errors.first('channel') }} +
+ +
+ + + + + @{{ errors.first('code') }} +
+ +
+ + + + + @{{ errors.first('name') }} +
+ +
+ + + + + @{{ errors.first('description') }} +
+ +
+ + + @inject('taxRates', 'Webkul\Core\Repositories\TaxRatesRepository') + + + + @{{ errors.first('taxrates[]') }} +
+ +
+ + +
+
+
+
+@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/tax/taxrule/index.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/taxrule/index.blade.php new file mode 100644 index 000000000..e381dede6 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/tax/taxrule/index.blade.php @@ -0,0 +1,22 @@ +@extends('admin::layouts.content') + +@section('content') +
+
+
+

{{ __('admin::app.configuration.tax.title') }}

+
+ +
+ + {{ __('admin::app.configuration.tax.add-title') }} + +
+
+ +
+ @inject('taxrule','Webkul\Admin\DataGrids\TaxRuleDataGrid') + {!! $taxrule->render() !!} +
+
+@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php index 1e74d8019..cc3c73708 100644 --- a/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php @@ -14,7 +14,7 @@

{{ __('admin::app.users.sessions.title') }}

-
+ @csrf
@@ -40,14 +40,14 @@ {{ __('admin::app.users.sessions.remember-me') }}
- +
- +
diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php index 0b4e83d0d..d972647e2 100644 --- a/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php @@ -6,8 +6,6 @@ @section('content') - @inject ('datagrid', 'Webkul\Admin\Datagrids\User') -
diff --git a/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php b/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php index 1833eaa12..a2189e0f6 100644 --- a/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php +++ b/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php @@ -14,9 +14,9 @@ class AttributeTableSeeder extends Seeder [ 'code' => 'sku', 'admin_name' => 'SKU', - 'en' => [ - 'name' => 'SKU' - ], + // 'en' => [ + // 'name' => 'SKU' + // ], 'type' => 'text', 'position' => 1, 'is_unique' => 1, @@ -29,9 +29,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'name', 'admin_name' => 'Name', - 'en' => [ - 'name' => 'Name' - ], + // 'en' => [ + // 'name' => 'Name' + // ], 'type' => 'text', 'position' => 2, 'is_required' => 1, @@ -43,9 +43,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'url_key', 'admin_name' => 'URL Key', - 'en' => [ - 'name' => 'URL Key' - ], + // 'en' => [ + // 'name' => 'URL Key' + // ], 'type' => 'text', 'position' => 3, 'is_unique' => 1, @@ -58,9 +58,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'new_from', 'admin_name' => 'New From', - 'en' => [ - 'name' => 'New From' - ], + // 'en' => [ + // 'name' => 'New From' + // ], 'type' => 'datetime', 'position' => 4, 'is_required' => 0, @@ -72,9 +72,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'new_to', 'admin_name' => 'New To', - 'en' => [ - 'name' => 'New To' - ], + // 'en' => [ + // 'name' => 'New To' + // ], 'type' => 'datetime', 'position' => 5, 'is_required' => 0, @@ -86,9 +86,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'visible_individually', 'admin_name' => 'Visible Individually', - 'en' => [ - 'name' => 'Visible Individually' - ], + // 'en' => [ + // 'name' => 'Visible Individually' + // ], 'type' => 'boolean', 'position' => 6, 'is_required' => 1, @@ -100,9 +100,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'status', 'admin_name' => 'Status', - 'en' => [ - 'name' => 'Status' - ], + // 'en' => [ + // 'name' => 'Status' + // ], 'type' => 'boolean', 'position' => 7, 'is_required' => 1, @@ -114,9 +114,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'short_description', 'admin_name' => 'Short Description', - 'en' => [ - 'name' => 'Short Description' - ], + // 'en' => [ + // 'name' => 'Short Description' + // ], 'type' => 'textarea', 'position' => 8, 'is_required' => 1, @@ -128,9 +128,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'description', 'admin_name' => 'Description', - 'en' => [ - 'name' => 'Description' - ], + // 'en' => [ + // 'name' => 'Description' + // ], 'type' => 'textarea', 'position' => 9, 'is_required' => 1, @@ -142,9 +142,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'price', 'admin_name' => 'Price', - 'en' => [ - 'name' => 'Price' - ], + // 'en' => [ + // 'name' => 'Price' + // ], 'type' => 'price', 'position' => 10, 'is_required' => 1, @@ -156,9 +156,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'cost', 'admin_name' => 'Cost', - 'en' => [ - 'name' => 'Cost' - ], + // 'en' => [ + // 'name' => 'Cost' + // ], 'type' => 'price', 'position' => 11, 'is_required' => 0, @@ -170,9 +170,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'special_price', 'admin_name' => 'Special Price', - 'en' => [ - 'name' => 'Special Price' - ], + // 'en' => [ + // 'name' => 'Special Price' + // ], 'type' => 'price', 'position' => 12, 'is_required' => 0, @@ -184,9 +184,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'special_price_from', 'admin_name' => 'Special Price From', - 'en' => [ - 'name' => 'Special Price From' - ], + // 'en' => [ + // 'name' => 'Special Price From' + // ], 'type' => 'date', 'position' => 13, 'is_required' => 0, @@ -198,9 +198,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'special_price_to', 'admin_name' => 'Special Price To', - 'en' => [ - 'name' => 'Special Price To' - ], + // 'en' => [ + // 'name' => 'Special Price To' + // ], 'type' => 'date', 'position' => 14, 'is_required' => 0, @@ -212,9 +212,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'meta_title', 'admin_name' => 'Meta Title', - 'en' => [ - 'name' => 'Meta Description' - ], + // 'en' => [ + // 'name' => 'Meta Description' + // ], 'type' => 'textarea', 'position' => 15, 'is_required' => 0, @@ -226,9 +226,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'meta_keywords', 'admin_name' => 'Meta Keywords', - 'en' => [ - 'name' => 'Meta Keywords' - ], + // 'en' => [ + // 'name' => 'Meta Keywords' + // ], 'type' => 'textarea', 'position' => 16, 'is_required' => 0, @@ -240,9 +240,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'meta_description', 'admin_name' => 'Meta Description', - 'en' => [ - 'name' => 'Meta Description' - ], + // 'en' => [ + // 'name' => 'Meta Description' + // ], 'type' => 'textarea', 'position' => 17, 'is_required' => 0, @@ -254,9 +254,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'width', 'admin_name' => 'Width', - 'en' => [ - 'name' => 'Width' - ], + // 'en' => [ + // 'name' => 'Width' + // ], 'type' => 'text', 'validation' => 'numeric', 'position' => 18, @@ -269,9 +269,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'height', 'admin_name' => 'Height', - 'en' => [ - 'name' => 'Height' - ], + // 'en' => [ + // 'name' => 'Height' + // ], 'type' => 'text', 'validation' => 'numeric', 'position' => 19, @@ -284,9 +284,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'depth', 'admin_name' => 'Depth', - 'en' => [ - 'name' => 'Depth' - ], + // 'en' => [ + // 'name' => 'Depth' + // ], 'type' => 'text', 'validation' => 'numeric', 'position' => 20, @@ -299,9 +299,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'weight', 'admin_name' => 'Weight', - 'en' => [ - 'name' => 'Weight' - ], + // 'en' => [ + // 'name' => 'Weight' + // ], 'type' => 'text', 'validation' => 'numeric', 'position' => 21, @@ -314,9 +314,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'color', 'admin_name' => 'Color', - 'en' => [ - 'name' => 'Color' - ], + // 'en' => [ + // 'name' => 'Color' + // ], 'type' => 'select', 'position' => 22, 'is_required' => 0, @@ -356,9 +356,9 @@ class AttributeTableSeeder extends Seeder ], [ 'code' => 'size', 'admin_name' => 'Size', - 'en' => [ - 'name' => 'Size' - ], + // 'en' => [ + // 'name' => 'Size' + // ], 'type' => 'select', 'position' => 23, 'is_required' => 0, diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php index 9d36faa78..6082d60d4 100644 --- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php +++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php @@ -21,7 +21,7 @@ class AttributeController extends Controller * @var array */ protected $_config; - + /** * AttributeRepository object * @@ -37,6 +37,8 @@ class AttributeController extends Controller */ public function __construct(Attribute $attribute) { + $this->middleware('admin'); + $this->attribute = $attribute; $this->_config = request('_config'); @@ -109,7 +111,7 @@ class AttributeController extends Controller 'admin_name' => 'required', 'type' => 'required' ]); - + $this->attribute->update(request()->all(), $id); session()->flash('success', 'Attribute updated successfully.'); diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php index 24914510e..330f33f96 100644 --- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php +++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php @@ -22,7 +22,7 @@ class AttributeFamilyController extends Controller * @var array */ protected $_config; - + /** * AttributeFamilyRepository object * @@ -38,6 +38,8 @@ class AttributeFamilyController extends Controller */ public function __construct(AttributeFamily $attributeFamily) { + $this->middleware('admin'); + $this->attributeFamily = $attributeFamily; $this->_config = request('_config'); @@ -62,7 +64,7 @@ class AttributeFamilyController extends Controller public function create(Attribute $attribute) { $attributeFamily = $this->attributeFamily->with(['attribute_groups.custom_attributes'])->findOneByField('code', 'default'); - + $custom_attributes = $attribute->all(['id', 'code', 'admin_name', 'type']); return view($this->_config['view'], compact('custom_attributes', 'attributeFamily')); @@ -116,7 +118,7 @@ class AttributeFamilyController extends Controller 'code' => ['required', 'unique:attribute_families,code,' . $id, new \Webkul\Core\Contracts\Validations\Code], 'name' => 'required' ]); - + $this->attributeFamily->update(request()->all(), $id); diff --git a/packages/Webkul/Attribute/src/Providers/AttributeServiceProvider.php b/packages/Webkul/Attribute/src/Providers/AttributeServiceProvider.php index b7f1ee95b..f23d9b830 100644 --- a/packages/Webkul/Attribute/src/Providers/AttributeServiceProvider.php +++ b/packages/Webkul/Attribute/src/Providers/AttributeServiceProvider.php @@ -4,6 +4,7 @@ namespace Webkul\Attribute\Providers; use Illuminate\Support\ServiceProvider; use Illuminate\Routing\Router; +use Webkul\User\Http\Middleware\RedirectIfNotAdmin; class AttributeServiceProvider extends ServiceProvider { @@ -14,6 +15,8 @@ class AttributeServiceProvider extends ServiceProvider */ public function boot(Router $router) { + $router->aliasMiddleware('admin', RedirectIfNotAdmin::class); + $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); } @@ -24,6 +27,6 @@ class AttributeServiceProvider extends ServiceProvider */ public function register() { - + } } \ No newline at end of file diff --git a/packages/Webkul/Cart/composer.json b/packages/Webkul/Cart/composer.json new file mode 100644 index 000000000..ea46e9c47 --- /dev/null +++ b/packages/Webkul/Cart/composer.json @@ -0,0 +1,26 @@ +{ + "name": "webkul/laravel-cart", + "description": "Cart Package for customer.", + "license": "MIT", + "authors": [ + { + "name": "prashant-webkul", + "email": "prashant.singh852@webkul.com" + } + ], + "require": {}, + "autoload": { + "psr-4": { + "Webkul\\Cart\\": "src/" + } + }, + "extra": { + "laravel": { + "providers": [ + "Webkul\\Cart\\Providers\\CartServiceProvider" + ], + "aliases": {} + } + }, + "minimum-stability": "dev" +} diff --git a/packages/Webkul/Cart/src/Database/migrations/2018_09_05_150444_create_cart_table.php b/packages/Webkul/Cart/src/Database/migrations/2018_09_05_150444_create_cart_table.php new file mode 100644 index 000000000..6a2195acc --- /dev/null +++ b/packages/Webkul/Cart/src/Database/migrations/2018_09_05_150444_create_cart_table.php @@ -0,0 +1,38 @@ +increments('id'); + $table->integer('customer_id')->unsigned()->nullable(); + $table->foreign('customer_id')->references('id')->on('customers'); + $table->string('session_id')->nullable(); + $table->integer('channel_id')->unsigned(); + $table->foreign('channel_id')->references('id')->on('channels'); + $table->string('coupon_code')->nullable(); + $table->boolean('is_gift')->nullable(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('cart'); + } +} diff --git a/packages/Webkul/Cart/src/Database/migrations/2018_09_05_150915_create_cart_items_table.php b/packages/Webkul/Cart/src/Database/migrations/2018_09_05_150915_create_cart_items_table.php new file mode 100644 index 000000000..0d739e52e --- /dev/null +++ b/packages/Webkul/Cart/src/Database/migrations/2018_09_05_150915_create_cart_items_table.php @@ -0,0 +1,39 @@ +increments('id'); + $table->integer('product_id')->unsigned(); + $table->foreign('product_id')->references('id')->on('products'); + $table->integer('quantity')->unsigned()->default(1); + $table->integer('cart_id')->unsigned(); + $table->foreign('cart_id')->references('id')->on('cart'); + $table->integer('tax_category_id')->unsigned()->nullable(); + $table->foreign('tax_category_id')->references('id')->on('tax_categories'); + $table->string('coupon_code')->nullable(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('cart_items'); + } +} diff --git a/packages/Webkul/Cart/src/Http/Controllers/CartController.php b/packages/Webkul/Cart/src/Http/Controllers/CartController.php new file mode 100644 index 000000000..21d5008e2 --- /dev/null +++ b/packages/Webkul/Cart/src/Http/Controllers/CartController.php @@ -0,0 +1,45 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CartController extends Controller +{ + + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + protected $_config; + + protected $cart; + + + public function __construct(CartRepository $cart) + { + $this->middleware(['customer', 'guest']); + + $this->_config = request('_config'); + + $this->cart = $cart; + } + + public function add() { + return "Adding Items to Cart"; + } +} \ No newline at end of file diff --git a/packages/Webkul/Cart/src/Http/Controllers/CheckoutController.php b/packages/Webkul/Cart/src/Http/Controllers/CheckoutController.php new file mode 100644 index 000000000..4221017eb --- /dev/null +++ b/packages/Webkul/Cart/src/Http/Controllers/CheckoutController.php @@ -0,0 +1,45 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CheckoutController extends Controller +{ + + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + protected $_config; + + public function __construct() + { + // $this->middleware(['customer', 'guest']); + + $this->_config = request('_config'); + } + + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + public function index() + { + $customer_id = auth()->guard('customer')->user(); + + return view($this->_config['view'],compact('customer_id')); + } + +} \ No newline at end of file diff --git a/packages/Webkul/Cart/src/Models/Cart.php b/packages/Webkul/Cart/src/Models/Cart.php new file mode 100644 index 000000000..c6d6e7ba4 --- /dev/null +++ b/packages/Webkul/Cart/src/Models/Cart.php @@ -0,0 +1,12 @@ +aliasMiddleware('customer', RedirectIfNotCustomer::class); + + $this->loadMigrationsFrom(__DIR__ . '/../Database/migrations'); + } + + /** + * Register services. + * + * @return void + */ + public function register() + { + // $this->app->bind('datagrid', 'Webkul\Ui\DataGrid\DataGrid'); + } +} diff --git a/packages/Webkul/Cart/src/Repositories/CartItemsRepository.php b/packages/Webkul/Cart/src/Repositories/CartItemsRepository.php new file mode 100644 index 000000000..72cd3c8d7 --- /dev/null +++ b/packages/Webkul/Cart/src/Repositories/CartItemsRepository.php @@ -0,0 +1,54 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + +class CartItemsRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + + function model() + { + return 'Webkul\Cart\Models\CartItems'; + } + + /** + * @param array $data + * @return mixed + */ + + public function create(array $data) + { + $cartitems = $this->model->create($data); + + return $cartitems; + } + + /** + * @param array $data + * @param $id + * @param string $attribute + * @return mixed + */ + + public function update(array $data, $id, $attribute = "id") + { + $cartitems = $this->find($id); + + $cartitems->update($data); + + return $cartitems; + } +} \ No newline at end of file diff --git a/packages/Webkul/Cart/src/Repositories/CartRepository.php b/packages/Webkul/Cart/src/Repositories/CartRepository.php new file mode 100644 index 000000000..27257051a --- /dev/null +++ b/packages/Webkul/Cart/src/Repositories/CartRepository.php @@ -0,0 +1,54 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + +class CartRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + + function model() + { + return 'Webkul\Cart\Models\Cart'; + } + + /** + * @param array $data + * @return mixed + */ + + public function create(array $data) + { + $cart = $this->model->create($data); + + return $cart; + } + + /** + * @param array $data + * @param $id + * @param string $attribute + * @return mixed + */ + + public function update(array $data, $id, $attribute = "id") + { + $cart = $this->find($id); + + $cart->update($data); + + return $cart; + } +} \ No newline at end of file diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php index 7a29ff54a..da1d28cf5 100644 --- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php +++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php @@ -20,7 +20,7 @@ class CategoryController extends Controller * @var array */ protected $_config; - + /** * CategoryRepository object * @@ -36,6 +36,8 @@ class CategoryController extends Controller */ public function __construct(Category $category) { + $this->middleware('admin'); + $this->category = $category; $this->_config = request('_config'); diff --git a/packages/Webkul/Category/src/Providers/CategoryServiceProvider.php b/packages/Webkul/Category/src/Providers/CategoryServiceProvider.php index a832e33d8..fe9c0d086 100644 --- a/packages/Webkul/Category/src/Providers/CategoryServiceProvider.php +++ b/packages/Webkul/Category/src/Providers/CategoryServiceProvider.php @@ -5,6 +5,7 @@ namespace Webkul\Category\Providers; use Illuminate\Support\ServiceProvider; use Illuminate\Foundation\AliasLoader; use Illuminate\Routing\Router; +use Webkul\User\Http\Middleware\RedirectIfNotAdmin; class CategoryServiceProvider extends ServiceProvider { @@ -15,6 +16,8 @@ class CategoryServiceProvider extends ServiceProvider */ public function boot(Router $router) { + $router->aliasMiddleware('admin', RedirectIfNotAdmin::class); + $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); } @@ -25,6 +28,6 @@ class CategoryServiceProvider extends ServiceProvider */ public function register() { - + } } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php index 8d7d1b25e..2c20e10a0 100644 --- a/packages/Webkul/Core/src/Core.php +++ b/packages/Webkul/Core/src/Core.php @@ -6,6 +6,8 @@ use Carbon\Carbon; use Webkul\Core\Models\Channel as ChannelModel; use Webkul\Core\Models\Locale as LocaleModel; use Webkul\Core\Models\Currency as CurrencyModel; +use Webkul\Core\Models\TaxCategory as TaxCategory; +use Webkul\Core\Models\TaxRate as TaxRate; class Core { @@ -138,8 +140,10 @@ class Core $channel = $this->getCurrentChannel(); - $currencyCode = $channel->base_currency->code; - + $currencyCode = $channel->base_currency; + + // $currencyCode = $channel->base_currency->code; + return currency($price, $currencyCode); } @@ -211,6 +215,27 @@ class Core // $timezonelist = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL); + /** + * Find all the tax + * rates associated + * with a tax category. + * + * @return Array + */ + + public function withRates($id) { + return TaxCategory::findOrFail($id)->tax_rates; + } + + /** + * To fetch all + * tax rates. + * + * @return Collection + */ + public function getAllTaxRates() { + return TaxRate::all(); + } /** * Format date using current channel. diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_08_30_064755_create_tax_categories_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_08_30_064755_create_tax_categories_table.php new file mode 100644 index 000000000..d80fa049f --- /dev/null +++ b/packages/Webkul/Core/src/Database/Migrations/2018_08_30_064755_create_tax_categories_table.php @@ -0,0 +1,42 @@ +increments('id'); + + $table->integer('channel_id')->unsigned(); + + $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade'); + + $table->string('code')->unique(); + + $table->string('name')->unique(); + + $table->longtext('description'); + + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('tax_rules'); + } +} diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_08_30_065042_create_tax_rates_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_08_30_065042_create_tax_rates_table.php new file mode 100644 index 000000000..5b8c860b1 --- /dev/null +++ b/packages/Webkul/Core/src/Database/Migrations/2018_08_30_065042_create_tax_rates_table.php @@ -0,0 +1,46 @@ +increments('id'); + + $table->string('identifier')->unique(); + + $table->boolean('is_zip_from')->default(0); + + $table->integer('zip_from')->unsigned()->nullable(); + + $table->integer('zip_to')->unsigned()->nullable(); + + $table->string('state'); + + $table->string('country'); + + $table->float('tax_rate', 6, 4); + + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('tax_rates'); + } +} diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_08_30_065840_create_tax_mappings_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_08_30_065840_create_tax_mappings_table.php new file mode 100644 index 000000000..b8cc385dc --- /dev/null +++ b/packages/Webkul/Core/src/Database/Migrations/2018_08_30_065840_create_tax_mappings_table.php @@ -0,0 +1,42 @@ +increments('id'); + + $table->integer('tax_category_id')->unsigned(); + + $table->foreign('tax_category_id')->references('id')->on('tax_categories')->onDelete('cascade'); + + $table->integer('tax_rate_id')->unsigned(); + + $table->foreign('tax_rate_id')->references('id')->on('tax_rates')->onDelete('cascade'); + + $table->unique(['tax_category_id', 'tax_rate_id'], 'tax_map_index_unique'); + + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('tax_map'); + } +} diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php index b34ac0321..858b69202 100644 --- a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php @@ -21,7 +21,7 @@ class ChannelController extends Controller * @var array */ protected $_config; - + /** * ChannelRepository object * @@ -37,6 +37,8 @@ class ChannelController extends Controller */ public function __construct(Channel $channel) { + $this->middleware('admin'); + $this->channel = $channel; $this->_config = request('_config'); diff --git a/packages/Webkul/Core/src/Http/Controllers/CountryController.php b/packages/Webkul/Core/src/Http/Controllers/CountryController.php index a83b61783..eeeae966e 100644 --- a/packages/Webkul/Core/src/Http/Controllers/CountryController.php +++ b/packages/Webkul/Core/src/Http/Controllers/CountryController.php @@ -20,7 +20,7 @@ class CountryController extends Controller * @var array */ protected $_config; - + /** * CountryRepository object * @@ -36,6 +36,8 @@ class CountryController extends Controller */ public function __construct(Country $country) { + $this->middleware('admin'); + $this->country = $country; $this->_config = request('_config'); diff --git a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php index f93b74b30..b8b106cf9 100644 --- a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php +++ b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php @@ -20,7 +20,7 @@ class CurrencyController extends Controller * @var array */ protected $_config; - + /** * CurrencyRepository object * @@ -36,6 +36,8 @@ class CurrencyController extends Controller */ public function __construct(Currency $currency) { + $this->middleware('admin'); + $this->currency = $currency; $this->_config = request('_config'); @@ -81,7 +83,7 @@ class CurrencyController extends Controller return redirect()->route($this->_config['redirect']); } - + /** * Remove the specified resource from storage. * diff --git a/packages/Webkul/Core/src/Http/Controllers/CustomerController.php b/packages/Webkul/Core/src/Http/Controllers/CustomerController.php new file mode 100644 index 000000000..3ec3076e5 --- /dev/null +++ b/packages/Webkul/Core/src/Http/Controllers/CustomerController.php @@ -0,0 +1,141 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CustomerController extends Controller +{ + /** + * Contains route related configuration + * + * @var array + */ + protected $_config; + + /** + * CustomerRepository object + * + * @var array + */ + protected $customer; + + /** + * CustomerGroupRepository object + * + * @var array + */ + protected $customerGroup; + + /** + * Create a new controller instance. + * + * @param Webkul\Customer\Repositories\CustomerRepository as customer; + * @param Webkul\Customer\Repositories\CustomerGroupRepository as customerGroup; + * @return void + */ + public function __construct(Customer $customer , CustomerGroup $customerGroup ) + { + $this->_config = request('_config'); + + $this->customer = $customer; + + $this->customerGroup = $customerGroup; + } + + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + public function index() + { + return view($this->_config['view']); + } + + /** + * Show the form for creating a new resource. + * + * @return \Illuminate\Http\Response + */ + public function create() + { + $customerGroup = $this->customerGroup->all(); + + return view($this->_config['view'],compact('customerGroup')); + } + + /** + * Store a newly created resource in storage. + * + * @return \Illuminate\Http\Response + */ + public function store(Request $request) + { + $request->validate([ + + 'first_name' => 'string|required', + 'last_name' => 'string|required', + 'email' => 'email|required', + + ]); + + $data=$request->all(); + + $password = bcrypt(rand(100000,10000000)); + + $data['password']=$password; + + $this->customer->create($data); + + session()->flash('success', 'Customer created successfully.'); + + return redirect()->route($this->_config['redirect']); + + } + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function edit($id) + { + $customer = $this->customer->findOneWhere(['id'=>$id]); + + $customerGroup = $this->customerGroup->all(); + + return view($this->_config['view'],compact('customer','customerGroup')); + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $id) + { + + $this->customer->update(request()->all(),$id); + + session()->flash('success', 'Customer updated successfully.'); + + return redirect()->route($this->_config['redirect']); + } + + +} diff --git a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php index e7f6cf1b1..57c47d4e5 100644 --- a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php @@ -21,14 +21,14 @@ class ExchangeRateController extends Controller * @var array */ protected $_config; - + /** * ExchangeRateRepository object * * @var array */ protected $exchangeRate; - + /** * CurrencyRepository object * @@ -45,6 +45,8 @@ class ExchangeRateController extends Controller */ public function __construct(ExchangeRate $exchangeRate, Currency $currency) { + $this->middleware('admin'); + $this->exchangeRate = $exchangeRate; $this->currency = $currency; @@ -129,7 +131,7 @@ class ExchangeRateController extends Controller 'target_currency' => 'required', 'ratio' => 'required|numeric' ]); - + $this->exchangeRate->update(request()->all(), $id); session()->flash('success', 'Exchange rate updated successfully.'); diff --git a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php index 09578ed70..015b3334f 100644 --- a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php +++ b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php @@ -20,7 +20,7 @@ class LocaleController extends Controller * @var array */ protected $_config; - + /** * LocaleRepository object * @@ -36,6 +36,8 @@ class LocaleController extends Controller */ public function __construct(Locale $locale) { + $this->middleware('admin'); + $this->locale = $locale; $this->_config = request('_config'); diff --git a/packages/Webkul/Core/src/Http/Controllers/ReviewController.php b/packages/Webkul/Core/src/Http/Controllers/ReviewController.php new file mode 100644 index 000000000..ac6b76995 --- /dev/null +++ b/packages/Webkul/Core/src/Http/Controllers/ReviewController.php @@ -0,0 +1,81 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class ReviewController extends Controller +{ + + /** + * Contains route related configuration + * + * @var array + */ + protected $_config; + + /** + * ProductRepository object + * + * @var array + */ + protected $product; + + /** + * ProductReviewRepository object + * + * @var array + */ + protected $productReview; + + /** + * Create a new controller instance. + * + * @param Webkul\Product\Repositories\ProductRepository $product + * @param Webkul\Product\Repositories\ProductReviewRepository $productReview + * @return void + */ + public function __construct(Product $product, ProductReview $productReview) + { + $this->product = $product; + + $this->productReview = $productReview; + + $this->_config = request('_config'); + } + + /** + * Store a newly created resource in storage. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\Response + */ + public function store(Request $request , $id) + { + $this->validate(request(), [ + 'comment' => 'required', + ]); + + $input=$request->all(); + + $input['product_id']=$id; + + $input['customer_id']=1; + + $this->productReview->create($input); + + session()->flash('success', 'Review submitted successfully.'); + + return redirect()->route($this->_config['redirect']); + } + +} diff --git a/packages/Webkul/Core/src/Http/Controllers/TaxCategoryController.php b/packages/Webkul/Core/src/Http/Controllers/TaxCategoryController.php new file mode 100644 index 000000000..5bc939083 --- /dev/null +++ b/packages/Webkul/Core/src/Http/Controllers/TaxCategoryController.php @@ -0,0 +1,177 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class TaxCategoryController extends Controller +{ + /** + * Contains route related configuration + * + * @var array + */ + protected $_config; + + /** + * Contains the current + * channel. + * + * @var string + */ + protected $currentChannelId; + + /** + * Tax Rule Repository object + * + * @var array + */ + protected $taxRule; + + /** + * Create a new controller instance. + * + * @param Webkul\Core\Repositories\TaxCategoriesRepository $taxRule + * @return void + */ + public function __construct(TaxRule $taxRule, TaxRate $taxRate, TaxMap $taxMap) + { + $this->middleware('admin'); + + $this->currentChannelId = core()->getCurrentChannel()->id; + + $this->taxRule = $taxRule; + + $this->taxRate = $taxRate; + + $this->taxMap = $taxMap; + + $this->_config = request('_config'); + } + + /** + * Function to show + * the tax rule form + * + * @return view + */ + public function show() + { + return view($this->_config['view'])->with('taxRates', $this->taxRate->all()); + } + + /** + * Function to create + * the tax rule. + * + * @return view + */ + public function create() + { + $data = request()->input(); + + $this->validate(request(), [ + 'code' => 'required|string|unique:tax_categories,id', + 'name' => 'required|string|unique:tax_categories,name', + 'description' => 'required|string' + ]); + + if($currentTaxRule = $this->taxRule->create(request()->input())) { + $allTaxRules = $data['taxrates']; + + $this->taxRule->onlyAttach($currentTaxRule->id, $allTaxRules); + + session()->flash('success', 'New Tax Rule Created'); + + return redirect()->route($this->_config['redirect']); + } else { + session()->flash('error', 'Cannot create the tax rule'); + } + + return view($this->_config['view']); + } + + /** + * To show the edit + * form form the tax + * rule + * + * @return view + */ + + public function edit($id) { + + $taxRates = core()->withRates($id)->toArray(); + + $taxRule = $this->taxRule->findByField('id', $id)->toArray(); + + return view($this->_config['view'])->with('data', [$taxRule, $taxRates]); + + } + + /** + * To update the + * tax rule + * + * @return view + */ + + public function update($id) { + //return the tax rule data with the mapping table data also, + //allow the user to change the tax rates associated with the + // rule also. + $this->validate(request(), [ + 'channel' => 'required|numeric', + 'code' => 'required|string|unique:tax_categories,id,'.$id, + 'name' => 'required|string|unique:tax_categories,name,'.$id, + 'description' => 'required|string', + 'taxrates' => 'array|required' + ]); + + $data['channel_id'] = request()->input('channel'); + + $data['code'] = request()->input('code'); + + $data['name'] = request()->input('name'); + + $data['description'] = request()->input('description'); + + if($this->taxRate->update($data, $id)) { + $this->taxRule->syncAndDetach($id, request()->input('taxrates')); + + session()->flash('success', 'Tax Category is successfully edited.'); + + return redirect()->route($this->_config['redirect']); + } else { + session()->flash('error', 'Tax Category Cannot be Updated Successfully.'); + + return redirect()->back(); + } + } + + /** + * Destroy a tax rule + * + * @return mixed + */ + + public function destroy($id) { + if($this->taxRule()->delete($id)) { + session()->flash('success', 'The tax rule is successfully deleted'); + + return redirect()->back(); + } + } + +} \ No newline at end of file diff --git a/packages/Webkul/Core/src/Http/Controllers/TaxController.php b/packages/Webkul/Core/src/Http/Controllers/TaxController.php new file mode 100644 index 000000000..db5bdee99 --- /dev/null +++ b/packages/Webkul/Core/src/Http/Controllers/TaxController.php @@ -0,0 +1,92 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class TaxController extends Controller +{ + /** + * Contains route related configuration + * + * @var array + */ + protected $_config; + + /** + * ChannelRepository object + * + * @var array + */ + protected $channel; + + /** + * Tax Rule Repository object + * + * @var array + */ + protected $taxRule; + + /** + * Tax Rate Repository object + * + * @var array + */ + protected $taxRate; + + /** + * Tax Map Repository object + * + * @var array + */ + protected $taxMap; + + /** + * Create a new controller instance. + * + * @param Webkul\Core\Repositories\ChannelRepository $channel + * @param Webkul\Core\Repositories\TaxCategoriesRepository $taxRule + * @param Webkul\Core\Repositories\TaxRatesRepository $taxRate + * @param Webkul\Core\Repositories\TaxMapRepository $taxMap + * @return void + */ + public function __construct(Channel $channel, TaxRule $taxRule, TaxRate $taxRate, TaxMap $taxMap) + { + $this->middleware('admin'); + + $this->channel = $channel; + + $this->taxRule = $taxRule; + + $this->taxRate = $taxRate; + + $this->taxMap = $taxMap; + + $this->_config = request('_config'); + } + + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + public function index() + { + return view($this->_config['view']); + } + + + +} \ No newline at end of file diff --git a/packages/Webkul/Core/src/Http/Controllers/TaxRateController.php b/packages/Webkul/Core/src/Http/Controllers/TaxRateController.php new file mode 100644 index 000000000..a7eec0dd1 --- /dev/null +++ b/packages/Webkul/Core/src/Http/Controllers/TaxRateController.php @@ -0,0 +1,146 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class TaxRateController extends Controller +{ + /** + * Contains route related configuration + * + * @var array + */ + protected $_config; + + /** + * Tax Rate Repository object + * + * @var array + */ + protected $taxRate; + + /** + * Create a new controller instance. + * + * @param Webkul\Core\Repositories\TaxRatesRepository $taxRate + * @return void + */ + public function __construct(TaxRate $taxRate) + { + $this->middleware('admin'); + + $this->taxRate = $taxRate; + + $this->_config = request('_config'); + } + + /** + * Display a listing + * resource for the + * available tax rates. + * + * @return mixed + */ + + public function index() { + return view($this->_config['view']); + } + + /** + * Display a create + * form for tax rate + * + * @return view + */ + public function show() + { + return view($this->_config['view']); + } + + /** + * Create the tax rate + * + * @return mixed + */ + public function create() { + + $this->validate(request(), [ + 'identifier' => 'required|string|unique:tax_rates,identifier', + 'is_zip' => 'sometimes|confirmed', + 'zip_from' => 'nullable|numeric|required_with:is_zip', + 'zip_to' => 'nullable|numeric|required_with:is_zip,zip_from', + 'state' => 'required|string', + 'country' => 'required|string', + 'tax_rate' => 'required|numeric' + ]); + + if($this->taxRate->create(request()->input())) { + session()->flash('success', 'Tax Rate Created Successfully'); + + return redirect()->route($this->_config['redirect']); + } else { + session()->flash('error', 'Cannot Create Tax Rate'); + + return redirect()->back(); + } + + return redirect()->back(); + } + + /** + * Show the edit form + * for the previously + * created tax rates. + * + * @return mixed + */ + + public function edit($id) { + + $data = collect($this->taxRate->findOneByField('id', $id)); + + return view($this->_config['view'])->with('data', $data); + + } + + /** + * Edit the previous + * tax rate + * + * @return mixed + */ + public function update($id) { + + $this->validate(request(), [ + 'identifier' => 'required|string|unique:tax_rates,identifier,'.$id, + 'is_zip' => 'sometimes|confirmed', + 'zip_from' => 'nullable|numeric|required_with:is_zip', + 'zip_to' => 'nullable|numeric|required_with:is_zip,zip_from', + 'state' => 'required|string', + 'country' => 'required|string', + 'tax_rate' => 'required|numeric' + ]); + + if($this->taxRate->update(request()->input(), $id)) { + session()->flash('success', 'Tax Rate Updated Successfully'); + + return redirect()->route($this->_config['redirect']); + } else { + session()->flash('error', 'Cannot Create Tax Rate'); + + return redirect()->back(); + } + + return redirect()->back(); + } +} \ No newline at end of file diff --git a/packages/Webkul/Core/src/Models/TaxCategory.php b/packages/Webkul/Core/src/Models/TaxCategory.php new file mode 100644 index 000000000..f26314a4b --- /dev/null +++ b/packages/Webkul/Core/src/Models/TaxCategory.php @@ -0,0 +1,27 @@ +belongsToMany(TaxRate::class, 'tax_categories_tax_rates', 'tax_category_id')->withPivot('id'); + } +} \ No newline at end of file diff --git a/packages/Webkul/Core/src/Models/TaxMap.php b/packages/Webkul/Core/src/Models/TaxMap.php new file mode 100644 index 000000000..6a1fdf254 --- /dev/null +++ b/packages/Webkul/Core/src/Models/TaxMap.php @@ -0,0 +1,23 @@ +belongsToMany(TaxCategory::class, 'tax_categories_tax_rates', 'tax_rate_id', 'id'); + } +} \ No newline at end of file diff --git a/packages/Webkul/Core/src/Providers/CoreServiceProvider.php b/packages/Webkul/Core/src/Providers/CoreServiceProvider.php index b05b4b3b4..893feccac 100644 --- a/packages/Webkul/Core/src/Providers/CoreServiceProvider.php +++ b/packages/Webkul/Core/src/Providers/CoreServiceProvider.php @@ -1,7 +1,5 @@ loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); - $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'core'); - $router->aliasMiddleware('locale', Locale::class); - // $this->publishes([ // __DIR__ . '/../../publishable/lang' => public_path('vendor/webkul/core/lang'), // ], 'public'); - Validator::extend('slug', 'Webkul\Core\Contracts\Validations\Slug@passes'); - Validator::extend('code', 'Webkul\Core\Contracts\Validations\Code@passes'); } - /** * Register services. * @@ -45,7 +35,6 @@ class CoreServiceProvider extends ServiceProvider { $this->registerFacades(); } - /** * Register Bouncer as a singleton. * @@ -55,7 +44,6 @@ class CoreServiceProvider extends ServiceProvider { $loader = AliasLoader::getInstance(); $loader->alias('core', CoreFacade::class); - $this->app->singleton('core', function () { return new Core(); }); diff --git a/packages/Webkul/Core/src/Repositories/CountryRepository.php b/packages/Webkul/Core/src/Repositories/CountryRepository.php index fc6209aea..12c550c65 100644 --- a/packages/Webkul/Core/src/Repositories/CountryRepository.php +++ b/packages/Webkul/Core/src/Repositories/CountryRepository.php @@ -1,7 +1,7 @@ -hasFile('image'); + $image = request()->file('image'); $image_name = uniqid(20).'.'.$image->getClientOriginalExtension(); diff --git a/packages/Webkul/Core/src/Repositories/TaxCategoriesRepository.php b/packages/Webkul/Core/src/Repositories/TaxCategoriesRepository.php new file mode 100644 index 000000000..a15b21031 --- /dev/null +++ b/packages/Webkul/Core/src/Repositories/TaxCategoriesRepository.php @@ -0,0 +1,82 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class TaxCategoriesRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + function model() + { + return 'Webkul\Core\Models\TaxCategory'; + } + + /** + * @param array $data + * @return mixed + */ + public function create(array $data) + { + $taxRule = $this->model->create($data); + + return $taxRule; + } + + /** + * @param array $data + * @param $id + * @param string $attribute + * + * @return mixed + */ + public function update(array $data, $id, $attribute = "id") + { + $taxRule = $this->find($id); + + $taxRule->update($data); + + return $taxmap; + } + + /** + * Method to attach + * associations + * + * @return mixed + */ + public function onlyAttach($id, $taxRates) { + + foreach($taxRates as $key => $value) { + + $this->model->findOrFail($id)->tax_rates()->attach($id, ['tax_category_id' => $id, 'tax_rate_id' => $value]); + } + } + + + /** + * Method to detach + * and attach the + * associations + * + * @return mixed + */ + public function syncAndDetach($id, $taxRates) { + $this->model->findOrFail($id)->tax_rates()->detach(); + + foreach($taxRates as $key => $value) { + $this->model->findOrFail($id)->tax_rates()->attach($id, ['tax_category_id' => $id, 'tax_rate_id' => $value]); + } + } + +} \ No newline at end of file diff --git a/packages/Webkul/Core/src/Repositories/TaxMapRepository.php b/packages/Webkul/Core/src/Repositories/TaxMapRepository.php new file mode 100644 index 000000000..f8ce89f08 --- /dev/null +++ b/packages/Webkul/Core/src/Repositories/TaxMapRepository.php @@ -0,0 +1,50 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class TaxMapRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + function model() + { + return 'Webkul\Core\Models\TaxMap'; + } + + /** + * @param array $data + * @return mixed + */ + public function create(array $data) + { + $taxMap = $this->model->create($data); + + return $taxMap; + } + + /** + * @param array $data + * @param $id + * @param string $attribute + * @return mixed + */ + public function update(array $data, $id, $attribute = "id") + { + $taxMap = $this->find($id); + + $taxMap->update($data); + + return $taxMap; + } +} \ No newline at end of file diff --git a/packages/Webkul/Core/src/Repositories/TaxRatesRepository.php b/packages/Webkul/Core/src/Repositories/TaxRatesRepository.php new file mode 100644 index 000000000..c136601c0 --- /dev/null +++ b/packages/Webkul/Core/src/Repositories/TaxRatesRepository.php @@ -0,0 +1,50 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class TaxRatesRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + function model() + { + return 'Webkul\Core\Models\TaxRate'; + } + + /** + * @param array $data + * @return mixed + */ + public function create(array $data) + { + $taxRate = $this->model->create($data); + + return $taxRate; + } + + /** + * @param array $data + * @param $id + * @param string $attribute + * @return mixed + */ + public function update(array $data, $id, $attribute = "id") + { + $taxRate = $this->find($id); + + $taxRate->update($data); + + return $taxRate; + } +} \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082930_create_customers_table.php b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082930_create_customers_table.php index 7713f96a0..bd5ea3ebb 100644 --- a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082930_create_customers_table.php +++ b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082930_create_customers_table.php @@ -21,6 +21,7 @@ class CreateCustomersTable extends Migration $table->date('date_of_birth')->nullable(); $table->string('phone')->unique()->nullable(); $table->string('email')->unique(); + $table->tinyInteger('status')->default(1); $table->string('password'); $table->integer('customer_group_id')->unsigned()->nullable(); $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade'); diff --git a/packages/Webkul/Customer/src/Http/Controllers/AccountController.php b/packages/Webkul/Customer/src/Http/Controllers/AccountController.php new file mode 100644 index 000000000..17795fdb0 --- /dev/null +++ b/packages/Webkul/Customer/src/Http/Controllers/AccountController.php @@ -0,0 +1,47 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class AccountController extends Controller +{ + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + protected $_config; + protected $customer; + protected $address; + + + public function __construct(CustomerRepository $customer, CustomerAddressRepository $address) + { + $this->middleware('customer'); + + $this->_config = request('_config'); + + $this->customer = $customer; + + $this->address = $address; + } + + public function index() { + return view($this->_config['view']); + } + +} diff --git a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php new file mode 100644 index 000000000..0a658b2fe --- /dev/null +++ b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php @@ -0,0 +1,192 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class AddressController extends Controller +{ + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + protected $_config; + protected $customer; + protected $address; + + + public function __construct(CustomerRepository $customer, CustomerAddressRepository $address) + { + $this->middleware('customer'); + + $this->_config = request('_config'); + + $this->customer = $customer; + + $this->address = $address; + } + + /** + * Getting logged in + * customer helper + * @return Array + */ + private function getCustomer($id) { + + $customer = collect($this->customer->findOneWhere(['id'=>$id])); + + return $customer; + } + + /** + * Getting logged in + * customer address + * helper + * @return Array + */ + private function getAddress($id) { + + $address = collect($this->address->findOneWhere(['customer_id'=>$id])); + + return $address; + + } + + + /** + * Address Route + * index page + * @return View + */ + public function index() { + $id = auth()->guard('customer')->user()->id; + + $customer = $this->getCustomer($id); + + $address = $this->getAddress($id); + + return view($this->_config['view'])->with('address', $address); + } + + /** + * Show the address + * create form + * @return View + */ + public function show() { + return view($this->_config['view']); + } + + /** + * Create a new + * address for + * customer. + * + * @return View + */ + public function create() { + + $id = auth()->guard('customer')->user()->id; + + $data = collect(request()->input())->except('_token')->toArray(); + + $this->validate(request(), [ + + 'address1' => 'string|required', + 'address2' => 'string|required', + 'country' => 'string|required', + 'state' => 'string|required', + 'city' => 'string|required', + 'postcode' => 'numeric|required', + + ]); + + $cust_id['customer_id'] = $id; + + $data = array_merge($cust_id, $data); + + $address = $this->getAddress($id); + + + if(count($address) == 0 || $address->isEmpty()) { + if($this->address->create($data)) { + session()->flash('success', 'Address have been successfully added.'); + + return redirect()->route($this->_config['redirect']); + + } else { + session()->flash('error', 'Address cannot be added.'); + + return redirect()->back(); + } + } else { + session()->flash('error', 'Cannot create a new address due to previously existing address'); + + return redirect()-route('customer.address.edit'); + } + + + + } + + /** + * For editing the + * existing address + * of the customer + * + * @return View + */ + public function showEdit() { + + $id = auth()->guard('customer')->user()->id; + + $address = $this->getAddress($id); + + return view($this->_config['view'])->with('address', $address); + + } + + public function edit() { + + $id = auth()->guard('customer')->user()->id; + + $this->validate(request(), [ + + 'address1' => 'string|required', + 'address2' => 'string|required', + 'country' => 'string|required', + 'state' => 'string|required', + 'city' => 'string|required', + 'postcode' => 'numeric|required', + + ]); + + $data = collect(request()->input())->except('_token')->toArray(); + + $address = $this->getAddress($id); + + if($this->address->update($data, $id)) { + Session()->flash('success','Address Updated Successfully.'); + + return redirect()->route('customer.address.index'); + } else { + Session()->flash('success','Address Cannot be Updated.'); + + return redirect()->route('customer.address.edit'); + } + } +} diff --git a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php index 026436d4e..a8501b133 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php @@ -4,8 +4,9 @@ namespace Webkul\Customer\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Http\Response; -use Illuminate\Routing\Controller; +use Webkul\Customer\Repositories\CustomerRepository; use Webkul\Customer\Models\Customer; +use Auth; /** * Customer controlller for the customer @@ -24,10 +25,16 @@ class CustomerController extends Controller * @return \Illuminate\Http\Response */ protected $_config; + protected $customer; - public function __construct() + + public function __construct(CustomerRepository $customer) { + $this->middleware('customer'); + $this->_config = request('_config'); + + $this->customer = $customer; } /** @@ -36,23 +43,108 @@ class CustomerController extends Controller * authentication * @return view */ - private function getCustomer($id) - { - $customer = collect(Customer::find($id)); + private function getCustomer($id) { + $customer = collect($this->customer->findOneWhere(['id'=>$id])); return $customer; } - public function profile() - { + /** + * Taking the customer + * to profile details + * page + * @return View + */ + public function index() { $id = auth()->guard('customer')->user()->id; + $customer = $this->getCustomer($id); + return view($this->_config['view'])->with('customer', $customer); } - public function editProfile() - { + /** + * For loading the + * edit form page. + * + * @return View + */ + public function editIndex() { $id = auth()->guard('customer')->user()->id; + $customer = $this->getCustomer($id); + return view($this->_config['view'])->with('customer', $customer); } + + /** + * Edit function + * for editing customer + * profile. + * + * @return Redirect. + */ + public function edit() { + + $id = auth()->guard('customer')->user()->id; + + $this->validate(request(), [ + + 'first_name' => 'string', + 'last_name' => 'string', + 'gender' => 'required', + 'date_of_birth' => 'date', + 'phone' => 'string|size:10', + 'email' => 'email|unique:customers,email,'.$id, + 'password' => 'confirmed|required_if:oldpassword,!=,null' + + ]); + + $data = collect(request()->input())->except('_token')->toArray(); + + if($data['oldpassword'] == null) { + + $data = collect(request()->input())->except(['_token','password','password_confirmation','oldpassword'])->toArray(); + if($this->customer->update($data, $id)) { + Session()->flash('success','Profile Updated Successfully'); + + return redirect()->back(); + } else { + Session()->flash('success','Profile Updated Successfully'); + + return redirect()->back(); + } + + } else { + + $data = collect(request()->input())->except(['_token','oldpassword'])->toArray(); + + $data['password'] = bcrypt($data['password']); + + if($this->customer->update($data, $id)) { + Session()->flash('success','Profile Updated Successfully'); + + return redirect()->back(); + } else { + Session()->flash('success','Profile Updated Successfully'); + + return redirect()->back(); + } + } + } + + public function orders() { + return view($this->_config['view']); + } + + public function wishlist() { + return view($this->_config['view']); + } + + public function reviews() { + return view($this->_config['view']); + } + + public function address() { + return view($this->_config['view']); + } } diff --git a/packages/Webkul/Customer/src/Http/Controllers/OrdersController.php b/packages/Webkul/Customer/src/Http/Controllers/OrdersController.php new file mode 100644 index 000000000..e35943d2e --- /dev/null +++ b/packages/Webkul/Customer/src/Http/Controllers/OrdersController.php @@ -0,0 +1,61 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class OrdersController extends Controller +{ + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + protected $_config; + protected $customer; + + + public function __construct(CustomerRepository $customer) + { + $this->middleware('customer'); + + $this->_config = request('_config'); + + $this->customer = $customer; + } + + /** + * For taking the customer + * to the dashboard after + * authentication + * @return view + */ + private function getCustomer($id) { + $customer = collect($this->customer->findOneWhere(['id'=>$id])); + return $customer; + } + + public function index() { + $id = auth()->guard('customer')->user()->id; + + $customer = $this->getCustomer($id); + + return view($this->_config['view'])->with('customer', $customer); + } + + public function orders() { + return view($this->_config['view']); + } +} diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php index 7274614e0..67ea8ba65 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php @@ -5,10 +5,10 @@ namespace Webkul\Customer\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Routing\Controller; -use Webkul\Customer\Models\Customer; +use Webkul\Customer\Repositories\CustomerRepository; /** - * Dashboard controller + * Registration controller * * @author Prashant Singh * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) @@ -21,10 +21,13 @@ class RegistrationController extends Controller * @return \Illuminate\Http\Response */ protected $_config; + protected $customer; - public function __construct() + + public function __construct(CustomerRepository $customer) { $this->_config = request('_config'); + $this->customer = $customer; } /** @@ -43,25 +46,30 @@ class RegistrationController extends Controller */ public function create(Request $request) { - // return $request->except('_token'); //don't let csrf token to be openly printed + $request->validate([ + 'first_name' => 'string|required', 'last_name' => 'string|required', 'email' => 'email|required', - 'password' => 'confirmed|min:8|required' + 'password' => 'confirmed|min:6|required' + ]); - $customer = new \Webkul\Customer\Models\Customer(); - $customer->first_name = $request->first_name; - $customer->last_name = $request->last_name; - $customer->email = $request->email; - $customer->password = bcrypt($request->password); - // dd('hello1'); - if ($customer->save()) { + + $registrationData = $request->except('_token'); + + if ($this->customer->create($registrationData)) { + session()->flash('success', 'Account created successfully.'); + return redirect()->route($this->_config['redirect']); + } else { + session()->flash('error', 'Cannot Create Your Account.'); + return redirect()->back(); + } } } diff --git a/packages/Webkul/Customer/src/Http/Controllers/ReviewsController.php b/packages/Webkul/Customer/src/Http/Controllers/ReviewsController.php new file mode 100644 index 000000000..62e2f78ec --- /dev/null +++ b/packages/Webkul/Customer/src/Http/Controllers/ReviewsController.php @@ -0,0 +1,61 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class ReviewsController extends Controller +{ + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + protected $_config; + protected $customer; + + + public function __construct(CustomerRepository $customer) + { + $this->middleware('customer'); + + $this->_config = request('_config'); + + $this->customer = $customer; + } + + /** + * For taking the customer + * to the dashboard after + * authentication + * @return view + */ + private function getCustomer($id) { + $customer = collect($this->customer->findOneWhere(['id'=>$id])); + return $customer; + } + + public function index() { + $id = auth()->guard('customer')->user()->id; + + $customer = $this->getCustomer($id); + + return view($this->_config['view'])->with('customer', $customer); + } + + public function reviews() { + return view($this->_config['view']); + } +} \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Http/Controllers/SessionController.php b/packages/Webkul/Customer/src/Http/Controllers/SessionController.php index 81c56d2b5..18a2dae23 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/SessionController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/SessionController.php @@ -24,12 +24,20 @@ class SessionController extends Controller public function __construct() { + + $this->middleware('customer')->except(['show','create']); + $this->_config = request('_config'); + } public function show() { - return view($this->_config['view']); + if(auth()->guard('customer')->check()) { + return redirect()->route('customer.account.index'); + } else { + return view($this->_config['view']); + } } public function create(Request $request) @@ -39,15 +47,13 @@ class SessionController extends Controller 'password' => 'required' ]); - // $remember = request('remember'); if (!auth()->guard('customer')->attempt(request(['email', 'password']))) { - dd('cannot be authorized'); - session()->flash('error', 'Please check your credentials and try again.'); + session()->flash('error', 'Please check your credentials and try again.'); return back(); } - return redirect()->route($this->_config['redirect']); + return redirect()->intended(route($this->_config['redirect'])); } public function destroy($id) @@ -55,4 +61,4 @@ class SessionController extends Controller auth()->guard('customer')->logout(); return redirect()->route($this->_config['redirect']); } -} +} \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php new file mode 100644 index 000000000..fb8567d66 --- /dev/null +++ b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php @@ -0,0 +1,61 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class WishlistController extends Controller +{ + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + protected $_config; + protected $customer; + + + public function __construct(CustomerRepository $customer) + { + $this->middleware('customer'); + + $this->_config = request('_config'); + + $this->customer = $customer; + } + + /** + * For taking the customer + * to the dashboard after + * authentication + * @return view + */ + private function getCustomer($id) { + $customer = collect($this->customer->findOneWhere(['id'=>$id])); + return $customer; + } + + public function index() { + $id = auth()->guard('customer')->user()->id; + + $customer = $this->getCustomer($id); + + return view($this->_config['view'])->with('customer', $customer); + } + + public function wishlist() { + return view($this->_config['view']); + } +} diff --git a/packages/Webkul/Customer/src/Menu.php b/packages/Webkul/Customer/src/Menu.php index 1c367d27f..c4438b884 100644 --- a/packages/Webkul/Customer/src/Menu.php +++ b/packages/Webkul/Customer/src/Menu.php @@ -9,6 +9,13 @@ use Illuminate\Support\Facades\URL; class Menu { public $items = array(); + public $current; + public $currentKey; + + public function __construct() { + $this->current = Request::url(); + } + public static function create($callback) { @@ -26,4 +33,19 @@ class Menu ]; array_push($this->items, $item); } + + /** + * Method to find the active links + * + * @param array $item Item that + * needs to be checked if active + * @return string + */ + public function getActive($item) + { + $url = trim($item['url'], '/'); + if ((strpos($this->current, $url) !== false) || (strpos($this->currentKey, $item['key']) === 0)) { + return 'active'; + } + } } diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php index e0ab2f04e..b3e9ca1b6 100644 --- a/packages/Webkul/Customer/src/Models/Customer.php +++ b/packages/Webkul/Customer/src/Models/Customer.php @@ -4,6 +4,7 @@ namespace Webkul\Customer\Models; use Illuminate\Notifications\Notifiable; use Illuminate\Foundation\Auth\User as Authenticatable; +use Webkul\Customer\Models\CustomersGroups; // use Webkul\User\Notifications\AdminResetPassword; @@ -15,9 +16,27 @@ class Customer extends Authenticatable use Notifiable; protected $table = 'customers'; + + protected $fillable = ['first_name', 'last_name', 'gender', 'date_of_birth','phone','email','password','customer_group_id','subscribed_to_news_letter']; + protected $hidden = ['password','remember_token']; + protected $with = ['customerGroup']; + + /** + * Get the customer full name. + */ public function getNameAttribute() { return ucfirst($this->first_name) . ' ' . ucfirst($this->last_name); } + + /** + * Get the customer group that owns the customer. + */ + public function customerGroup() + { + return $this->belongsTo(CustomersGroups::class); + } + + } diff --git a/packages/Webkul/Customer/src/Models/CustomersAddress.php b/packages/Webkul/Customer/src/Models/CustomersAddress.php index 600f26719..2e9ffbd2e 100644 --- a/packages/Webkul/Customer/src/Models/CustomersAddress.php +++ b/packages/Webkul/Customer/src/Models/CustomersAddress.php @@ -6,4 +6,6 @@ use Illuminate\Database\Eloquent\Model; class CustomersAddress extends Model { protected $table = 'customer_addresses'; + + protected $fillable = ['customer_id' ,'address1', 'address2', 'country', 'state', 'city', 'postcode']; } diff --git a/packages/Webkul/Customer/src/Providers/EventServiceProvider.php b/packages/Webkul/Customer/src/Providers/EventServiceProvider.php index fbf04f319..b322a94b0 100644 --- a/packages/Webkul/Customer/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/Customer/src/Providers/EventServiceProvider.php @@ -34,8 +34,17 @@ class EventServiceProvider extends ServiceProvider }); Event::listen('customer.menu.build', function ($menu) { - $menu->add('customer.account.profile', 'Profile'); - $menu->add('customer.account.profile', 'Wishlist'); + + $menu->add('customer.profile.index', 'Profile'); + + $menu->add('customer.orders.index', 'Orders'); + + $menu->add('customer.address.index', 'Address'); + + $menu->add('customer.reviews.index', 'Reviews'); + + $menu->add('customer.wishlist.index', 'Wishlist'); + }); } } diff --git a/packages/Webkul/Customer/src/Repositories/CustomerAddressRepository.php b/packages/Webkul/Customer/src/Repositories/CustomerAddressRepository.php new file mode 100644 index 000000000..621c91bae --- /dev/null +++ b/packages/Webkul/Customer/src/Repositories/CustomerAddressRepository.php @@ -0,0 +1,54 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + +class CustomerAddressRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + + function model() + { + return 'Webkul\Customer\Models\CustomersAddress'; + } + + /** + * @param array $data + * @return mixed + */ + + public function create(array $data) + { + $address = $this->model->create($data); + + return $address; + } + + /** + * @param array $data + * @param $id + * @param string $attribute + * @return mixed + */ + + public function update(array $data, $id, $attribute = "id") + { + $address = $this->findOneByField('customer_id', $id); + + $address->update($data); + + return $address; + } +} \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Repositories/CustomerGroupRepository.php b/packages/Webkul/Customer/src/Repositories/CustomerGroupRepository.php new file mode 100644 index 000000000..2aa6489df --- /dev/null +++ b/packages/Webkul/Customer/src/Repositories/CustomerGroupRepository.php @@ -0,0 +1,54 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + +class CustomerGroupRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + + function model() + { + return 'Webkul\Customer\Models\CustomersGroups'; + } + + /** + * @param array $data + * @return mixed + */ + + public function create(array $data) + { + $customer = $this->model->create($data); + + return $customer; + } + + /** + * @param array $data + * @param $id + * @param string $attribute + * @return mixed + */ + + public function update(array $data, $id, $attribute = "id") + { + $customer = $this->find($id); + + $customer->update($data); + + return $customer; + } +} \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Repositories/CustomerRepository.php b/packages/Webkul/Customer/src/Repositories/CustomerRepository.php new file mode 100644 index 000000000..c341fb4cb --- /dev/null +++ b/packages/Webkul/Customer/src/Repositories/CustomerRepository.php @@ -0,0 +1,54 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + +class CustomerRepository extends Repository +{ + /** + * Specify Model class name + * + * @return mixed + */ + + function model() + { + return 'Webkul\Customer\Models\Customer'; + } + + /** + * @param array $data + * @return mixed + */ + + public function create(array $data) + { + $customer = $this->model->create($data); + + return $customer; + } + + /** + * @param array $data + * @param $id + * @param string $attribute + * @return mixed + */ + + public function update(array $data, $id, $attribute = "id") + { + $customer = $this->find($id); + + $customer->update($data); + + return $customer; + } +} \ No newline at end of file diff --git a/packages/Webkul/Inventory/src/Providers/InventoryServiceProvider.php b/packages/Webkul/Inventory/src/Providers/InventoryServiceProvider.php index 7e9ba3899..208e63fee 100644 --- a/packages/Webkul/Inventory/src/Providers/InventoryServiceProvider.php +++ b/packages/Webkul/Inventory/src/Providers/InventoryServiceProvider.php @@ -5,6 +5,7 @@ namespace Webkul\Inventory\Providers; use Illuminate\Support\ServiceProvider; use Illuminate\Foundation\AliasLoader; use Illuminate\Routing\Router; +use Webkul\User\Http\Middleware\RedirectIfNotAdmin; class InventoryServiceProvider extends ServiceProvider { @@ -15,6 +16,8 @@ class InventoryServiceProvider extends ServiceProvider */ public function boot(Router $router) { + $router->aliasMiddleware('admin', RedirectIfNotAdmin::class); + $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); } diff --git a/packages/Webkul/Product/src/Http/Requests/ProductForm.php b/packages/Webkul/Product/src/Http/Requests/ProductForm.php index 812586f9d..b1b1ccb2c 100644 --- a/packages/Webkul/Product/src/Http/Requests/ProductForm.php +++ b/packages/Webkul/Product/src/Http/Requests/ProductForm.php @@ -85,10 +85,10 @@ class ProductForm extends FormRequest foreach ($attributes as $attribute) { if($attribute->code == 'sku') continue; - + if($product->type == 'configurable' && in_array($attribute->code, ['price', 'cost', 'special_price', 'special_price_from', 'special_price_to', 'width', 'height', 'depth', 'weight'])) continue; - + $validations = []; if($attribute->is_required) { array_push($validations, 'required'); diff --git a/packages/Webkul/Product/src/Models/Product.php b/packages/Webkul/Product/src/Models/Product.php index b0aa76fb2..77f876c58 100644 --- a/packages/Webkul/Product/src/Models/Product.php +++ b/packages/Webkul/Product/src/Models/Product.php @@ -121,7 +121,7 @@ class Product extends Model { return $this->belongsToMany(self::class, 'product_cross_sells'); } - + /** * @param string $key * @@ -155,7 +155,7 @@ class Product extends Model * @return mixed */ public function getAttribute($key) - { + { if (!method_exists(self::class, $key) && !in_array($key, ['parent_id', 'attribute_family_id']) && !isset($this->attributes[$key])) { if (isset($this->id) && $this->isCustomAttribute($key)) { $this->attributes[$key] = ''; @@ -242,5 +242,5 @@ class Product extends Model { return new \Webkul\Product\Database\Eloquent\Builder($query); } - + } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Models/ProductReview.php b/packages/Webkul/Product/src/Models/ProductReview.php index 99231a737..a6ed903ec 100644 --- a/packages/Webkul/Product/src/Models/ProductReview.php +++ b/packages/Webkul/Product/src/Models/ProductReview.php @@ -7,7 +7,7 @@ use Webkul\Customer\Models\Customer; class ProductReview extends Model { - protected $fillable = []; + protected $fillable = ['comment','title','rating','status','product_id','customer_id']; /** * Get the product attribute family that owns the product. diff --git a/packages/Webkul/Product/src/Product/Review.php b/packages/Webkul/Product/src/Product/Review.php index f9c60e3eb..3fc979da2 100644 --- a/packages/Webkul/Product/src/Product/Review.php +++ b/packages/Webkul/Product/src/Product/Review.php @@ -47,4 +47,61 @@ class Review extends AbstractProduct { return core()->formatDate($reviewCreatedAt, 'd, M Y'); } + + /** + * Returns the total rating of the product + * + * @param Product $product + * @return integer + */ + public function getTotalRating($product) + { + return $product->reviews()->where('status',1)->sum('rating'); + } + + /** + * Returns the Percentage rating of the product + * + * @param Product $product + * @return integer + */ + public function getPercentageRating($product) + { + $reviews['five'] = $product->reviews()->where('rating', 5)->where('status',1)->count(); + + $reviews['four'] = $product->reviews()->where('rating', 4)->where('status',1)->count(); + + $reviews['three'] = $product->reviews()->where('rating', 3)->where('status',1)->count(); + + $reviews['two'] = $product->reviews()->where('rating', 2)->where('status',1)->count(); + + $reviews['one'] = $product->reviews()->where('rating', 1)->where('status',1)->count(); + + foreach($reviews as $key=>$review){ + + if($this->getTotalReviews($product) == 0){ + $percentage[$key]=0; + }else{ + $percentage[$key] = round(($review/$this->getTotalReviews($product))*100); + } + } + + return $percentage; + } + + /** + * Returns the product accroding to paginate + * + * @param Product $product + * @return integer + */ + + public function loadMore($product) + { + $link = $_SERVER['PHP_SELF']; + $link_array = explode('/',$link); + $last=end($link_array); + $itemPerPage = $last*5; + return $product->reviews()->where('status',1)->paginate($itemPerPage); + } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index 1d4724303..9bbb48d87 100644 --- a/packages/Webkul/Product/src/Repositories/ProductRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -1,7 +1,7 @@ -productInventory->saveInventories($data, $product); - + $this->productImage->uploadImages($data, $product); return $product; @@ -322,7 +322,7 @@ class ProductRepository extends Repository 'channel' => $attribute->value_per_channel ? $data['channel'] : null, 'locale' => $attribute->value_per_locale ? $data['locale'] : null ]); - + if(!$attributeValue) { $this->attributeValue->create([ 'product_id' => $id, diff --git a/packages/Webkul/Shop/src/Resources/views/store/product/view/compare.blade.php b/packages/Webkul/Shipping/.gitignore similarity index 100% rename from packages/Webkul/Shop/src/Resources/views/store/product/view/compare.blade.php rename to packages/Webkul/Shipping/.gitignore diff --git a/packages/Webkul/Shipping/composer.json b/packages/Webkul/Shipping/composer.json new file mode 100644 index 000000000..7e3676e4f --- /dev/null +++ b/packages/Webkul/Shipping/composer.json @@ -0,0 +1,26 @@ +{ + "name": "webkul/laravel-shipping", + "description": "Shipping Package for Shipping Method", + "license": "MIT", + "authors": [ + { + "name": "rahulshukla-webkul", + "email": "rahulshukla.symfony517@webkul.com" + } + ], + "require": {}, + "autoload": { + "psr-4": { + "Webkul\\Shipping\\": "src/" + } + }, + "extra": { + "laravel": { + "providers": [ + "Webkul\\Cart\\Providers\\ShippingServiceProvider" + ], + "aliases": {} + } + }, + "minimum-stability": "dev" +} diff --git a/packages/Webkul/Shipping/src/Carrier/FlatRate.php b/packages/Webkul/Shipping/src/Carrier/FlatRate.php new file mode 100644 index 000000000..62d0d7593 --- /dev/null +++ b/packages/Webkul/Shipping/src/Carrier/FlatRate.php @@ -0,0 +1,23 @@ + + */ +abstract class AbstractShipping +{ + + abstract public function calculate(); + +} + + +?> \ No newline at end of file diff --git a/packages/Webkul/Shipping/src/Helper/Rate.php b/packages/Webkul/Shipping/src/Helper/Rate.php new file mode 100644 index 000000000..d500829df --- /dev/null +++ b/packages/Webkul/Shipping/src/Helper/Rate.php @@ -0,0 +1,31 @@ +calculate(); + $rates =[]; + + foreach($data as $rate){ + foreach($rate as $flat){ + $rates[$flat['name']] = $flat['price']; + } + } + + return $rates; + } + +} + + + + diff --git a/packages/Webkul/Shipping/src/Providers/ShippingServiceProvider.php b/packages/Webkul/Shipping/src/Providers/ShippingServiceProvider.php new file mode 100644 index 000000000..7dc88b160 --- /dev/null +++ b/packages/Webkul/Shipping/src/Providers/ShippingServiceProvider.php @@ -0,0 +1,37 @@ +aliasMiddleware('customer', RedirectIfNotCustomer::class); + + // $this->loadMigrationsFrom(__DIR__ . '/../Database/migrations'); + + // include __DIR__ . '/../Http/routes.php'; + + // $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'shipping'); + } + + /** + * Register services. + * + * @return void + */ + public function register() + { + + } +} diff --git a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php index 10a2d086d..8547cf847 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php @@ -31,8 +31,8 @@ use Webkul\Channel\Channel as Channel; $current_channel = core()->getCurrentChannel(); - $all_sliders = $this->sliders->findOneWhere(['channel_id'=>$current_channel['id']]); + $all_sliders = $this->sliders->findWhere(['channel_id'=>$current_channel['id']]); - return view($this->_config['view'])->with('data',$all_sliders); + return view($this->_config['view'])->with('sliderData',$all_sliders->toArray()); } } diff --git a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php index 68d85afab..f6f6fb26a 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php @@ -56,14 +56,11 @@ class ReviewController extends Controller /** * Display a listing of the resource. * - * @param string $slug * @return \Illuminate\Http\Response - */ - public function index($slug) + */ + public function index() { - $product = $this->product->findBySlugOrFail($slug); - - return view($this->_config['view'], compact('product')); + return view($this->_config['view']); } /** @@ -85,16 +82,69 @@ class ReviewController extends Controller * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ - public function store(Request $request) + public function store(Request $request , $id) { $this->validate(request(), [ - 'name' => 'required', + 'comment' => 'required', + 'rating' => 'required', + 'title' => 'required', ]); - $this->productReview->create(request()->all()); + $data=$request->all(); + + $customer_id = auth()->guard('customer')->user()->id; + + $data['status']=0; + $data['product_id']=$id; + $data['customer_id']=$customer_id; + + $this->productReview->create($data); session()->flash('success', 'Review submitted successfully.'); + return redirect()->route($this->_config['redirect']); + } + + /** + * Display reviews accroding to product. + * + * @param string $slug + * @return \Illuminate\Http\Response + */ + public function show($slug) + { + $product = $this->product->findBySlugOrFail($slug); + + return view($this->_config['view'],compact('product')); + } + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function edit($id) + { + $review = $this->productReview->find($id); + + return view($this->_config['view'],compact('review')); + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $id) + { + + $this->productReview->update(request()->all(), $id); + + session()->flash('success', 'Review updated successfully.'); + return redirect()->route($this->_config['redirect']); } } diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index 846bf14c7..bbd99dd80 100644 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -4,11 +4,18 @@ Route::group(['middleware' => ['web']], function () { Route::get('/', 'Webkul\Shop\Http\Controllers\HomeController@index')->defaults('_config', [ 'view' => 'shop::home.index' - ]); + ])->name('store.home'); Route::get('/categories/{slug}', 'Webkul\Shop\Http\Controllers\CategoryController@index')->defaults('_config', [ 'view' => 'shop::products.index' - ])->name('shop.categories.index'); + ]); + + Route::get('/checkout', 'Webkul\Cart\Http\Controllers\CheckoutController@index')->defaults('_config', [ + 'view' => 'shop::customers.checkout.index' + ])->name('shop.checkout'); + + /* dummy routes ends here */ + Route::get('/products/{slug}', 'Webkul\Shop\Http\Controllers\ProductController@index')->defaults('_config', [ 'view' => 'shop::products.view' @@ -16,23 +23,30 @@ Route::group(['middleware' => ['web']], function () { // Product Review routes - Route::get('/reviews/{slug}', 'Webkul\Shop\Http\Controllers\ReviewController@index')->defaults('_config', [ + Route::get('/reviews/{slug}/{id}', 'Webkul\Shop\Http\Controllers\ReviewController@show')->defaults('_config', [ 'view' => 'shop::products.reviews.index' ])->name('shop.reviews.index'); - Route::get('/reviews/create/{slug}', 'Webkul\Shop\Http\Controllers\ReviewController@create')->defaults('_config', [ + Route::get('/product/{slug}/review', 'Webkul\Shop\Http\Controllers\ReviewController@create')->defaults('_config', [ 'view' => 'shop::products.reviews.create' ])->name('shop.reviews.create'); + Route::post('/product/{slug}/review', 'Webkul\Shop\Http\Controllers\ReviewController@store')->defaults('_config', [ + 'redirect' => 'shop.reviews.index' + ])->name('shop.reviews.store'); + Route::post('/reviews/create/{slug}', 'Webkul\Shop\Http\Controllers\ReviewController@store')->defaults('_config', [ 'redirect' => 'admin.reviews.index' ])->name('admin.reviews.store'); + // Route::post('/reviews/create/{slug}', 'Webkul\Core\Http\Controllers\ReviewController@store')->defaults('_config', [ + // 'redirect' => 'admin.reviews.index' + // ])->name('admin.reviews.store'); + + // Route::view('/products/{slug}', 'shop::store.product.details.index'); Route::view('/cart', 'shop::store.product.view.cart.index'); - // Route::view('/products/{slug}', 'shop::products.view'); - //customer routes starts here Route::prefix('customer')->group(function () { @@ -42,7 +56,7 @@ Route::group(['middleware' => ['web']], function () { ])->name('customer.session.index'); Route::post('login', 'Webkul\Customer\Http\Controllers\SessionController@create')->defaults('_config', [ - 'redirect' => 'customer.account.profile' + 'redirect' => 'customer.account.index' ])->name('customer.session.create'); @@ -52,7 +66,7 @@ Route::group(['middleware' => ['web']], function () { ])->name('customer.register.index'); Route::post('register', 'Webkul\Customer\Http\Controllers\RegistrationController@create')->defaults('_config', [ - 'redirect' => 'customer.account.profile', + 'redirect' => 'customer.account.index', ])->name('customer.register.create'); //redirect attribute will get changed immediately to account.index when account's index page will be made // Auth Routes @@ -63,16 +77,77 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'customer.session.index' ])->name('customer.session.destroy'); + Route::view('/cart', 'shop::store.product.cart.cart.index')->name('customer.cart'); + + Route::view('/product', 'shop::store.product.details.home.index')->name('customer.product'); + + Route::view('/product/review', 'shop::store.product.review.index')->name('customer.product.review'); + //customer account Route::prefix('account')->group(function () { - Route::get('profile', 'Webkul\Customer\Http\Controllers\CustomerController@profile')->defaults('_config', [ + + Route::get('index', 'Webkul\Customer\Http\Controllers\AccountController@index')->defaults('_config', [ + 'view' => 'shop::customers.account.index' + ])->name('customer.account.index'); + + + /* Profile Routes Starts Here */ + Route::get('profile', 'Webkul\Customer\Http\Controllers\CustomerController@index')->defaults('_config', [ 'view' => 'shop::customers.account.profile.index' - ])->name('customer.account.profile'); + ])->name('customer.profile.index'); //profile edit - Route::get('profile/edit', 'Webkul\Customer\Http\Controllers\CustomerController@editProfile')->defaults('_config', [ + Route::get('profile/edit', 'Webkul\Customer\Http\Controllers\CustomerController@editIndex')->defaults('_config', [ 'view' => 'shop::customers.account.profile.edit' ])->name('customer.profile.edit'); + + Route::post('profile/edit', 'Webkul\Customer\Http\Controllers\CustomerController@edit')->defaults('_config', [ + 'view' => 'shop::customers.account.profile.edit' + ])->name('customer.profile.edit'); + + /* Profile Routes Ends Here */ + + + /* Routes for Addresses */ + + Route::get('address/index', 'Webkul\Customer\Http\Controllers\AddressController@index')->defaults('_config', [ + 'view' => 'shop::customers.account.address.address' + ])->name('customer.address.index'); + + Route::get('address/create', 'Webkul\Customer\Http\Controllers\AddressController@show')->defaults('_config', [ + 'view' => 'shop::customers.account.address.create' + ])->name('customer.address.create'); + + Route::post('address/create', 'Webkul\Customer\Http\Controllers\AddressController@create')->defaults('_config', [ + 'view' => 'shop::customers.account.address.address', + 'redirect' => 'customer.address.index' + ])->name('customer.address.create'); + + Route::get('address/edit', 'Webkul\Customer\Http\Controllers\AddressController@showEdit')->defaults('_config', [ + 'view' => 'shop::customers.account.address.edit' + ])->name('customer.address.edit'); + + Route::post('address/edit', 'Webkul\Customer\Http\Controllers\AddressController@edit')->defaults('_config', [ + 'view' => 'shop::customers.account.address.address' + ])->name('customer.address.edit'); + + /* Routes for Addresses ends here */ + + /* Wishlist route */ + Route::get('wishlist', 'Webkul\Customer\Http\Controllers\WishlistController@wishlist')->defaults('_config', [ + 'view' => 'shop::customers.account.wishlist.wishlist' + ])->name('customer.wishlist.index'); + + /* Orders route */ + Route::get('orders', 'Webkul\Customer\Http\Controllers\OrdersController@orders')->defaults('_config', [ + 'view' => 'shop::customers.account.orders.orders' + ])->name('customer.orders.index'); + + /* Reviews route */ + Route::get('reviews', 'Webkul\Customer\Http\Controllers\CustomerController@reviews')->defaults('_config', [ + 'view' => 'shop::customers.account.reviews.reviews' + ])->name('customer.reviews.index'); + }); }); }); diff --git a/packages/Webkul/Shop/src/Providers/EventServiceProvider.php b/packages/Webkul/Shop/src/Providers/EventServiceProvider.php deleted file mode 100644 index c7d186ceb..000000000 --- a/packages/Webkul/Shop/src/Providers/EventServiceProvider.php +++ /dev/null @@ -1,41 +0,0 @@ -createStoreNavigationMenu(); - } - - /** - * This method fires an event for menu creation, any package can add their menu item by listening to the customer.menu.build event - * - * @return void - */ - - public function createStoreNavigationMenu() - { - Event::listen('shop.navmenu.create', function () { - return Menu::create(function ($menu) { - Event::fire('shop.navmenu.build', $menu); - }); - }); - - Event::listen('shop.navmenu.build', function ($menu) { - $menu->add('customer.account.profile', 'Profile'); - $menu->add('customer.account.profile', 'Wishlist'); - }); - } -} diff --git a/packages/Webkul/Shop/src/Resources/assets/images/Icon-Graph-Green.svg b/packages/Webkul/Shop/src/Resources/assets/images/Icon-Graph-Green.svg new file mode 100644 index 000000000..ba589b67d --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/Icon-Graph-Green.svg @@ -0,0 +1,14 @@ + + + + Icon-Graph-Green + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/images/Logo.svg b/packages/Webkul/Shop/src/Resources/assets/images/Logo.svg new file mode 100644 index 000000000..bf61fdad9 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/Logo.svg @@ -0,0 +1,13 @@ + + + + Logo + Created with Sketch. + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/images/address.svg b/packages/Webkul/Shop/src/Resources/assets/images/address.svg new file mode 100644 index 000000000..fd3feea32 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/address.svg @@ -0,0 +1,11 @@ + + + + tab/heading/icon/address + Created with Sketch. + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/images/complete.svg b/packages/Webkul/Shop/src/Resources/assets/images/complete.svg new file mode 100644 index 000000000..afb6aa2d8 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/complete.svg @@ -0,0 +1,13 @@ + + + + tab/heading/icon/complete + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/images/finish.svg b/packages/Webkul/Shop/src/Resources/assets/images/finish.svg new file mode 100644 index 000000000..2401834e4 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/finish.svg @@ -0,0 +1,20 @@ + + + + tab/heading/icon/finish + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/images/icon-menu-back.svg b/packages/Webkul/Shop/src/Resources/assets/images/icon-menu-back.svg new file mode 100644 index 000000000..25bd3c717 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/icon-menu-back.svg @@ -0,0 +1,13 @@ + + + + icon-menu-back + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/images/payment.svg b/packages/Webkul/Shop/src/Resources/assets/images/payment.svg new file mode 100644 index 000000000..32d40e2bf --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/payment.svg @@ -0,0 +1,13 @@ + + + + tab/heading/icon/payment + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/images/selected.svg b/packages/Webkul/Shop/src/Resources/assets/images/selected.svg new file mode 100644 index 000000000..ee452e928 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/selected.svg @@ -0,0 +1,11 @@ + + + + radio/selected + Created with Sketch. + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/images/shipping.svg b/packages/Webkul/Shop/src/Resources/assets/images/shipping.svg new file mode 100644 index 000000000..811d9dba2 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/shipping.svg @@ -0,0 +1,15 @@ + + + + tab/heading/icon/shipping + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/images/unselected.svg b/packages/Webkul/Shop/src/Resources/assets/images/unselected.svg new file mode 100644 index 000000000..1040c9d5e --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/unselected.svg @@ -0,0 +1,10 @@ + + + + radio/unselected + Created with Sketch. + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/js/app.js b/packages/Webkul/Shop/src/Resources/assets/js/app.js index abf46b3f1..320d65719 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/app.js +++ b/packages/Webkul/Shop/src/Resources/assets/js/app.js @@ -4,8 +4,6 @@ window.VeeValidate = require("vee-validate"); Vue.use(VeeValidate); -//pure JS for resizing of browser purposes only - Vue.component("category-nav", require("./components/category-nav.vue")); Vue.component("category-item", require("./components/category-item.vue")); Vue.component("image-slider", require("./components/image-slider.vue")); diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue index e072840f4..4ff3508ad 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue +++ b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue @@ -1,6 +1,6 @@