1008 Commits

Author	SHA1	Message	Date
Jitendra Singh	9ccc8b26c5	Merge pull request #2187 from jitendra-webkul/1.0 ... Issue #2182 fixed	2020-01-28 19:03:14 +05:30
rahul shukla	ff52bc6708	change log updated and Issue #2182	2020-01-28 18:09:22 +05:30
rahul shukla	016c3a0ea7	change log updated and Issue #2182	2020-01-28 18:07:48 +05:30
Jitendra Singh	2e6d7aff95	Issue #2182 fixed	2020-01-28 18:01:10 +05:30
Jitendra Singh	ee7a68ba77	Merge pull request #2184 from jitendra-webkul/1.0 ... Issue #2183 fixed	2020-01-28 17:44:54 +05:30
Jitendra Singh	96b607d5f6	Issue #2183 fixed	2020-01-28 17:40:48 +05:30
Jitendra Singh	321dc84a91	Merge pull request #2179 from jitendra-webkul/1.0 ... Shipping discount issue fixed during refund creation	2020-01-28 17:37:20 +05:30
Jitendra Singh	efc4a6b8c3	Issue #2177 fixed	2020-01-28 17:33:08 +05:30
Jitendra Singh	7cf72f16fe	Issue #2177 fixed	2020-01-28 17:28:58 +05:30
Jitendra Singh	4b376b5ed7	Merge pull request #2027 from Haendlerbund/introduce-company-name-and-sales-tax-id-columns ... Introduce optional company name and sales tax id columns to customer addresses	2020-01-28 17:00:36 +05:30
Jitendra Singh	c9769717d0	Issue #2173 fixed	2020-01-28 15:18:51 +05:30
Jitendra Singh	64fd205298	Issue #2168 fixed	2020-01-28 13:47:44 +05:30
Jitendra Singh	7b32b2e516	Issues #1189, #1148 fixed	2020-01-28 13:18:30 +05:30
Herbert Maschke	20c2232710	remove |alpha_spaces validation from customer addresses city	2020-01-27 12:00:25 +01:00
Herbert Maschke	511d812333	Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns	2020-01-27 11:40:18 +01:00
rahul shukla	cbaebaa388	query optimization and hide of expose model	2020-01-25 17:00:31 +05:30
Herbert Maschke	e948b30e35	Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns	2020-01-24 15:13:16 +01:00
Jitendra Singh	f80109ba8b	Issue #2124 fixed	2020-01-24 16:11:17 +05:30
MonaHartdegen	ccc2188ef1	merge bagisto master	2020-01-24 10:22:15 +01:00
hb-monah	f6834b5196	Merge branch 'master' into new-bagisto-master	2020-01-24 10:16:11 +01:00
Jitendra Singh	4a38df3279	Fixed letter case issue in translation	2020-01-24 14:04:29 +05:30
Jitendra Singh	d1ab679e3e	Issue #2128 fixed	2020-01-24 13:54:54 +05:30
Jitendra Singh	d5c0891055	Issue #2128 fixed	2020-01-24 13:50:40 +05:30
Herbert Maschke	5ebb67dd81	Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns	2020-01-23 14:18:17 +01:00
Jitendra Singh	da4980bfbe	Merge pull request #2116 from Haendlerbund/issue-1183/guest-checkout-configuration ... Issue 1183/guest checkout configuration	2020-01-23 11:51:08 +05:30
Herbert Maschke	4629a3bb0f	Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns	2020-01-22 14:59:18 +01:00
rahul shukla	0337959327	merge conflicts	2020-01-22 18:50:01 +05:30
rahul shukla	01f0fc9a57	2089 and updated codeception dependencies	2020-01-22 18:44:53 +05:30
Jitendra Singh	80a2ddb88d	Issue #1397 fixed	2020-01-22 14:58:39 +05:30
Florian Bosdorff	61d9b59e5f	Merge master into issue-1183/guest-checkout-configuration	2020-01-22 08:10:45 +01:00
rahulshukla-webkul	8bd9f0bc9d	Revert "Resolve #1183 guest checkout configuration"	2020-01-22 11:58:56 +05:30
Jitendra Singh	3aec5047f6	Merge pull request #2072 from Haendlerbund/issue-1183/guest-checkout-configuration ... Resolve #1183 guest checkout configuration	2020-01-22 11:32:45 +05:30
Herbert Maschke	4596a77c07	Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns	2020-01-21 11:36:26 +01:00
rahul shukla	e3db0b164c	conflict resolve	2020-01-21 13:24:19 +05:30
Annika Wolff	132dd6c0f0	introduce guest checkout configuration	2020-01-17 14:42:47 +01:00
Jitendra Singh	8612bd1385	Merge pull request #2069 from jitendra-webkul/1.0 ... Fixed cms textarea field issue	2020-01-17 14:58:27 +05:30
Jitendra Singh	6535afb52c	Fixed cms textarea field issue	2020-01-17 14:57:36 +05:30
Jitendra Singh	880868738a	Merge pull request #2067 from jitendra-webkul/1.0 ... Issue #2058 fixed	2020-01-17 12:06:06 +05:30
Jitendra Singh	7d7e86e85c	Issue #2058 fixed	2020-01-17 12:05:28 +05:30
Annika Wolff	976d19cd74	Merge Bagisto master into Haendlerbund/Bagisto master (#14) ... * added bagisto:install command * updates for uploading attachments * Issue #1808 * Issue #1779 fixed * Issue #2045 * Issue #1971 * Issue #1779 fixed * fire event on creating/updating slider * Issue #1863 fixed * Issue #1863 fixed * Removed ')' in page edit blade * Issue #2054 fixed * Issue #2054 fixed * Added mail from name field in .env.example file, Issue #2051 Co-authored-by: Sarthak Shrivastava <sarthak@bitfumes.com> Co-authored-by: Shubham Mehrotra <shubhammehrotra.symfony@webkul.com> Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com> Co-authored-by: rahulshukla-webkul <42834394+rahulshukla-webkul@users.noreply.github.com>	2020-01-16 13:54:18 +01:00
shubhammehrotra.symfony@webkul.com	0468b7fa58	pass locale data in view_render_event	2020-01-16 12:37:52 +05:30
Herbert Maschke	e0c2814f2e	Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns	2020-01-15 15:29:55 +01:00
Herbert Maschke	3ab9b62028	add vat_id to AddressDataGrid.php	2020-01-15 14:17:13 +01:00
Jitendra Singh	d80a3c7a5f	Merge pull request #2059 from jitendra-webkul/1.0 ... Removed ')' in page edit blade	2020-01-15 18:42:24 +05:30
Jitendra Singh	b552aba450	Removed ')' in page edit blade	2020-01-15 18:40:57 +05:30
Herbert Maschke	57aa522282	introduce company_name and vat_id also in shop admin backend	2020-01-15 14:02:51 +01:00
Jitendra Singh	915213711d	Merge pull request #2057 from jitendra-webkul/1.0 ... Issue #1863 fixed	2020-01-15 17:46:03 +05:30
Jitendra Singh	1e73cc9bc8	Issue #1863 fixed	2020-01-15 17:45:15 +05:30
Jitendra Singh	2049c45b0f	Merge pull request #2056 from jitendra-webkul/1.0 ... Issue #1863 fixed	2020-01-15 17:09:20 +05:30
Jitendra Singh	b4319e1f38	Issue #1863 fixed	2020-01-15 17:08:37 +05:30
Jitendra Singh	0e2b8163e6	Merge pull request #2047 from jitendra-webkul/1.0 ... Issue #1779 fixed	2020-01-14 13:24:26 +05:30
Jitendra Singh	05a619d39b	Issue #1779 fixed	2020-01-14 13:23:49 +05:30
MonaHartdegen	4381d54029	added blank lines to improve readability	2020-01-13 17:05:32 +01:00
MonaHartdegen	d225ddf04a	added channel and locale to dropdown to product data grid	2020-01-13 16:50:28 +01:00
shubhammehrotra.symfony@webkul.com	2cf8af4815	updates for uploading attachments	2020-01-13 19:38:04 +05:30
Jitendra Singh	9faef742d7	Issue #1845 fixed	2020-01-10 13:53:11 +05:30
Jitendra Singh	55df0ad02f	Merge pull request #2013 from jitendra-webkul/1.0 ... Issues #1997, #1994 fixed	2020-01-08 17:02:39 +05:30
Jitendra Singh	ca0f8bca49	Issues #1997, #1994 fixed	2020-01-08 17:01:50 +05:30
Jitendra Singh	a0c02e6c4a	Merge pull request #2011 from jitendra-webkul/1.0 ... Tax rates for all states	2020-01-07 19:37:42 +05:30
jitendra	fbfd710f1c	Tax rates for all states	2020-01-07 17:48:43 +05:30
Jitendra Singh	ebddf578b1	Merge pull request #1843 from Haendlerbund/feature/update-npm-assets ... update npm assets	2020-01-07 15:34:29 +05:30
Jitendra Singh	d438d1b4ed	Merge pull request #2006 from jitendra-webkul/1.0 ... Catalog rule and cart rule implemented for all product types	2020-01-06 17:52:30 +05:30
rahul shukla	7f3e3001b5	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-01-03 18:05:24 +05:30
rahul shukla	97c63ad035	review missing variavle and admin footer text	2020-01-03 18:05:14 +05:30
rahul shukla	25dff89054	translation added for locales	2020-01-03 16:12:23 +05:30
rahul shukla	9b120a978d	foter text change	2020-01-03 15:57:43 +05:30
rahul shukla	297165859f	foter text change	2020-01-03 15:35:56 +05:30
rahul shukla	4b2088e66e	upgrade to laravel 6	2019-12-30 17:10:38 +05:30
peternuernberger	af28c35bf7	Merge branch 'master' of https://github.com/bagisto/bagisto into feature/update-npm-assets	2019-12-30 09:32:49 +01:00
jitendra	7aba45486f	Indexes created for all product types	2019-12-25 19:57:05 +05:30
Jitendra Singh	a3aa23fcbc	Merge pull request #1902 from Haendlerbund/allow-empty-option-for-attributes ... Allow empty option for attributes	2019-12-24 13:12:22 +05:30
jitendra	795561ea58	Made all changes for discount packages	2019-12-21 16:00:22 +05:30
jitendra	2d0b26d78a	Added changes on core packages for discount	2019-12-21 13:01:16 +05:30
jitendra	2380c1b597	Merged with master	2019-12-21 10:58:46 +05:30
jitendra	513b07e4cf	Added new cart rule and catalog rule	2019-12-21 10:55:32 +05:30
rahul shukla	642d99a63c	Issue #1792	2019-12-19 17:42:12 +05:30
rahul shukla	2f0338bda3	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-12-19 16:47:20 +05:30
rahul shukla	10d4613446	Issue #1879 and #1880	2019-12-19 16:47:00 +05:30
KevinLaveto	02d42d6186	Multiple type file error	2019-12-18 11:18:57 +01:00
peternuernberger	d92bb0ea72	Merge branch 'bagisto/master' into feature/update-npm-assets	2019-12-18 09:41:40 +01:00
rahul shukla	b033901678	Issue #1897, added configuartion for live account in paypal	2019-12-18 11:42:07 +05:30
MonaHartdegen	5d9923bf30	improved usage of var/let/const; fixed error on removing row	2019-12-16 15:42:32 +01:00
MonaHartdegen	2b0385c14e	Merge remote-tracking branch 'bagisto/master' into allow-empty-option-for-attributes	2019-12-13 14:12:14 +01:00
MonaHartdegen	2feb9114bd	removed remnants of laravel-web-console from development view and language files	2019-12-12 13:23:52 +01:00
MonaHartdegen	7b1378fded	added checkbox to add empty (default) option for attributes; only show attribute labels (not admin names) on product detail view	2019-12-12 10:32:51 +01:00
Jitendra Singh	3eb7d862b1	Merge pull request #1798 from Haendlerbund/configurables-with-varying-variant-types-PR-1782 ... Configurables with varying variant types - Enhancement	2019-12-04 18:58:59 +05:30
peternuernberger	b066833068	Merge remote-tracking branch 'bagisto-hb/master' into feature/update-npm-assets	2019-12-04 11:41:17 +01:00
Jitendra Singh	b7b3441607	Merge pull request #1775 from thyseus/introduce-order-item-events ... introduce 'checkout.order.orderitem.save.[before/after]' events	2019-12-03 14:39:11 +05:30
peternuernberger	c1f648a17f	excluded import statements	2019-12-02 11:41:02 +01:00
peternuernberger	6c398f45bd	updated some dependencies	2019-11-29 16:46:35 +01:00
Annika Wolff	71e8e687c2	PR 1782 Enhancement: Let variants be of other types than simple	2019-11-26 13:32:42 +01:00
Jitendra Singh	840290f0bb	Merge pull request #1782 from Haendlerbund/introduce-product-type-helper ... introduce ProductType Helper	2019-11-22 17:05:21 +05:30
Herbert	59d2a77d7d	two more view_render_events in sales order tabs	2019-11-22 09:46:38 +01:00
Annika Wolff	9a43776cc0	introduce ProductType Helper	2019-11-21 16:56:21 +01:00
Jitendra Singh	e3d9377dc4	Merge pull request #1770 from thyseus/introduce-two-render-events ... introduce two view_render_event hooks in product edit form	2019-11-20 13:52:25 +05:30
Herbert	c9f97df44c	also pass $product into view_render_event()	2019-11-15 11:53:38 +01:00
Herbert	2a49c926d9	introduce two view_render_event hooks in product edit form	2019-11-15 10:01:26 +01:00
Alexey	072eddb397	Updated multilang	2019-11-13 01:30:09 +04:00
Alexey	25ea011960	Adding Laravel Web Console to the Bagisto	2019-11-13 01:15:56 +04:00
jitendra	257392cd2a	Issue #1118 fixed	2019-11-07 17:39:59 +05:30
jitendra	65d4e8698a	Issue #924 fixed	2019-11-07 15:42:34 +05:30
jitendra	faef8adcdb	Issue #1745 fixed'	2019-11-07 12:50:40 +05:30
jitendra	19b8de0ffb	Issue #1167 fixed	2019-11-06 13:54:57 +05:30
jitendra	62d5fb1c15	Issue #1704 fixed (Update channel 'Base Curreny' label to 'Default Currency')	2019-11-05 16:53:46 +05:30
jitendra	08e87ccf8d	Issue #1559 fixed	2019-11-05 16:23:43 +05:30
Jitendra Singh	65a7008452	Merge pull request #1734 from rahulshukla-webkul/development ... Issue #1733	2019-11-05 12:02:19 +05:30
rahul shukla	2f82ba1f95	Issue #1733	2019-11-05 11:20:28 +05:30
jitendra	c0a4e2fe26	Issue #1721 fixed	2019-10-31 19:06:52 +05:30
Jitendra Singh	3cbbbbe340	Merge pull request #1481 from codeinnovers/master ... fix of issue #1480	2019-10-24 18:51:40 +05:30
Jitendra Singh	4fcff1e111	Merge pull request #1650 from shivam-webkul/shivam ... [Bug Fixed #1219 ] & [Enhancement #1182] Fixed	2019-10-24 10:36:53 +05:30
Jitendra Singh	c0162e6491	Merge pull request #1689 from jitendra-webkul/jitendra ... Issue #1686 fixed	2019-10-23 13:50:51 +05:30
jitendra	0824a47d1d	Issue #1686 fixed	2019-10-23 13:49:40 +05:30
Ruman Saleem	b8967a5c22	Replace hardcoded 'Bagisto' with application name - fixes #1614	2019-10-19 13:51:00 +05:30
Jitendra Singh	bfcd52618b	Merge pull request #1659 from vivek-webkul/patch-7 ... [Enhancement #1232 : Added option for showing records per page in con…	2019-10-18 20:14:57 +05:30
shivam kumar	fd8a1fb851	#1182 fixed	2019-10-18 18:43:38 +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
Vivek	5b6ce4a6ab	[Enhancement #1232 : Added option for showing records per page in configuration.]	2019-10-18 17:07:57 +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
jitendra	f92b58be65	Issue #1552 fixed	2019-10-14 14:47:47 +05:30
jitendra	b24c2507e8	Issue #1250 fixed	2019-10-14 12:22:58 +05:30
jitendra	660f4173d1	Issue #1552 fixed	2019-10-11 12:32:44 +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
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
Glenn Hermans	cb9fd50a6a	Fixed typo	2019-09-23 14:33:54 +02:00
jitendra	6cf1879920	Dashboard sales calculation issue fixed	2019-09-23 15:26:21 +05:30
jitendra	1bee8c0dde	Issue #1492 fixed	2019-09-23 12:50:40 +05:30
jitendra	04ef6a6882	Item status added in refund create page items table	2019-09-20 19:45:52 +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	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	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
Prashant Singh	e6104668e0	Fixed a translation typo in create cart rule form	2019-09-11 13:52:24 +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	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	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	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	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
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
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
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	45f1ea4b83	Merge with master	2019-09-04 15:05:03 +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
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	8994cd0426	Base sync and webfont fixes	2019-08-24 16:09:22 +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	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
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	2a15488f24	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2019-08-20 16:47: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
jitendra	e2bd18e916	Resolved conflicts	2019-08-19 16:01:38 +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	aca7b4c6c7	Catalog rule tie breaker content in progress	2019-08-17 20:18:39 +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
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
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
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
Jitendra Singh	a849ae9fc0	Merge pull request #1272 from prashant-webkul/development ... Development	2019-08-09 19:12:44 +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