392 Commits

Author	SHA1	Message	Date
Prashant Singh	b3bf66c6e2	Base sync with master	2019-04-09 12:53:31 +05:30
Prashant Singh	75ef9cd530	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-04-09 12:50:09 +05:30
Prashant Singh	6a4cb016c4	fixed issue #750	2019-04-09 06:31:52 +05:30
rahul shukla	4bd89950ce	change update & delete query in controller & comment added	2019-04-08 16:48:43 +05:30
Prashant Singh	747f214739	fix in progress for get routes performing actions more than redirect	2019-04-08 04:51:02 +05:30
Jitendra Singh	d0e5e6a88f	Merge pull request #786 from imanghafoori1/flatten_code ... Flatten code	2019-04-03 14:49:06 +05:30
Iman	759782c735	fix doc blocks (#787)	2019-04-03 12:34:35 +05:30
imanghafoori	14cd4eb97e	flatten code	2019-04-02 21:50:44 +03:30
imanghafoori	a84b81f446	flatten code	2019-04-01 18:39:15 +03:30
imanghafoori	1a4c040894	remove unused code	2019-04-01 18:38:18 +03:30
Prashant Singh	5fc85dffe4	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-03-14 11:01:04 +05:30
rahul shukla	281567456b	product linking completed	2019-03-13 10:33:43 +05:30
rahul shukla	3bb197c75a	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-03-13 09:38:36 +05:30
rahul shukla	9b82321d4f	change in related products	2019-03-12 21:05:10 +05:30
Prashant Singh	c9c5208693	Updated the list of exportable grids	2019-03-12 12:19:28 +05:30
Prashant Singh	9578f7609b	export functionality refactored	2019-03-12 12:13:48 +05:30
Prashant Singh	9eb1deb3fa	Datagrid export functionality refactoring	2019-03-12 11:07:12 +05:30
Prashant Singh	238c248852	Filterable checks implemented in datagrid	2019-03-11 19:36:15 +05:30
Prashant Singh	f68c4e482c	Fixed bug #575	2019-02-15 09:51:38 +05:30
rahul shukla	e4bdf11a7d	lang added	2019-02-13 17:42:07 +05:30
rahul shukla	15ae803407	merge with master	2019-02-11 17:18:06 +05:30
jitendra	7bfb216bb0	Dashboard sql issue fixed	2019-02-11 15:13:38 +05:30
rahul shukla	fdcf420af9	import for tax rate	2019-02-08 16:53:48 +05:30
JItendra Singh	2d99b565b1	Merge pull request #509 from rahulshukla-webkul/development ... configuration changes	2019-02-01 16:48:25 +05:30
jitendra	2d1a816349	Issue #514 fixed	2019-02-01 12:19:30 +05:30
rahul shukla	41d3f74fc1	configuration changes	2019-01-31 17:04:32 +05:30
rahul shukla	ee91d69361	configuration changes	2019-01-31 15:18:36 +05:30
rahul shukla	2f8178afc0	file & image field for configuration	2019-01-30 21:25:38 +05:30
rahul shukla	9c934d8e8d	issues #401	2019-01-28 15:04:45 +05:30
Prashant Singh	3289ab8a4a	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-01-21 12:39:36 +05:30
Prashant Singh	9eeaee1c66	migration changes in the product flat table	2019-01-19 15:35:12 +05:30
Prashant Singh	50a0a71196	product flat column creation and deletion on the basis of attributes	2019-01-18 17:36:58 +05:30
JItendra Singh	63f141e3bd	Merge pull request #472 from jitendra-webkul/jitendra ... Issues fixed	2019-01-18 16:41:22 +05:30
jitendra	fbbf1fe99f	Issues fixed	2019-01-18 16:40:40 +05:30
rahul shukla	d50bb3e962	configuration message	2019-01-17 20:22:01 +05:30
rahul shukla	e018d6555f	export issue	2019-01-17 15:17:44 +05:30
rahul shukla	8c32a21521	export changes	2019-01-16 16:43:36 +05:30
rahul shukla	4747f8fb59	customer design fixex	2019-01-16 14:08:39 +05:30
jitendra	aae6593469	Coding standard updated	2019-01-15 17:24:41 +05:30
Prashant Singh	6e966384e5	Disabled customer email verfication and removed the phone field from the customer model	2019-01-15 13:03:41 +05:30
jitendra	9c1612d0ab	Assets compiled for production	2019-01-11 15:31:10 +05:30
jitendra	f1371fd6a0	Product inventory management updated	2019-01-11 14:51:20 +05:30
Prashant Singh	a4485e2191	merged with master	2019-01-10 11:54:17 +05:30
Prashant Singh	926158cc0d	datagrid refactored from backend to frontend, remaining is filters, sorts and searches to be refactored into vue components	2019-01-07 13:37:35 +05:30
rahul shukla	33ac4c1319	multiselect for configuration	2019-01-04 11:13:24 +05:30
rahul shukla	0bf6699746	issues fixes #320 #288 #309	2019-01-02 20:12:49 +05:30
rahul shukla	29ab4f1da9	merge with master	2018-12-31 18:51:42 +05:30
rahul shukla	96b7f05c23	bagisto installer , #399 #400 #382 #301 #344 #214 #359 #223 #138 issue fixed	2018-12-31 17:27:32 +05:30
jitendra	0b3ba4f06a	Modified inventory selection during shipment creation	2018-12-26 18:34:49 +05:30
jitendra	2e668c7020	Inventory source selection feature added during shipment creation	2018-12-26 15:30:23 +05:30
rahul shukla	95161d9101	changes in config	2018-12-26 14:59:52 +05:30
rahul shukla	1e25226997	Merge branch 'master' of https://github.com/bagisto/bagisto into rahul	2018-12-26 14:47:50 +05:30
rahul shukla	9bb9ae5ce7	configuration changes	2018-12-26 14:46:27 +05:30
Prashant Singh	affcca3d08	fixed issue #304	2018-12-22 16:12:42 +05:30
jitendra	5916482f7c	Add fire event on every controller	2018-12-21 18:18:34 +05:30
rahul shukla	ef72b4d629	export button & review	2018-12-20 16:38:47 +05:30
jitendra	c943fa3603	Compile assets from production	2018-12-19 15:05:23 +05:30
jitendra	0cf2fc4baf	Issues fixed	2018-12-19 15:00:40 +05:30
prashant-webkul	dfb4e5f210	subscription exception issue #337 fixed	2018-12-19 14:57:44 +05:30
prashant-webkul	3c8807e7e9	merge conflicts removed	2018-12-18 18:17:01 +05:30
jitendra	40fafca930	Configuration redirect to first config page fixed	2018-12-18 13:41:25 +05:30
rahul shukla	9cdc16a50b	conflict resolve	2018-12-18 13:39:15 +05:30
prashant-webkul	c4416bc228	Removed conflicts from the merge with the master	2018-12-18 11:09:54 +05:30
rahul shukla	e3e80dde1e	#305 & #298	2018-12-14 17:36:49 +05:30
rahul shukla	b298a3973a	validation in shipping & payment methods and issue #308 & #295	2018-12-14 15:26:01 +05:30
jitendra	9a699a64e5	Modified config creation	2018-12-14 15:02:59 +05:30
rahul shukla	8cd04be89c	shipping & payment methods	2018-12-14 11:56:52 +05:30
prashant-webkul	d9f0ddc89d	Fixed issues 314 and 315	2018-12-13 18:51:54 +05:30
jitendra	0bdd9e1a2a	Refactor Menu system and core config data system	2018-12-13 16:28:28 +05:30
prashant-webkul	1e05840c7d	Regular merge with master	2018-12-07 15:44:03 +05:30
prashant-webkul	45903d3c0a	Mass selection features refactored with a new type of configuration with dynamic routes and implemented mass selection features in reviews, products, currencies and attributes	2018-12-07 14:45:31 +05:30
jitendra	3515adeb03	Refactor core config system	2018-12-07 12:35:34 +05:30
rahul shukla	b78cc23797	shipping methods #204 popup confirmation for address delete #228 bagisto icon clickable #183 currency rate display & #128 calender clickable	2018-12-07 10:55:33 +05:30
rahul shukla	4201a1ec48	export completed	2018-12-04 11:52:01 +05:30
rahul shukla	bd1489dac6	export	2018-12-04 10:07:57 +05:30
rahul shukla	27f5e1d93d	export	2018-12-04 09:53:52 +05:30
prashant-webkul	40f37cddd4	customer group add and delete fixes	2018-12-03 18:58:57 +05:30
prashant-webkul	5d42bebbf1	Customer group delete bug fix	2018-12-03 18:50:20 +05:30
prashant-webkul	48bece3531	datagrid routes are dynamic for all the action types and mass actions also only two type of mass actions are used as of now single button type and select box type for updating boolean columns or may be incement or decrement in the numeric type columns, while there had a new icon for the orders, invoices and shipments datagrid and minor style bug fix on sales index screens, confirm text is not mandatory when clicking on actions now it can be disabled by commenting on the confirm_text in datagrid configurations, mass actions are also route dependent and can be enabled or disabled on specific grids also.	2018-12-03 13:41:35 +05:30
prashant-webkul	552bf4b1f9	Merge branch 'master' of https://github.com/bagisto/bagisto into prashant	2018-11-30 20:38:15 +05:30
prashant-webkul	7fb67dc161	mass operations and datagrid operations normalization	2018-11-30 20:37:41 +05:30
jitendra	4e8081ed58	Issue #247 (Displaying wrong number of products and sales in category, on dashboard)	2018-11-30 12:15:10 +05:30
rahul shukla	984ff18267	merge with master	2018-11-29 18:13:45 +05:30
rahul shukla	bb310cd5c7	route change	2018-11-29 18:07:58 +05:30
prashant-webkul	5f81a79796	Subscription newsletter migration restored and subsctiption newsletter datagrid in admin	2018-11-29 18:05:56 +05:30
rahul shukla	e1b2d1eb01	export for customer	2018-11-29 17:39:39 +05:30
rahul shukla	41aae38b14	view all & customer name	2018-11-29 12:12:44 +05:30
JItendra Singh	c8acd1823d	Merge pull request #205 from bagisto/prashant ... migration fixes for product grid and fixes in slider data grid and ta…	2018-11-28 16:15:31 +05:30
prashant-webkul	217c94d76b	migration fixes for product grid and fixes in slider data grid and tax categories datagrid	2018-11-28 16:10:48 +05:30
jitendra	230acb8b32	Issue #188 fixed (Customer group delete issue)	2018-11-28 12:41:17 +05:30
jitendra	a9ef1269c3	Dashboard progress issues fixed	2018-11-27 10:53:47 +05:30
jitendra	fb0079bf42	Fixed validation error messages	2018-11-27 10:16:35 +05:30
prashant-webkul	662ff09a24	Bug Fixes	2018-11-21 11:59:18 +05:30
jitendra	b182325772	Customer address form issues fixed, invoice print feature addred	2018-11-01 19:18:59 +05:30
prashant-webkul	13e56c1930	Merge branch 'master' of https://github.com/bagisto/bagisto into prashant	2018-10-30 11:59:48 +05:30
jitendra	97c7ca84c6	Dashboard issue fixed	2018-10-30 11:58:15 +05:30
prashant-webkul	2514d748b5	Slider Content Bug Fixed	2018-10-28 18:53:20 +05:30
prashant-webkul	7a157ee17d	Slider Backend Fixed	2018-10-28 16:30:15 +05:30
rahul shukla	d9f4f73a58	conflict	2018-10-26 12:53:37 +05:30
jitendra	7c63dac032	Fixed remaining issues	2018-10-26 09:50:43 +05:30
jitendra	930cba9436	Issues fixed	2018-10-25 13:16:45 +05:30
jitendra	0f6bcfde49	Seeders added	2018-10-25 11:01:47 +05:30
rahul shukla	de0ea34e8a	conflict resolve	2018-10-23 17:24:27 +05:30
prashant-webkul	2c32f510b2	merged with master	2018-10-23 17:19:13 +05:30
JItendra Singh	56e8597c6f	Merge pull request #68 from bagisto/jitendra ... Dashboard completed	2018-10-23 17:16:22 +05:30
prashant-webkul	96b40bf2c3	Products DataGrid	2018-10-23 17:16:00 +05:30
jitendra	13ae5d58c0	Dashboard completed	2018-10-23 17:15:44 +05:30
prashant-webkul	5016e03b1c	Products datagrid mechanism is normailized to single table due to greate overhead in fetching total attributes for products.	2018-10-22 18:48:46 +05:30
rahul shukla	399ba55982	Merge branch 'master' of https://github.com/bagisto/bagisto into rahul	2018-10-22 11:18:29 +05:30
rahul shukla	5dc60d0fe1	customer group	2018-10-22 11:17:42 +05:30
JItendra Singh	6c0dfa6a96	Merge pull request #65 from bagisto/jitendra ... Front currency switcher, currency edit page and locale edit page added	2018-10-18 13:49:45 +05:30
jitendra	12d68fcb57	Front currency switcher, currency edit page and locale edit page added	2018-10-18 13:49:03 +05:30
rahul shukla	bd752c7e3e	conflict	2018-10-18 12:55:00 +05:30
JItendra Singh	14140d647a	Merge pull request #64 from bagisto/jitendra ... user on 404 page fixed	2018-10-18 11:55:13 +05:30
jitendra	258262935a	user on 404 page fixed	2018-10-18 11:54:36 +05:30
rahul shukla	b5be4cf320	Merge branch 'master' of https://github.com/bagisto/bagisto into rahul	2018-10-18 10:33:45 +05:30
rahul shukla	dde2a626e6	laoder changes	2018-10-18 10:33:00 +05:30
prashant-webkul	3a1029290f	Merge branch 'master' of https://github.com/bagisto/bagisto into prashant	2018-10-17 19:50:55 +05:30
prashant-webkul	8c7626b2b2	before merge	2018-10-17 19:50:25 +05:30
jitendra	b02d87626a	Get current channel code updated	2018-10-17 19:27:51 +05:30
prashant-webkul	84bc6c0c60	merged	2018-10-17 16:17:46 +05:30
jitendra	9756480f42	Theme issue fixed	2018-10-17 16:17:03 +05:30
prashant-webkul	11e7db8f85	Before merge with masteer	2018-10-17 16:03:57 +05:30
jitendra	b0a12d85a3	COnflict resloved	2018-10-17 16:03:25 +05:30
jitendra	faab00c3b8	Bug fixed	2018-10-17 16:00:31 +05:30
rahul shukla	b329567370	conflict	2018-10-17 15:14:22 +05:30
rahul shukla	8009b5c647	error & loader	2018-10-17 13:10:08 +05:30
jitendra	d3b73f517c	Sales email templates added	2018-10-17 12:51:47 +05:30
rahul shukla	ec03cbd63e	conflict resolve	2018-10-15 16:16:50 +05:30
jitendra	7f1675e37c	Order cancel implemented	2018-10-15 16:09:09 +05:30
rahul shukla	5cc562d972	reviews	2018-10-15 14:32:26 +05:30
rahul shukla	ba2ad4bd28	customer fixes	2018-10-15 10:22:00 +05:30
jitendra	1e16931ba3	Countries and States models added	2018-10-12 18:24:10 +05:30
prashant-webkul	f28f716d9f	Bug fixes across the system	2018-10-11 19:55:59 +05:30
jitendra	d00bb078a1	Shipment and invoice creation completed	2018-10-09 17:32:22 +05:30
rahul shukla	ac39fca00e	responsive	2018-09-22 15:42:23 +05:30
rahul shukla	335f27e1f6	review issues	2018-09-21 19:13:41 +05:30
rahul shukla	b082d73707	customer edit/add & show in admin	2018-09-11 09:41:48 +05:30
rahul shukla	d0e0b64445	merge conflict	2018-09-08 14:22:46 +05:30
rahul shukla	149c98ff03	customer & review	2018-09-08 14:11:36 +05:30
prashant-webkul	4cf6ab5f00	Tax Module Completed with just edit form left.	2018-09-04 14:44:32 +05:30
prashant-webkul	df199f0728	Taxes, long intended routes, ACL now prevents login if user already logged in.	2018-08-31 11:33:11 +05:30
rahul shukla	23653a7922	conflict resolve	2018-08-30 18:05:43 +05:30
jitendra	86b7971b61	Customer Profile issues fixed	2018-08-22 12:57:41 +05:30
prashant-webkul	36a05a4bcd	Customer routes now tranferred in master route table for packages, removed display bug from navigation menu and removed the item from the root parent of navigation menu in storefront	2018-08-22 10:41:48 +05:30
prashant-webkul	eaf721f062	merging with master	2018-08-21 16:35:43 +05:30
jitendra	7e95b89ec8	For demo	2018-08-21 16:28:55 +05:30
prashant-webkul	21a16b8cf0	Refactored the code for datagrid from view composers to selft dependent injection classes and storefront views directory structure is segregated.	2018-08-16 11:35:45 +05:30
prashant-webkul	73d044a4f9	Sliders grid now joined with channels	2018-08-09 10:05:32 +05:30
prashant-webkul	8406da969d	Slider layers now working, datagrid on slider working	2018-08-08 19:17:40 +05:30
prashant-webkul	3fa134ca16	Datagrid Integration in Settings done.	2018-08-08 15:07:04 +05:30
prashant-webkul	2c90d713af	Datagrid working without dots in the URL, next is to put the validation for valid aliasing if aliasing is used and set true	2018-08-08 11:03:23 +05:30
prashant-webkul	7ddcba62f9	Datagrid fallback to new URL format	2018-08-07 18:57:59 +05:30
prashant-webkul	6b54f4d526	pagination working, non aliasing bugs removed, datagrid working good	2018-08-06 19:51:11 +05:30
prashant-webkul	2f3b0179d6	Non aliased case bug removed	2018-08-06 17:11:20 +05:30
prashant-webkul	ce1a3ebad6	Bug fixes and UI touchups in DataGrid	2018-08-06 15:21:24 +05:30
prashant-webkul	7c5253aec2	Slider Configuration in works ready to save slider images in next commit	2018-08-03 20:20:13 +05:30
prashant-webkul	7a7cacf515	fixes and style changes	2018-08-02 20:28:12 +05:30
prashant-webkul	ec8fdeca6f	data grid empty values in filters redirecting to exception is now fixed.	2018-08-02 12:59:54 +05:30
prashant-webkul	42848e7476	Category Navigation in the store front done with few style touch ups left	2018-08-01 11:52:13 +05:30
jitendra	71fd4a6237	Product page	2018-08-01 11:41:33 +05:30
jitendra	f236da61ab	Added Repository Pattern to User	2018-07-31 13:20:54 +05:30
prashant-webkul	9de89a319d	Implemented the category composer for header in shop bundle and removed some bugs	2018-07-30 19:51:06 +05:30
prashant-webkul	86a5cb93dd	data grid bugs fixed	2018-07-27 12:20:25 +05:30
jitendra	5f7c432dc5	Channel and families completed	2018-07-27 11:52:12 +05:30
prashant-webkul	586b1d9779	Data Grid bugs removed	2018-07-25 19:42:35 +05:30
prashant-webkul	fb1f042597	fixing modified changes	2018-07-24 20:12:36 +05:30
jitendra	3a7ab61082	Currency, Exchange Rate completed	2018-07-24 16:41:32 +05:30
prashant-webkul	e4581fc725	Mass actions working and created structure for customer package and removed some bugs from data grid and home page and made layouts for sign in and sign up package of customers and made the customer guard for customer also with model named customer	2018-07-20 20:37:16 +05:30
prashant-webkul	6da3b5bc83	Data Grid Complete, looking for issues and bugs now	2018-07-20 14:18:42 +05:30
Prashant Singh	b596eb1d1b	more fixes on datagrid	2018-07-19 08:12:10 +05:30
Prashant Singh	efa1e8b716	making and removing of filter tags is now working	2018-07-19 06:32:39 +05:30
prashant-webkul	54a36819a6	Data grid front implemented with columns and filters, last part of url encoder and decoder and sort ui events are remaining	2018-07-17 19:02:45 +05:30
jitendra	c87f71427a	Attribute Family Feature Added	2018-07-17 18:58:34 +05:30
prashant-webkul	74d1c3b3ea	On the half way for UI part of the datagrid and only decode and encode of url is remaining	2018-07-16 14:34:03 +05:30
prashant-webkul	49583162f5	Grid now tested with joins also but some results with same column names are giving ambigous results	2018-07-16 10:32:20 +05:30
prashant-webkul	84e33e808e	Case of aliasing on the columns is left to me made and tested else the filters are working properly with changed format for query string	2018-07-14 14:30:20 +05:30
prashant-webkul	82b0c3d3e0	Now fix aliasing and do solve all cases for alias validation also	2018-07-13 18:54:50 +05:30
prashant-webkul	9e0cf41e0c	Datagrid format for url and filter by url query has changed and it is working decently	2018-07-13 18:18:59 +05:30
prashant-webkul	636062c481	Resolve the bugs left in filtering when join or without join aliasing is used	2018-07-12 13:51:32 +05:30
prashant-webkul	6e20306fbd	storefront and datagrid	2018-07-12 12:53:31 +05:30
prashant-webkul	8e959dcbe1	Datagrid, storefront	2018-07-12 12:42:48 +05:30
jitendra	89a0a8a8d2	Attribute Package Added	2018-07-11 11:16:07 +05:30
jitendra	ad3ff8d3f6	Attribute Package Added	2018-07-11 11:13:56 +05:30
jitendra	30a5784d75	Attribute Package Added	2018-07-11 11:11:27 +05:30
Nikhil	ea7cffc2bc	Merge branch 'master' into nikhil	2018-07-06 15:20:34 +05:30
nikhil	eb39d93241	datagird	2018-07-06 15:17:29 +05:30
jitendra	97b1cf0d0e	Role Creation and Tree Vue Component Comnpleted	2018-07-05 13:28:26 +05:30
jitendra	79d303f54d	Added User Role Feature	2018-07-02 14:59:27 +05:30
jitendra	c9c090ea2b	Flash Vue Component added	2018-06-26 18:25:09 +05:30
jitendra	a0b1c524c9	UI package added	2018-06-25 16:30:42 +05:30
jitendra	0470cb7ece	Project skeleton added	2018-06-20 10:36:27 +05:30