2456 Commits

Author	SHA1	Message	Date
Jitendra Singh	f88d986d6a	Merge pull request #1589 from jitendra-webkul/jitendra ... Issue #1585 fixed	2019-10-10 19:39:00 +05:30
jitendra	121c7c7e36	Issue #1585 fixed	2019-10-10 19:37:31 +05:30
Jitendra Singh	82491b009d	Merge pull request #1588 from jitendra-webkul/jitendra ... Issue #1578 fixed	2019-10-10 19:32:06 +05:30
jitendra	4bf577c37b	Issue #1578 fixed	2019-10-10 19:31:08 +05:30
Jitendra Singh	f555a38d18	Merge pull request #1586 from jitendra-webkul/jitendra ... Issue #1574 fixed	2019-10-10 17:46:36 +05:30
jitendra	210a19757f	Issue #1574 fixed	2019-10-10 17:41:30 +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 Singh	bd31bbd208	Merge pull request #1576 from prashant-webkul/development ... Footer links issue is resolved (issue #1522)	2019-10-10 13:42:43 +05:30
Webkul	3819e6e2ed	resolved issue #1522	2019-10-10 13:35:41 +05:30
Jitendra Singh	5bb6e1870c	Merge pull request #1577 from jitendra-webkul/jitendra ... Issue #1573 fixed	2019-10-10 13:23:47 +05:30
jitendra	e21fb3d6cd	Issue #1573 fixed	2019-10-10 13:21:46 +05:30
Webkul	baad7ecb0a	Footer links issue is resolved	2019-10-10 13:17:46 +05:30
Jitendra Singh	4e0a5847d5	Merge pull request #1521 from Sopizhenko/master ... Fix for issue #1433	2019-10-10 13:16:23 +05:30
Jitendra Singh	853885a283	Merge pull request #1542 from accountmine/master ... Issue #1540	2019-10-10 13:15:28 +05:30
Jitendra Singh	e85f07af08	Merge pull request #1564 from rahulshukla-webkul/development ... Fixed issue #1563	2019-10-10 13:03:59 +05:30
Jitendra Singh	62e8826d17	Merge pull request #1572 from prashant-webkul/development ... Generate product command bug fix	2019-10-10 12:39:03 +05:30
Jitendra Singh	0223ffda8e	Merge pull request #1570 from jitendra-webkul/jitendra ... Updated refund for new product types	2019-10-10 12:34:05 +05:30
Webkul	0cbf50b657	Generate product command bug fix	2019-10-10 12:33:20 +05:30
jitendra	b707a855fc	Updated refund for new product types	2019-10-10 12:33:05 +05:30
Jitendra Singh	3c9ef6ee45	Merge pull request #1558 from marcmascarell/patch-1 ... Spanish translation for Shop module	2019-10-10 11:06:21 +05:30
jitendra	c8505d3fbc	Updated refund with new product types	2019-10-09 19:59:53 +05:30
rahul shukla	6752476317	conflict resolve	2019-10-09 19:29:07 +05:30
jitendra	f8db35504c	Fixed checkout issue	2019-10-09 19:21:02 +05:30
rahul shukla	28c65329d7	Checkout conflict resolve	2019-10-09 18:45:39 +05:30
rahul shukla	bcd656e364	Issue #1563	2019-10-09 18:30:18 +05:30
jitendra	5e754cbdfe	Resoloved conflicts	2019-10-09 17:12:57 +05:30
Jitendra Singh	fc920e14c5	Merge pull request #1549 from rahulshukla-webkul/development ... Issue #1548	2019-10-09 16:21:34 +05:30
Marc Mascarell	c011d19c39	Spanish translation for Shop module	2019-10-09 11:22:12 +02:00
Prashant Singh	0792a7ff96	Release version updated.	2019-10-09 11:20:01 +05:30
rahul shukla	878c0eb8e5	Issue #1463	2019-10-07 16:36:16 +05:30
rahul shukla	2020006d47	Issue #1548	2019-10-07 13:15:07 +05:30
Username	7ea2010a59	Issue #1540	2019-10-02 22:31:38 -07:00
Jitendra Singh	2933b24147	Merge pull request #1541 from prashant-webkul/development ... Fixed decimal precision issue for currency_exchange_rates table's rate column.	2019-10-03 10:59:39 +05:30
Prashant Singh	a40afa36be	Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development	2019-10-03 10:57:29 +05:30
Prashant Singh	3bd2fd571d	Fixed issue #1539	2019-10-03 10:57:07 +05:30
Jitendra Singh	0d5245690b	Merge pull request #1538 from prashant-webkul/development ... Development	2019-10-01 16:38:48 +05:30
rahul shukla	f3bd135cec	change way for default shipping & payment method selection	2019-10-01 16:33:18 +05:30
rahul shukla	d27dfd1c1e	change way for default shipping & payment method selection	2019-10-01 16:26:49 +05:30
Webkul	0b8364a6aa	Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development	2019-10-01 14:58:25 +05:30
Webkul	f1785894d0	Attribute family id in GenerateProduct class was hardcoded replaced it with a dyamic query	2019-10-01 14:57:56 +05:30
rahul shukla	45ff0b5602	route update for product create command	2019-10-01 14:50:56 +05:30
Jitendra Singh	b79d607113	Merge pull request #1536 from prashant-webkul/development ... Create simple product with random data using command…	2019-10-01 11:02:45 +05:30
Webkul	73686a86fe	Create simple product with random data using command php artisan generate:product/products {quantity}, helpful for testing framework right out of the box	2019-10-01 11:00:11 +05:30
Jitendra Singh	3660c1e2e2	Merge pull request #1531 from melorbany/hotfix/arabic_translation ... Update Arabic localization text.	2019-10-01 10:06:38 +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
Prashant Singh	ba4dc11687	Fixed issue #1532	2019-09-30 10:56:38 +05:30
Mohamed Elorbany	a048f9d76a	Update Arabic localization text.	2019-09-29 13:38:47 +03:00
rahul shukla	5d63416e95	localization message improvement	2019-09-27 19:46:14 +05:30
rahul shukla	fda8498721	merge with master	2019-09-27 15:23:58 +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	2ffe9a5c12	customer channel checks removed, statuatory migration warning for those using channels specifically for customers.	2019-09-26 17:00:28 +05:30
Prashant Singh	f6ce3643c0	Fixed issue #1524	2019-09-26 16:45:44 +05:30
Sopizhenko	9569b38b19	fix the problem with layered navigation on pages	2019-09-26 11:29:44 +03:00
Jitendra Singh	819b397b67	Merge pull request #1517 from prashant-webkul/development ... Fixed issue with undefined variable meta title	2019-09-25 10:56:50 +05:30
Prashant Singh	8f34c70ab9	Fixed issue with undefined variable meta title	2019-09-24 19:12:51 +05:30
Jitendra Singh	d439258095	Merge pull request #1516 from prashant-webkul/development ... Null coalesce for title on bagisto's home page	2019-09-24 17:42:06 +05:30
Prashant Singh	2a52d24093	Null coalesce for title on bagisto's home page	2019-09-24 17:34:19 +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	ef29bb87b8	Merge pull request #1514 from prashant-webkul/development ... Fixed order of page title section	2019-09-24 14:50:49 +05:30
Prashant Singh	cc30b5849c	Fixed order of page title section	2019-09-24 14:27:52 +05:30
Jitendra Singh	16799a43ea	Merge pull request #1513 from prashant-webkul/development ... Home page title is mapped with channel's meta_title field.	2019-09-24 12:45:56 +05:30
Prashant Singh	626597fcb5	Home page title is mapped with channel's meta title	2019-09-24 12:43:49 +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	ed86b61f28	Merge pull request #1510 from jitendra-webkul/refund ... Order status issue fixed	2019-09-23 17:35:42 +05:30
jitendra	59fcee0e15	Order status issue fixed	2019-09-23 17:35:00 +05:30
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 Singh	240a0eb2bd	Merge pull request #1506 from jitendra-webkul/refund ... Issue #1492 fixed	2019-09-23 12:51:36 +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 Singh	8eab8210d6	Merge pull request #1503 from jitendra-webkul/refund ... Refund grantotal issue fixed with different currency	2019-09-23 11:49:14 +05:30
jitendra	80cdd1826b	Refund grantotal issue fixed with different currency	2019-09-23 11:48:25 +05:30
Jitendra Singh	a989173357	Merge pull request #1501 from jitendra-webkul/refund ... Item status added in refund create page items table	2019-09-20 19:46:27 +05:30
jitendra	04ef6a6882	Item status added in refund create page items table	2019-09-20 19:45:52 +05:30
Jitendra Singh	e1aedd8ac1	Merge pull request #1500 from jitendra-webkul/refund ... Removed comment from Order.php listener file	2019-09-20 19:39:16 +05:30
jitendra	aa6f5affc0	Removed comment from Order.php listener file	2019-09-20 19:38:42 +05:30
Jitendra Singh	850e357363	Merge pull request #1499 from jitendra-webkul/refund ... Refund feature added	2019-09-20 19:37:42 +05:30
jitendra	7a56f5761f	Refund feature added	2019-09-20 19:36:41 +05:30
Jitendra Singh	f581db8dd9	Merge pull request #1498 from jitendra-webkul/refund ... Issue #1489 fixed	2019-09-20 18:50:54 +05:30
jitendra	ca23da77a9	Issue #1489 fixed	2019-09-20 18:49:59 +05:30
rahul shukla	7779688d64	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-09-20 14:50:07 +05:30
rahul shukla	58331043e9	translatable package update	2019-09-20 14:49:53 +05:30
ghermans	79adb77380	Started improving the admin scss files	2019-09-20 02:40:25 +02:00
jitendra	e5d7124a0c	Fixed undefined variable exception in RefundRepository.php	2019-09-19 19:23:21 +05:30
jitendra	b0e9328090	Issue #1492 fixed	2019-09-19 18:57:58 +05:30
jitendra	600a4a9be0	Fixed Issue #1490	2019-09-19 17:24:56 +05:30
Jitendra Singh	fb43bb1752	Merge pull request #1488 from jitendra-webkul/refund ... Front order item grandtotal issue fixed	2019-09-19 15:48:39 +05:30
jitendra	46a29488d0	Front order item grandtotal issue fixed	2019-09-19 15:48:01 +05:30
Jitendra Singh	4c55c7c498	Merge pull request #1487 from jitendra-webkul/refund ... Issue #1486 fixed	2019-09-19 15:26:57 +05:30
jitendra	9db41abe13	Issue #1486 fixed	2019-09-19 15:26:07 +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	84969849d1	Added translations	2019-09-18 19:12:05 +05:30
jitendra	4e856d02e8	Redund status added	2019-09-18 19:06:25 +05:30
Jitendra Singh	f99b88f41f	Merge pull request #1477 from jitendra-webkul/refund ... Translation added	2019-09-18 19:03:27 +05:30
jitendra	382dee4da2	Translation added	2019-09-18 19:02:34 +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
rahul shukla	b13a82efaf	Issue #1258, Invoice creation after paypal	2019-09-17 16:22:53 +05:30
rahul shukla	5f8ea65835	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-09-17 12:36:59 +05:30
rahul shukla	b3651a135a	Issue #1461	2019-09-17 12:36:36 +05:30
Jitendra Singh	09b84d01f4	Merge pull request #1464 from rahulshukla-webkul/development ... Development	2019-09-16 19:16:50 +05:30
jitendra	49230b7071	Discount updted	2019-09-16 19:06:12 +05:30
Jitendra Singh	7a23c60ff0	Merge pull request #1465 from prashant-webkul/development ... Catalog Rule & Cart Rule: Fixed a bug in sku finding which was using like instead of equals ope…	2019-09-16 17:56:06 +05:30
Prashant Singh	c5aec7445d	Fixed a bug in sku finding which was using like instead of equals operator	2019-09-16 16:16:45 +05:30
rahul shukla	d3c68573d2	locale based error message	2019-09-16 13:53:56 +05:30
rahul shukla	4ddcaed81d	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-09-16 13:52:04 +05:30
rahul shukla	62b2a3f9c3	locale based error message	2019-09-16 13:51:47 +05:30
Jitendra Singh	58306e3252	Merge pull request #1448 from prateek-webkul/master ... Issue #1442 fixed	2019-09-16 10:19:58 +05:30
Jitendra Singh	9cc13c8ca6	Merge pull request #1462 from codeinnovers/master ... fix of issue #1460	2019-09-16 10:18:42 +05:30
CodeInnovers	3d03bc099c	fixed issue #1460	2019-09-15 23:33:35 +05:30
rahul shukla	53030b2a21	conditon added for checkout back button	2019-09-13 17:02:46 +05:30
rahul shukla	00b83b1398	change defualt payment method & oderder number in customer invoice	2019-09-13 15:54:05 +05:30
prateek srivastava	f4f5dd3b08	translation added	2019-09-13 15:41:38 +05:30
rahul shukla	48d86f05e8	Issue #1260 & mail logo	2019-09-13 15:04:29 +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
prateek srivastava	98792912d8	translation added	2019-09-13 12:50:06 +05:30
prateek srivastava	9794fc659e	Merge branch 'master' of https://github.com/bagisto/bagisto	2019-09-13 12:45:07 +05:30
Prashant Singh	685aedf528	getEligble items in action fixed as its was not working as boolean expression	2019-09-13 12:22:50 +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	5fd72de3a9	Issue #1249	2019-09-12 18:31:40 +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	9a443b6f3b	Merge pull request #1446 from prashant-webkul/development ... Command line installer fix	2019-09-12 15:52:58 +05:30
Prashant Singh	2c928ea25c	Fixed issue #1288	2019-09-12 15:23:29 +05:30
prateek srivastava	7a50802144	issue #1442 fixed	2019-09-12 14:06:38 +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	d5bbc0230d	Fixed issue #1288	2019-09-11 20:15:41 +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	e250bc0602	Tax not getting applied if only order is placed for virtual product and downloadable product or for both.	2019-09-11 12:31:25 +05:30
jitendra	1ce4dfea95	Merge cart issue fixed for downloadable product	2019-09-11 11:21:12 +05:30
Prashant Singh	b7d604ed31	Datagrid events unleashed	2019-09-11 03:18:32 +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
jitendra	128dde536e	Fixed issues of bundle, downloadable products	2019-09-10 19:22:11 +05:30
Prashant Singh	69e46a7ddd	Fixed translation issues in discount forms	2019-09-10 17:58:19 +05:30
jitendra	b5163fe9b3	Fixed Not getting sample link for file if url is selected	2019-09-10 15:06:34 +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
Prashant Singh	b4872b5c21	Missed a ! symbol in conditions object's attribute validation	2019-09-10 14:42:59 +05:30
Jitendra Singh	60a24016e9	Merge pull request #1431 from rahulshukla-webkul/development ... route check added for product flat update	2019-09-10 13:27:22 +05:30
rahul shukla	14773bbfa8	route check added for product flat update	2019-09-10 13:25:26 +05:30
Jitendra Singh	182c33305c	Merge pull request #1430 from rahulshukla-webkul/development ... Development	2019-09-10 13:13:05 +05:30
rahul shukla	403a9dda4c	wishlist icon is active when item is already in wishlist	2019-09-10 13:10:58 +05:30
Jitendra Singh	843fbb1922	Merge pull request #1422 from MattApril/master ... Change 'self' references inside models to 'static'. This fixes issues…	2019-09-10 12:45:51 +05:30
Jitendra Singh	a33a47753d	Merge pull request #1429 from prashant-webkul/development ... Development	2019-09-10 12:45:16 +05:30
rahul shukla	599bffdce7	wishlist icon is active when item is already in wiahlist	2019-09-10 12:35:52 +05:30
jitendra	6f3b95811b	Conflicts resolved	2019-09-10 12:29:19 +05:30
jitendra	98bd644e3e	Created command for updated min_price and max_price based on special_price	2019-09-10 12:18:01 +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	f49e25ea1f	Issue #1259	2019-09-09 18:34: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	9c174202c3	Refactoring convertXToProductID	2019-09-08 07:12:06 +05:30
Matt April	a8141c3fb3	Change 'self' references inside models to 'static'. This fixes issues when models are overriden, but he base class continues to references itself rather than the new model.	2019-09-07 20:14:27 -04:00
Prashant Singh	5651b4ed85	Cart rule form visual and translation changes	2019-09-08 02:50:11 +05:30
Prashant Singh	64f5bef341	Category filters : price filter was always active, turned active value to false	2019-09-08 01:37:04 +05:30
Prashant Singh	2efffafab1	Fixed translation issue in catalog rule delete notification	2019-09-07 18:59:04 +05:30
Prashant Singh	6a24ed723e	Rogue statement found in discount amount initialization	2019-09-07 16:29:33 +05:30
jitendra	49ca240675	Duplicate product in cart issue fixed	2019-09-07 15:38:49 +05:30
rahul shukla	4d13c0586a	Issue #1306	2019-09-07 15:18:24 +05:30
rahul shukla	b5ef9526de	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-09-07 15:09:00 +05:30
rahul shukla	8ce93244de	Issue #1263	2019-09-07 15:08:26 +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	8545d5ef3c	Unlimited download link issue fixed	2019-09-06 19:46:25 +05:30
jitendra	915fdd30c2	Fixed bugs	2019-09-06 19:38:54 +05:30
Prashant Singh	35d43b0b5a	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-09-06 19:08:38 +05:30
Prashant Singh	047a34e76b	Translation fixes and changes in cart rule datagrid	2019-09-06 19:04:57 +05:30
Jitendra Singh	bb602ba9b2	Merge pull request #1409 from prashant-webkul/development ... Fixes in checking json data of attribute conditions on server side	2019-09-06 18:50:47 +05:30
Prashant Singh	557a5b0143	Fixes in checking json data of attribute conditions on server side	2019-09-06 18:49:07 +05:30
Jitendra Singh	449f50ebfc	Merge pull request #1408 from prashant-webkul/development ... JSON data parsing trimmed down from two levels to a single level in Cart rule update form	2019-09-06 17:15:41 +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	d8403bf162	Fixed exchange rate exception	2019-09-06 15:48:59 +05:30
Jitendra Singh	ea59825efe	Merge pull request #1407 from prashant-webkul/development ... Edge case condition fixed in FixedAmount	2019-09-06 15:46:30 +05:30
Prashant Singh	b3472204c7	Edge case condition fixed in FixedAmount	2019-09-06 15:24:15 +05:30
Jitendra Singh	22b24c4c6e	Merge pull request #1406 from rahulshukla-webkul/development ... Development	2019-09-06 15:12:25 +05:30
rahul shukla	1cd6916c2b	issue #1351	2019-09-06 15:11:21 +05:30
rahul shukla	6e32b928ac	issue #1351	2019-09-06 15:08:17 +05:30
jitendra	0b22ca7ad1	Error added to accordian if closed	2019-09-06 14:00:10 +05:30
Prashant Singh	6ca065544c	Edge case fix for Cart Rule actions	2019-09-06 13:46:20 +05:30
Prashant Singh	c9cd73b67e	Fixed edge case conditions and a bug in application of couponable rule	2019-09-06 13:38:05 +05:30
Prashant Singh	44c5ebc4f8	refactoring	2019-09-06 12:41:46 +05:30
Prashant Singh	adad426228	missed a semicolon	2019-09-06 12:40:52 +05:30
Prashant Singh	2ac298cb68	Refactoring cart rule actions	2019-09-06 12:39:25 +05:30
Prashant Singh	5e47c5b2af	More refactoring of discount assign to cart item	2019-09-06 12:37:46 +05:30
Prashant Singh	9c23179d6e	Whole cart to fixed and whole cart to percent eligible items conditions corrected	2019-09-06 12:29:16 +05:30
jitendra	7b73abac95	Order view blade updated	2019-09-06 11:43:14 +05:30
Jitendra Singh	679cb01997	Merge pull request #1398 from rahulshukla-webkul/development ... issue #1226	2019-09-06 11:16:18 +05:30
Prashant Singh	4a3bfd6e2c	Refactored actions of cart rules	2019-09-06 05:45:16 +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	256556a872	Fixed issue #1391	2019-09-05 19:51:02 +05:30
jitendra	aae2872085	Fixed typo error in Grouped type class	2019-09-05 19:30:17 +05:30
Prashant Singh	8a6b5d4723	Assets compiled for production	2019-09-05 18:37:58 +05:30
rahul shukla	7d9c785f7d	issue #1226	2019-09-05 18:06:51 +05:30
jitendra	40b7126d1b	Configurable qty issue fixed	2019-09-05 18:01:06 +05:30
jitendra	7952e57e41	Cart page css updated	2019-09-05 17:39:10 +05:30
jitendra	75e294e1c5	Cart page quantity changer updated	2019-09-05 17:31:09 +05:30
jitendra	0f2876a1da	Conflict resolved in ChannelController	2019-09-05 17:01:17 +05:30
jitendra	7da7c93a79	Search products issue fixed	2019-09-05 16:58:55 +05:30
jitendra	27d3d3f93e	Configuration product creation issue fixed	2019-09-05 16:50:16 +05:30
rahul shukla	11391b2fd8	conflict resolve	2019-09-05 16:45:39 +05:30
rahul shukla	ddf754e2a7	Issue #1384	2019-09-05 16:41:26 +05:30
jitendra	55fa22af6c	Virtual product add to cart issue fixed	2019-09-05 15:36:28 +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	94290e6742	Option mission message added for configurable, group and bundle products during add cart	2019-09-04 17:33:55 +05:30
jitendra	55f888c1df	Shop tranlation case fixed	2019-09-04 17:23:53 +05:30
jitendra	136c03ee3a	Layered navigation price filter changed based on min_price and max_price	2019-09-04 16:52:38 +05:30
jitendra	3c5a2792e3	Removed configurable checks and deleted unwanted files	2019-09-04 16:23:05 +05:30