1358 Commits

Author	SHA1	Message	Date
shivam kumar	fd8a1fb851	#1182 fixed	2019-10-18 18:43:38 +05:30
rahul shukla	859cd04660	compile all assest	2019-10-18 18:21:12 +05:30
Jitendra Singh	65d9c0b283	Merge pull request #1652 from vivek-webkul/patch-5 ... [Enhancement #737: Fields added to the customer DataGrid and customer…	2019-10-18 17:42:07 +05:30
Jitendra Singh	ce2a9742a4	Merge pull request #1646 from vivek-webkul/patch-3 ... [Bug Fixed #1555: order refund export related issue resolved.]	2019-10-18 17:40:30 +05:30
Vivek	5b6ce4a6ab	[Enhancement #1232 : Added option for showing records per page in configuration.]	2019-10-18 17:07:57 +05:30
Vivek	6989513c62	[Added: phone and gender columns in filter.]	2019-10-18 13:31:56 +05:30
Vivek	f8767adc0d	[Enhancement #737: Fields added to the customer DataGrid and customer addresses section added at admin end.]	2019-10-17 18:12:51 +05:30
shivam kumar	c96dd396d9	#1219 fixed	2019-10-17 17:28:08 +05:30
Vivek	ee5a63c4e4	[Bug Fixed #1640 and #1642: Customer delete issue resolved if any invoice is in pending.]	2019-10-17 15:17:02 +05:30
Vivek	6ab2d5046c	[Bug Fixed #1555: order refund export related issue resolved.]	2019-10-17 12:36:09 +05:30
jitendra	f92b58be65	Issue #1552 fixed	2019-10-14 14:47:47 +05:30
jitendra	fe688852c5	Resolve conflicts	2019-10-14 12:25:43 +05:30
jitendra	b24c2507e8	Issue #1250 fixed	2019-10-14 12:22:58 +05:30
Jitendra Singh	79a3abeb55	Merge pull request #1619 from jitendra-webkul/jitendra ... Issue #1609 fixed	2019-10-14 11:33:44 +05:30
jitendra	707ff1207c	Issue #1609 fixed	2019-10-14 11:32:50 +05:30
Jitendra Singh	53750b73ce	Merge pull request #1617 from jitendra-webkul/jitendra ... Issue #1609 fixed	2019-10-14 10:15:17 +05:30
jitendra	aa44440fef	Issue #1609 fixed	2019-10-14 10:14:18 +05:30
Jitendra Singh	0e900ac4b9	Merge pull request #1603 from jitendra-webkul/jitendra ... Issue #1552 fixed	2019-10-11 12:33:44 +05:30
jitendra	660f4173d1	Issue #1552 fixed	2019-10-11 12:32:44 +05:30
Jitendra Singh	db7013be3f	Merge pull request #1579 from prashant-webkul/development ... Datagrid actions enhancement	2019-10-11 11:52:25 +05:30
jitendra	a7d44e9daa	Issue #1584 fixed	2019-10-11 10:35:51 +05:30
jitendra	2dedd5fbbf	Issue #1581 fixed	2019-10-10 19:46:19 +05:30
jitendra	64198cae11	Issue #1580 fixed	2019-10-10 19:42:35 +05:30
jitendra	121c7c7e36	Issue #1585 fixed	2019-10-10 19:37:31 +05:30
jitendra	4bf577c37b	Issue #1578 fixed	2019-10-10 19:31:08 +05:30
Webkul	9e2e73d0b3	Datagrid actions enhancement, now action can have a key called condition which must return boolean in order to trigger that action's visibility	2019-10-10 13:53:36 +05:30
jitendra	c8505d3fbc	Updated refund with new product types	2019-10-09 19:59:53 +05:30
jitendra	5e754cbdfe	Resoloved conflicts	2019-10-09 17:12:57 +05:30
rahul shukla	2020006d47	Issue #1548	2019-10-07 13:15:07 +05:30
Jitendra Singh	b64c7241ba	Merge pull request #1533 from prashant-webkul/development ... Fixed issue #1532	2019-10-01 10:06:11 +05:30
Webkul	109c99f3da	Made footer text content optional from configuration apart from custom content also	2019-09-30 15:57:35 +05:30
rahul shukla	2d0094f330	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-09-26 17:51:48 +05:30
rahul shukla	53a275f1fd	translation for depandent field	2019-09-26 17:51:28 +05:30
Jitendra Singh	04c93e2339	Merge pull request #1527 from prashant-webkul/development ... Development	2019-09-26 17:07:16 +05:30
Prashant Singh	f6ce3643c0	Fixed issue #1524	2019-09-26 16:45:44 +05:30
rahul shukla	6125252fda	Change Invoice to Order in Invoice Order configuration	2019-09-24 17:20:26 +05:30
Jitendra Singh	30626a1c20	Merge pull request #1496 from ghermans/admin ... Started improving the admin scss files	2019-09-24 16:26:27 +05:30
Jitendra Singh	d8e1ae5baf	Merge pull request #1512 from jitendra-webkul/refund ... Dashboard avg sale issue fixed	2019-09-24 12:41:46 +05:30
jitendra	1acf86acf8	Dashboard avg sale issue fixed	2019-09-24 12:35:18 +05:30
Glenn Hermans	cb9fd50a6a	Fixed typo	2019-09-23 14:33:54 +02:00
Jitendra Singh	35acdc5e0a	Merge pull request #1508 from jitendra-webkul/refund ... Refuned total issue fixed	2019-09-23 16:50:07 +05:30
jitendra	1fc043b5b7	Refuned total issue fixed	2019-09-23 16:49:34 +05:30
Jitendra Singh	ecc144b7b5	Merge pull request #1507 from jitendra-webkul/refund ... Dashboard sales calculation issue fixed	2019-09-23 15:31:20 +05:30
jitendra	6cf1879920	Dashboard sales calculation issue fixed	2019-09-23 15:26:21 +05:30
Jitendra Singh	117c616661	Merge pull request #1505 from rahulshukla-webkul/development ... #1504	2019-09-23 12:51:56 +05:30
jitendra	1bee8c0dde	Issue #1492 fixed	2019-09-23 12:50:40 +05:30
rahul shukla	93101de44c	#1504	2019-09-23 12:36:07 +05:30
jitendra	04ef6a6882	Item status added in refund create page items table	2019-09-20 19:45:52 +05:30
jitendra	aa6f5affc0	Removed comment from Order.php listener file	2019-09-20 19:38:42 +05:30
jitendra	7a56f5761f	Refund feature added	2019-09-20 19:36:41 +05:30
ghermans	79adb77380	Started improving the admin scss files	2019-09-20 02:40:25 +02:00
jitendra	b0e9328090	Issue #1492 fixed	2019-09-19 18:57:58 +05:30
Jitendra Singh	e87968da70	Merge pull request #1485 from jitendra-webkul/refund ... Refund issues fixed	2019-09-19 13:53:06 +05:30
jitendra	ccd86eee76	Refund issues fixed	2019-09-19 13:52:33 +05:30
CodeInnovers	01b6f86c3e	fixed issue #1480	2019-09-18 23:08:27 +05:30
Jitendra Singh	cee52398a1	Merge pull request #1478 from jitendra-webkul/refund ... Refund	2019-09-18 19:12:40 +05:30
jitendra	4e856d02e8	Redund status added	2019-09-18 19:06:25 +05:30
Jitendra Singh	7619ede6a2	Merge pull request #1476 from jitendra-webkul/refund ... Refund system completed	2019-09-18 18:59:48 +05:30
jitendra	53baa66db9	Refund system completed	2019-09-18 18:57:40 +05:30
rahul shukla	8429a5fccf	dashboard dats issue	2019-09-17 16:56:45 +05:30
Jitendra Singh	58306e3252	Merge pull request #1448 from prateek-webkul/master ... Issue #1442 fixed	2019-09-16 10:19:58 +05:30
prateek srivastava	f4f5dd3b08	translation added	2019-09-13 15:41:38 +05:30
rahul shukla	c39255e254	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-09-13 14:35:29 +05:30
rahul shukla	5a54c02d50	Issue #1172 default payment & shipping method	2019-09-13 14:34:15 +05:30
Prashant Singh	a7b2925db4	Fixed issue #1452	2019-09-13 11:01:54 +05:30
Jitendra Singh	cdbd654f4f	Merge pull request #1451 from prashant-webkul/development ... Development	2019-09-13 10:18:24 +05:30
rahul shukla	9eef8aed0a	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-09-12 18:31:56 +05:30
rahul shukla	1ac6650673	searching issue in datagrid	2019-09-12 16:53:05 +05:30
rahul shukla	61da74ee2b	Issue #1447	2019-09-12 16:25:51 +05:30
Prashant Singh	b089149268	Fixed issue #1428	2019-09-12 16:21:03 +05:30
Jitendra Singh	e604037adf	Merge pull request #1445 from prashant-webkul/development ... Fixed issue #1288 #1434 #1444	2019-09-12 11:14:27 +05:30
Prashant Singh	6c82802371	Fixed issues #1444 & #1434	2019-09-11 20:10:59 +05:30
rahul shukla	d9a0c6078e	order number	2019-09-11 17:47:52 +05:30
rahul shukla	aab8bd1479	order number	2019-09-11 17:34:11 +05:30
Jitendra Singh	ac48a20822	Merge pull request #1343 from lemmeV/master ... added configurable order numbers	2019-09-11 15:51:30 +05:30
jitendra	e17c2c5f40	Merged with master	2019-09-11 15:23:57 +05:30
Jitendra Singh	8281ea0088	Merge pull request #1441 from rahulshukla-webkul/development ... error in cancel mail	2019-09-11 13:57:41 +05:30
Jitendra Singh	3cd49daa5c	Merge pull request #1440 from prashant-webkul/development ... Fixed a translation typo in create cart rule form	2019-09-11 13:57:35 +05:30
rahul shukla	ce59e8b1d5	error in cancel mail	2019-09-11 13:55:07 +05:30
Prashant Singh	e6104668e0	Fixed a translation typo in create cart rule form	2019-09-11 13:52:24 +05:30
Jitendra Singh	7c9d8a06ed	Merge pull request #1439 from prashant-webkul/development ... Removed setInvoker method and allowed property to get set in Datagrid…	2019-09-11 13:47:01 +05:30
jitendra	484fb56e54	Price added to downloadable product links	2019-09-11 13:46:33 +05:30
jitendra	6384b84746	Resolve conflicts	2019-09-11 13:16:37 +05:30
Jitendra Singh	b3ca0200ac	Merge pull request #1387 from codeinnovers/master ... fixed issue #1371	2019-09-11 13:13:13 +05:30
Prashant Singh	d48fe8d435	Removed setInvoker method and allowed property to get set in Datagrid's constructor.	2019-09-11 12:59:51 +05:30
jitendra	1ce4dfea95	Merge cart issue fixed for downloadable product	2019-09-11 11:21:12 +05:30
Prashant Singh	1e22e61282	Base sync	2019-09-11 03:11:55 +05:30
Prashant Singh	98e8f3c57d	All datagrids are generating before add column, action and mass action	2019-09-11 03:10:38 +05:30
Prashant Singh	7d7cda1f73	Datagrid add column before and after event added	2019-09-11 01:32:35 +05:30
Prashant Singh	69e46a7ddd	Fixed translation issues in discount forms	2019-09-10 17:58:19 +05:30
Prashant Singh	c3b54c389a	Catalogrule form variables for json data encode and decode are now normalized	2019-09-10 14:54:47 +05:30
jitendra	6f3b95811b	Conflicts resolved	2019-09-10 12:29:19 +05:30
Prashant Singh	6c03f824ec	Refactoring in catalog rule form	2019-09-10 04:11:43 +05:30
Prashant Singh	f99cb5588f	Fixed issue #1428	2019-09-10 02:42:02 +05:30
rahul shukla	8d578c3720	wrong grand total in invoice	2019-09-09 15:33:05 +05:30
jitendra	10b706c1d7	Merged with master	2019-09-09 14:46:43 +05:30
Jitendra Singh	9d5032d619	Merge pull request #1424 from rahulshukla-webkul/development ... Development	2019-09-09 13:18:18 +05:30
rahul shukla	94727a4f1d	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-09-09 12:57:44 +05:30
rahul shukla	98df7f25f7	Issue #1256	2019-09-09 12:57:28 +05:30
Prashant Singh	5651b4ed85	Cart rule form visual and translation changes	2019-09-08 02:50:11 +05:30
Prashant Singh	6a24ed723e	Rogue statement found in discount amount initialization	2019-09-07 16:29:33 +05:30
rahul shukla	4d13c0586a	Issue #1306	2019-09-07 15:18:24 +05:30
Jitendra Singh	dede76a442	Merge pull request #1416 from rahulshukla-webkul/development ... changed in webpack	2019-09-07 13:30:02 +05:30
rahul shukla	9e8edfa226	changed in webpack	2019-09-07 13:27:54 +05:30
Prashant Singh	1aab4ccfe3	more normalization of cart rule form variables	2019-09-07 04:48:27 +05:30
Prashant Singh	c190f6f230	Cart rule form variables normalized	2019-09-07 04:28:42 +05:30
jitendra	915fdd30c2	Fixed bugs	2019-09-06 19:38:54 +05:30
Prashant Singh	047a34e76b	Translation fixes and changes in cart rule datagrid	2019-09-06 19:04:57 +05:30
Prashant Singh	57f3cbb8af	JSON parsing in cart rule update form fixes	2019-09-06 16:58:35 +05:30
Prashant Singh	b1f0416ca0	Spell correction	2019-09-06 16:29:56 +05:30
jitendra	0b22ca7ad1	Error added to accordian if closed	2019-09-06 14:00:10 +05:30
Prashant Singh	573aea9c75	Merge branch 'development' of http://github.com/prashant-webkul/bagisto into development	2019-09-06 03:05:40 +05:30
Prashant Singh	8a6b5d4723	Assets compiled for production	2019-09-05 18:37:58 +05:30
rahul shukla	11391b2fd8	conflict resolve	2019-09-05 16:45:39 +05:30
jitendra	38f73505af	Assets compiled for production	2019-09-05 15:14:45 +05:30
jitendra	1977ddd6ad	Bundle product radio and checkbox added in product edit form for is default selection	2019-09-05 13:56:10 +05:30
rahul shukla	9916424e0d	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-09-05 13:13:16 +05:30
rahul shukla	c3d9ac8706	conflict resolve	2019-09-05 13:13:00 +05:30
jitendra	1afd2f9da3	Is default flag added to bundle product edit form	2019-09-05 11:19:33 +05:30
Hossein	f20dea46e4	Fix #1392	2019-09-05 09:33:08 +04:30
jitendra	3c5a2792e3	Removed configurable checks and deleted unwanted files	2019-09-04 16:23:05 +05:30
jitendra	45f1ea4b83	Merge with master	2019-09-04 15:05:03 +05:30
Sam	8c75c20e1d	fixed issue #1371	2019-09-03 23:22:51 +05:30
Prashant Singh	ce79814408	Minor fix	2019-09-03 16:38:50 +05:30
jitendra	eafa585cb8	Order creation completed for bundle product	2019-09-03 15:46:13 +05:30
Prashant Singh	f8cbdd488c	Fixed issue #1366	2019-09-02 23:00:39 +05:30
Prashant Singh	108795778b	Merge branch 'master' of https://github.com/bagisto/bagisto	2019-09-02 19:53:25 +05:30
Prashant Singh	62d1b23a14	New issue template for filing issue and cut the issue filing hassle	2019-08-31 14:37:40 +05:30
jitendra	557cbb1db1	Bundle add to cart added	2019-08-30 17:09:15 +05:30
Prashant Singh	1e0da3c42a	Fixed issue #778	2019-08-29 16:11:12 +05:30
Prashant Singh	6709594889	Added a new type of field for color picker in configuration	2019-08-27 13:07:48 +05:30
Prashant Singh	0e048f6dcb	Added the cms pages create and edit form in two separate accordian one for design and one for seo	2019-08-27 10:27:46 +05:30
Prashant Singh	ca30234e0a	Merge branch 'master' of https://github.com/bagisto/bagisto	2019-08-24 16:09:59 +05:30
Prashant Singh	8994cd0426	Base sync and webfont fixes	2019-08-24 16:09:22 +05:30
Jitendra Singh	f5e8766c89	Merge pull request #1352 from prashant-webkul/development ... Added entry for CMS in core's concord.php	2019-08-24 16:01:51 +05:30
Prashant Singh	a18bf91728	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-08-24 15:59:15 +05:30
Prashant Singh	b570bf229b	CMS pages seeder implemented and now seeder generates all prebuilt pages that were listed in footer quicklinks	2019-08-24 15:57:09 +05:30
Prashant Singh	49c2f1c9d8	Slider content work complete	2019-08-23 18:01:44 +05:30
Jitendra Singh	6169d7cc8d	Merge pull request #1346 from prateek-webkul/master ... #1338 issue fixed	2019-08-23 13:38:45 +05:30
Jitendra Singh	9b625dbb9f	Merge pull request #1345 from prashant-webkul/development ... Development	2019-08-23 13:34:43 +05:30
Prashant Singh	5bc496d823	Changed column grand_total to base_grand_total in Order invoices datagrid	2019-08-23 13:32:20 +05:30
Prashant Singh	0c79d87503	Removed stripe fees visibility from every where	2019-08-23 13:15:10 +05:30
prateek srivastava	3e8d8bc7ab	#1338 issue fixed	2019-08-23 12:13:18 +05:30
Prashant Singh	a7d7bc80fa	Added some blade render events in settings	2019-08-23 10:38:59 +05:30
Prashant Singh	a30b16e9a0	Merge branch 'master' of https://github.com/bagisto/bagisto	2019-08-23 08:59:19 +05:30
Lemme Velleõu	4f8f470095	added configurable order numbers	2019-08-22 18:24:30 +03:00
prateek srivastava	b0c8eb5eb5	issue of layout fixed in admin tax	2019-08-22 19:34:08 +05:30
prateek srivastava	5f34825678	issue of admin panel form button fixed	2019-08-22 19:28:41 +05:30
rahul shukla	486c6ca63f	issue #1340	2019-08-22 13:56:21 +05:30
jitendra	7352a97797	Bundle product data save completed	2019-08-21 19:24:26 +05:30
Prashant Singh	151c7a830a	Fixed issues related to empty attribute conditions	2019-08-21 16:10:39 +05:30
Prashant Singh	171b48453e	Made cart rule conditions interpreter fault tolerant to missing attributes	2019-08-21 15:22:37 +05:30
Prashant Singh	3b61c17155	Fixed issue #1333	2019-08-21 15:07:14 +05:30
Prashant Singh	140820dc4a	Fixed issue #1334	2019-08-21 15:03:53 +05:30
Prashant Singh	05c5425c96	Added home page SEO under channel edit and create forms and fixed issue #1319	2019-08-21 13:38:07 +05:30
Prashant Singh	3c9ae5b35d	Fixed issue with category or attribute field left empty	2019-08-21 12:19:53 +05:30
Prashant Singh	ec89315b42	Fixed issue #1324	2019-08-21 11:16:01 +05:30
Prashant Singh	56a1fd4593	Fixed issue #1312	2019-08-21 10:17:16 +05:30
jitendra	ec567d624f	Db schema, models and repositories added for bundle type product	2019-08-20 17:57:39 +05:30
Prashant Singh	3a9143462e	Added asterisk in description fields of catalog rule update and create	2019-08-20 17:27:49 +05:30
Prashant Singh	afafdfbfcd	Fixed issue #1327	2019-08-20 16:48:11 +05:30
Prashant Singh	2a15488f24	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-08-20 16:47:00 +05:30
Prashant Singh	9d5793b7b5	Fixed issue #1326	2019-08-20 16:25:00 +05:30
Prashant Singh	e52825a3f9	Fixed issue #1323	2019-08-20 16:10:24 +05:30
Prashant Singh	07be3c6a86	Fixed issue #1325	2019-08-20 16:07:41 +05:30
Prashant Singh	46e3badf4d	Fixed issue #1275, #1321, #1285	2019-08-20 15:56:32 +05:30
Prashant Singh	01b9f5cbbc	Fixed issue #1269	2019-08-20 13:33:24 +05:30
Prashant Singh	8cf6c41fc5	Fixed issue #1268	2019-08-20 13:31:59 +05:30
Prashant Singh	a29409b1a4	Base sync	2019-08-19 16:11:09 +05:30
jitendra	e2bd18e916	Resolved conflicts	2019-08-19 16:01:38 +05:30
Jitendra Singh	e5b904741c	Merge pull request #1316 from prashant-webkul/development ... Catalog rule implementation complete, new product price mechanish rem…	2019-08-19 15:11:13 +05:30
Prashant Singh	e97069d2be	Catalog rule implementation complete, new product price mechanish remaining	2019-08-19 15:05:56 +05:30
jitendra	29e4851bfb	Group product added	2019-08-19 15:00:24 +05:30
Jitendra Singh	b7bc6344bb	Merge pull request #1313 from prashant-webkul/development ... Development	2019-08-19 13:56:04 +05:30
Prashant Singh	8a9198e5d9	Catalog rules tie break in progress, squased a line of dead code in CartRuleController	2019-08-19 12:36:43 +05:30
Prashant Singh	aca7b4c6c7	Catalog rule tie breaker content in progress	2019-08-17 20:18:39 +05:30
Prashant Singh	1d1018ac50	Refactoring of cart rules and syntax standard sugar	2019-08-17 17:40:17 +05:30
Jitendra Singh	a8ff894d6c	Merge pull request #1310 from prashant-webkul/development ... Fixed channel locale issue in cms datagrid	2019-08-17 15:49:18 +05:30
Prashant Singh	bb972c6e48	CMS Bug fixes and updated readme	2019-08-17 15:42:24 +05:30
Prashant Singh	eb2f805057	Correct name of channel column in CMS page datagrid	2019-08-16 19:18:00 +05:30
Prashant Singh	b87e6cdb2e	Fixed channel locale issue in cms datagrid	2019-08-16 18:48:13 +05:30
Jitendra Singh	59cfd13795	Merge pull request #1307 from prashant-webkul/development ... Development	2019-08-16 17:50:18 +05:30
Prashant Singh	bd6e0c9345	Structural changes in CMS pages. Fixed bugs #1300, #1295	2019-08-16 17:43:58 +05:30
Prashant Singh	8c96bca9b3	Base sync	2019-08-14 16:54:13 +05:30
Prashant Singh	44c33825e0	Cart discount helper namespace fix	2019-08-14 16:53:05 +05:30
Jitendra Singh	39a195f923	Merge pull request #1296 from prashant-webkul/development ... Development	2019-08-14 14:55:44 +05:30
Prashant Singh	de24f9a39c	Fixed issue #1292 for CMS pages by making a separate view for helper classes and leaving future scope for things as well	2019-08-14 14:01:49 +05:30
Prashant Singh	da5ad23c3b	Fixed issue #1289	2019-08-14 13:50:32 +05:30
Prashant Singh	c56a791069	Fixed issue #1295	2019-08-14 13:49:42 +05:30
Prashant Singh	54e54918a7	Fixed issue #1293	2019-08-14 13:44:21 +05:30
Prashant Singh	9425b39b78	Fixed issue #1294	2019-08-14 13:42:27 +05:30
Prashant Singh	dd9ff1629d	Fixed issue #1287	2019-08-13 23:31:14 +05:30
Hossein	d875855145	Update app.php	2019-08-13 10:33:30 +04:30
Prashant Singh	2a36c6bd0e	Catalog rule implementation in progress	2019-08-12 19:23:33 +05:30
Prashant Singh	da093662db	Catalog rule implementation in progress	2019-08-12 06:56:21 +05:30
Hossein	1b86cd99f1	Create Persian language file	2019-08-10 10:24:54 +04:30
Prashant Singh	06a4f1216b	Dead code removal	2019-08-09 19:29:28 +05:30
Jitendra Singh	a849ae9fc0	Merge pull request #1272 from prashant-webkul/development ... Development	2019-08-09 19:12:44 +05:30
Prashant Singh	8b78105ed9	Removed dead code	2019-08-09 18:52:01 +05:30
Prashant Singh	a72535db23	Merge branch 'master' of https://github.com/bagisto/bagisto	2019-08-09 14:17:09 +05:30
Prashant Singh	3ca4b48ac3	Catalog rule update form in progress	2019-08-09 04:10:45 +05:30
Prashant Singh	55ead412ce	Catalog rule create form implemented	2019-08-08 11:38:23 +05:30
Prashant Singh	6d41d37c3b	Catalog rules migrations finalized	2019-08-08 07:28:08 +05:30
Prashant Singh	fbedc8a161	Added env's shop_mail_from param param in all mails related to customers and shop	2019-08-06 20:00:28 +05:30
Prashant Singh	6a8bb7982d	Base sync	2019-08-06 14:37:03 +05:30
rahul shukla	063a58b753	Issue #1253	2019-08-05 21:00:39 +05:30
rahul shukla	763a380870	new customer notification, isssue #1247	2019-08-05 20:23:48 +05:30
Prashant Singh	cff0b7f4b2	refactroring of vart rules	2019-08-05 05:06:51 +05:30
Prashant Singh	e4a5e84fb6	Refactoring cart rules	2019-08-03 19:54:02 +05:30
Prashant Singh	9ca97aa594	CMS implemented	2019-08-02 19:51:28 +05:30
Prashant Singh	b1285fa243	Static page CMS sprint one complete, preview page is not loading CSS and JS from shop layout	2019-08-02 04:30:19 +05:30
rahul shukla	6f64de0f26	issue #1235	2019-07-31 19:19:26 +05:30
rahul shukla	561803cd3c	filterable attribute for category, tax price update on cart and issue #1234	2019-07-31 17:44:29 +05:30
rahul shukla	3a7e481d01	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-07-30 20:09:55 +05:30
rahul shukla	270bdfa553	delete in product flat	2019-07-30 20:09:40 +05:30
Prashant Singh	d8086091cb	Merge branch 'master' of https://github.com/bagisto/bagisto	2019-07-30 13:54:25 +05:30
rahul shukla	39139f26ca	Issues #1228 and #1229	2019-07-30 13:45:13 +05:30
Jitendra Singh	41510db280	Merge pull request #1202 from moe2566/master ... Add text direction configuration for locales	2019-07-30 11:48:56 +05:30
rahul shukla	1b95d3d877	product creation on channel based and admin logo	2019-07-30 10:36:26 +05:30
rahul shukla	d83396d437	issue #1217, #1220 and #1218	2019-07-29 14:38:17 +05:30
rahul shukla	2e336c935a	test field added for depandenet field in configuaration	2019-07-29 14:34:54 +05:30
rahul shukla	9d9b0b5176	use in product flat column added in attributes	2019-07-29 14:33:33 +05:30
rahul shukla	dbff16b8b7	disabale zoom on mobile devices	2019-07-29 12:07:39 +05:30
Prashant Singh	f9e91bb0ef	Merge branch 'master' of https://github.com/bagisto/bagisto	2019-07-25 11:26:34 +05:30
moe2566	09cfa77378	Update anonymous-master.blade.php	2019-07-24 10:19:50 -04:00
rahul shukla	1dd5faa21d	change Datatype for code	2019-07-24 17:55:32 +05:30
Moshe Lustigman	a0ba845e37	Add text direction configuration for locales	2019-07-23 18:05:57 -04:00
Prashant Singh	2acad0e540	Fixed an issue with convertXToProductId which was causing some productids from being pushed into the storage	2019-07-23 13:43:37 +05:30
Prashant Singh	dfd6ea8c25	Translations fixes in promotions sections	2019-07-23 13:07:22 +05:30
Prashant Singh	70267e29cb	disabled catalog rule	2019-07-22 13:01:54 +05:30
Prashant Singh	0bd422db97	translation fixes in cart rule forms	2019-07-22 13:01:07 +05:30
Prashant Singh	9cf1ea2516	disabled catalog rule till final migrations	2019-07-22 12:54:46 +05:30
Prashant Singh	896cbfe1e0	base sync	2019-07-22 12:53:51 +05:30
Prashant Singh	27ca4cb622	Minor fixes	2019-07-22 12:50:06 +05:30
Prashant Singh	7f3ed81554	Removed a bug from convertXToProductId from cart rule edit form causing it to exception when no criteria for products to be applied is done emtpy after having a previous criteria	2019-07-22 12:18:59 +05:30
rahul shukla	3200cbafc6	Issue #1190.	2019-07-19 16:30:01 +05:30
Prashant Singh	bcdec8ec5a	Removed old migrations of catalog rule and removed a bug in convertXToProductId	2019-07-19 15:44:15 +05:30
Prashant Singh	a9994a3143	Translation issue fixes for cart rule create and edit forms	2019-07-19 10:49:19 +05:30
Prashant Singh	48d068d760	ConvertXToProductID bug fix when left null	2019-07-18 18:20:21 +05:30
Prashant Singh	b512666ef1	ConvertXToProductId from attributes implemented	2019-07-18 14:08:36 +05:30
rahul shukla	f61554c5a6	configuration changes for dependent field	2019-07-18 12:51:22 +05:30
Prashant Singh	247b662b7e	Position fixes for buttons used in tabbed forms	2019-07-18 10:45:59 +05:30
Prashant Singh	52e3a64380	Made all submit buttons of create and update buttons style to fixed	2019-07-18 10:10:49 +05:30
Prashant Singh	2a9b4220d6	Only finding product ids is left then apply them on cart rules	2019-07-17 18:54:43 +05:30
Prashant Singh	3d53a221ef	Has options check applied on frontend for options related to select and multiselect attributes	2019-07-17 16:18:10 +05:30
Prashant Singh	4017e3b16e	ConvertXToProductId frontend complete now moving to converting X to ids	2019-07-17 16:14:04 +05:30
Prashant Singh	08f606c099	Worked on ConvertXToProductId and the bug in multiselect caused a huge delay but right now we have falled back to old select box	2019-07-16 19:02:40 +05:30
Prashant Singh	6ba5e0df0a	Added back catalog rule migration, a bug is stuck in convert x to productid migrations	2019-07-15 19:54:38 +05:30
Prashant Singh	93a035b147	Fixer io disabled temporarily	2019-07-15 18:25:14 +05:30
Prashant Singh	c6bc5ba1c3	Added support for fixer for fetching rates	2019-07-15 18:24:36 +05:30
rahul shukla	27d6e8894c	checkbox type attribute	2019-07-15 18:00:56 +05:30
Prashant Singh	9f9e0b6a68	Created a command to activate the usage of catalog rule	2019-07-15 16:02:39 +05:30
Prashant Singh	2a6e43de28	Part of convertxtoid frontend complete in cart rule create form, fixed sort order for catalog in admin panel	2019-07-15 14:11:00 +05:30
Prashant Singh	0d0a588c33	added products subselection in cart rules create page(in progress 50% done)	2019-07-14 17:20:09 +05:30
Prashant Singh	d860466dfc	mass action index now totally dependent on datagrid's index property	2019-07-14 14:30:44 +05:30
Prashant Singh	caf165d06c	Fixed issue with image of product card getting cropped due to CSS	2019-07-14 12:25:57 +05:30
Prashant Singh	42d067c44a	Optimization in exception handling for separate admin and shop providers, whilst convertxtoproductid is in UI development	2019-07-14 07:30:16 +05:30
Prashant Singh	5f08f2b9f4	Fixed sort order for configuration in admin panel	2019-07-14 00:46:33 +05:30
Prashant Singh	f8c774b3a5	Started with convert x to product id for cart rules	2019-07-13 15:23:27 +05:30
Prashant Singh	88611c9d84	Fixed issue #1172	2019-07-11 09:49:32 +05:30
Prashant Singh	abd3913d45	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-07-10 10:37:29 +05:30
rahul shukla	cc4dfcad76	issue #1160, filterable attribute & configuration updated for validation	2019-07-09 14:47:40 +05:30
Prashant Singh	68bba4d7e2	Merge branch 'master' of https://github.com/bagisto/bagisto	2019-07-09 12:54:42 +05:30
Prashant Singh	316ec39aaf	Configuration field changes done, data-vv-as parameter now take translated attribute from field configuration key called title	2019-07-09 11:18:02 +05:30
Prashant Singh	869265e7a5	Fixed the bug is system core configuration preventing to take null values inn the select and multi select fields	2019-07-09 10:11:19 +05:30
rahul shukla	746a17dcf6	conflict resolve	2019-07-08 13:13:34 +05:30
rahul shukla	c7add7e2fe	removal of excess code in search, locale & currency	2019-07-08 13:10:41 +05:30
Jitendra Singh	2c45ddee13	Merge pull request #1157 from danielpinon/patch-1 ... Updating translations of languages ​​in pt_BR	2019-07-08 12:13:54 +05:30
Daniel Pinon	723f6ad639	Clearing duplicity	2019-07-06 23:59:59 -03:00
Daniel Pinon	c5fe78014c	Updating translations of languages ​​in pt_BR	2019-07-06 23:58:01 -03:00
Prashant Singh	c8e8df1699	Added configuration for cart rules	2019-07-06 17:41:58 +05:30
rahul shukla	54481ebbfe	slider edit issue	2019-07-05 18:15:22 +05:30
Prashant Singh	3fe220428c	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-07-05 13:23:56 +05:30
jitendra	1fd25cfc92	Added currency symbol in currencies table	2019-07-05 11:46:45 +05:30
rahul shukla	60435b724f	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-07-04 12:38:36 +05:30
rahul shukla	c56d94f7a4	issue #968 and dependent field	2019-07-04 12:38:20 +05:30
Prashant Singh	f8d38e9bbd	Enabled usage parameters of cart rule in create and edit form	2019-07-03 11:37:09 +05:30
jitendra	31b6e779d6	Fixed image wrapper css issue	2019-07-02 17:55:56 +05:30
Prashant Singh	12c321e80e	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-07-02 12:45:59 +05:30
Prashant Singh	bfe52a7d3c	Enabling coupon usage option for cart rules and start of the program convertxtoproductid	2019-07-02 12:45:30 +05:30
jitendra	366a5fdd20	Refactor code standard	2019-07-01 17:03:36 +05:30
Prashant Singh	3d352b690a	Merge branch 'master' of https://github.com/bagisto/bagisto	2019-06-29 18:49:08 +05:30
Prashant Singh	1057cd654e	Updated preorder in SAAS	2019-06-29 18:19:39 +05:30
rahul shukla	2f905203a2	style for dashboard	2019-06-29 18:12:07 +05:30
jitendra	f08a8036e6	Resolved conflict	2019-06-29 17:57:10 +05:30
jitendra	3ef416b22e	Added downloadable order item info	2019-06-29 17:51:49 +05:30
rahul shukla	b8c0f4aed6	css changes for overflow	2019-06-29 15:26:26 +05:30
jitendra	ad6e422fdb	Added downloadable and virtual products	2019-06-29 15:23:34 +05:30
jitendra	55b71e1e66	updated	2019-06-28 19:48:52 +05:30
rahul shukla	34fd4e3840	assets compile for production	2019-06-28 17:11:26 +05:30
rahul shukla	beabada35e	acl added for cart rule & dashboard css changes	2019-06-28 16:30:36 +05:30
Prashant Singh	8a5d57bcc6	new compiled assets for production	2019-06-28 16:30:36 +05:30
Prashant Singh	fce7ec8586	Assets compiled for production and updated the changelog for new release v0.1.6	2019-06-28 16:29:41 +05:30
Prashant Singh	25007824eb	Shipping now getting applied according to selected shipping method	2019-06-27 19:51:17 +05:30
Jitendra Singh	4feeffaf51	Merge pull request #1124 from prashant-webkul/development ... Fixed issue #1080	2019-06-27 16:18:13 +05:30
Prashant Singh	9b83fb8025	Fixed issue #1080	2019-06-27 16:14:24 +05:30
Jitendra Singh	9eaf46a4d1	Merge pull request #1123 from prashant-webkul/development ... Product export now added	2019-06-27 14:59:42 +05:30
Prashant Singh	487484f86d	Product export now added	2019-06-27 14:55:32 +05:30
Jitendra Singh	4627c6a519	Merge pull request #1122 from prashant-webkul/development ... Development	2019-06-27 14:43:51 +05:30
Prashant Singh	c245eab856	Fixed issue #1086 for customer edit	2019-06-27 14:41:01 +05:30
rahul shukla	79b5e1c4cd	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-06-27 14:38:48 +05:30
rahul shukla	a9090e991c	download for image & file type	2019-06-27 14:38:24 +05:30
Prashant Singh	d1395ba145	Fixed issue #1086	2019-06-27 14:24:26 +05:30
Prashant Singh	3f79f2b89a	Fixed issue #1114, #1112	2019-06-27 13:30:45 +05:30
jitendra	2a5e8b1ddd	Removed propaganistas/laravel-intl dependency	2019-06-27 13:01:47 +05:30
rahul shukla	62cb90e014	status for customer	2019-06-26 18:02:14 +05:30
Jitendra Singh	a60e339218	Merge pull request #1105 from prashant-webkul/development ... Development	2019-06-25 15:02:46 +05:30
Prashant Singh	68c22f38f6	improvements in cart rules	2019-06-25 14:44:14 +05:30
Prashant Singh	1a262e0f27	Fixed some bugs in cart rules	2019-06-25 12:27:13 +05:30
Prashant Singh	eedc0c6153	eliminated the column is_guest column from cart rules in favor of guest as a customer group	2019-06-25 11:10:21 +05:30
Jitendra Singh	d547ab5058	Merge pull request #1090 from prashant-webkul/development ... Development	2019-06-21 16:28:59 +05:30
rahul shukla	9080f1e278	removed inline css	2019-06-21 11:37:31 +05:30
rahul shukla	b0c35ead9f	icon issue in admin dashboard	2019-06-21 11:23:27 +05:30
Prashant Singh	8c9fb32ab1	Removed some deadcode of productgrid repository which is no longer needed and had been obselete from many days	2019-06-21 04:15:45 +05:30
Prashant Singh	937d91ea5b	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-06-20 18:10:07 +05:30
rahul shukla	048585853d	repository insted of model in attribute create & edit for locale	2019-06-20 15:12:28 +05:30
Jitendra Singh	bfac46ffdf	Merge pull request #1079 from rahulshukla-webkul/development ... issue of discount amount in order #1053	2019-06-20 14:34:11 +05:30
Prashant Singh	264d2e3c9e	Added cart rule validation function which validates the cart rule and added unique coupon check while creating or updating couponable cart rule	2019-06-20 13:03:01 +05:30
rahul shukla	f72529f0fb	issue of discount amount in order #1053	2019-06-20 12:17:11 +05:30
Prashant Singh	acad17af67	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-06-19 18:21:26 +05:30
Prashant Singh	052afb4faf	Fixed issues with apply to shipping and free shipping in create and edit of cart rules	2019-06-19 18:18:21 +05:30
Prashant Singh	423824b531	Fixed issue #1075 and #1074	2019-06-19 18:13:41 +05:30
rahul shukla	5b98b9a86d	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-06-19 16:32:48 +05:30
rahul shukla	be8c11aa98	issue #1069	2019-06-19 16:32:38 +05:30
Prashant Singh	de445279d2	Fixed bug in product creation changed the name of product type configuration file and implemented new design for condition fields in create and edit pages of cart rules	2019-06-19 16:27:32 +05:30
Prashant Singh	68e0ba1ac1	Fixed issue #1054	2019-06-19 10:58:02 +05:30
rahul shukla	d25cc60351	issues #1056 & 1058	2019-06-18 18:05:52 +05:30
rahul shukla	9166daa31b	issues #1056 & 1058	2019-06-18 17:58:34 +05:30
rahul shukla	1144ce7e10	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-06-17 18:32:12 +05:30
rahul shukla	94b67d00c1	admin css changes	2019-06-17 18:31:52 +05:30
rahul shukla	0b5f50f1b0	depandent field added in configuaration	2019-06-17 18:22:23 +05:30
Prashant Singh	d18667351c	Base sync	2019-06-17 12:38:29 +05:30
Prashant Singh	ea185aad7b	Discount package bug fixes and complete refactor with overriding features for actions	2019-06-17 08:56:30 +05:30
Prashant Singh	ba31ecd527	Cart rule create and edit forms bug fixes	2019-06-16 22:18:19 +05:30
Prashant Singh	15abe379e0	Changed frontend attributes and syntax fixes in checkout	2019-06-16 17:26:06 +05:30
jitendra	a2d1e1aa85	Column 'code' added in customer_groups table	2019-06-15 18:50:38 +05:30
Prashant Singh	9ae4f8a801	Fixed issues with cart rule customer groups	2019-06-15 18:47:53 +05:30
Jitendra Singh	545cd7386e	Revert "Revert "Fixed issue with order summary rendering on cart page""	2019-06-15 16:49:02 +05:30
Jitendra Singh	65f899dcfe	Merge pull request #1038 from jitendra-webkul/jitendra ... Guest removed from customer pages	2019-06-15 16:35:42 +05:30
jitendra	ff64d23319	Guest removed from customer pages	2019-06-15 16:34:56 +05:30
Jitendra Singh	7ac715e93d	Revert "Fixed issue with order summary rendering on cart page"	2019-06-15 15:09:59 +05:30
Prashant Singh	0927786cee	Fixed issue with order summary rendering on cart page	2019-06-15 14:56:24 +05:30
Prashant Singh	1e865986c4	improved conditions check in applying cart rules	2019-06-14 19:24:15 +05:30
rahul shukla	c8fb37698c	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-06-14 14:22:50 +05:30
rahul shukla	0bdd03b331	ticket 201 error & admin css for back icon	2019-06-14 14:22:22 +05:30
Prashant Singh	4bfefd3a07	base sync	2019-06-14 13:22:37 +05:30
Prashant Singh	c52238e45e	Cart rule frontend normalization	2019-06-14 13:21:17 +05:30
Prashant Singh	7f9409bd8e	Checkout and cart page now coupled with cart rules	2019-06-14 12:10:03 +05:30
rahul shukla	5afef79ac2	merge with master	2019-06-13 20:24:52 +05:30
jitendra	6e8c0da054	Fixed conflicts	2019-06-13 19:48:30 +05:30