1430 Commits

Author	SHA1	Message	Date
Pranshu Tomar	b335321c45	Resolve conflicts	2020-05-20 12:22:31 +05:30
Pranshu Tomar	1dc4afc4ee	Issue #3095 fixed	2020-05-20 12:21:16 +05:30
rahulshukla-home	15592aa8b1	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-05-20 12:15:36 +05:30
rahulshukla-home	07db69b2f6	Issue #3095	2020-05-20 12:15:19 +05:30
Jitendra Singh	b4e11a842b	Merge pull request #3092 from rahulcs0082/development ... Issue #3089	2020-05-19 12:37:57 +05:30
Jitendra Singh	b520af03c3	Merge pull request #3091 from jitendra-webkul/1.0 ... SEO optimization added for velocity and og tag added	2020-05-19 12:36:31 +05:30
rahulshukla-home	74a8b57801	Issue #3089	2020-05-19 12:25:40 +05:30
Pranshu Tomar	c63d1d97f3	SEO optimization added for velocity and og tag added	2020-05-19 11:13:29 +05:30
Jitendra Singh	84aede5cef	Merge pull request #3088 from jitendra-webkul/1.0 ... Rich snippet feature added for products and category	2020-05-18 23:08:33 +05:30
Pranshu Tomar	072b56930b	Rich snippet feature added for products and category	2020-05-18 23:04:09 +05:30
Jitendra Singh	576c3af7ae	Merge pull request #3086 from rahulcs0082/development ... Issue #3079	2020-05-18 20:49:33 +05:30
rahulshukla-home	5099687ebf	Issue #3079	2020-05-18 18:47:00 +05:30
Jitendra Singh	2deb7aaf77	Merge pull request #3071 from rahulcs0082/development ... change translation for #2794	2020-05-15 17:02:37 +05:30
Jitendra Singh	2ea98d4089	Merge pull request #3064 from kmso-de/feature/german-translation ... Feature/german translation	2020-05-15 17:02:08 +05:30
rahulshukla-home	64ca06dc1d	change translation for #2794	2020-05-15 13:03:37 +05:30
Jan Bickel	755874e0ae	removed Validator.localize('de', de) & Vue.use(VeeValidate)	2020-05-15 07:51:53 +02:00
Jitendra Singh	c26a759fbc	Added polish language	2020-05-13 20:22:25 +05:30
Roman Berneburg	03f8b6dc18	translations	2020-05-13 16:51:15 +02:00
Roman Berneburg	f179925e5d	translations "to"	2020-05-13 16:51:09 +02:00
Roman Berneburg	05c3012eda	german translations for Customer, Admin, Shop	2020-05-13 16:49:49 +02:00
Jan Bickel	b1c3f7f3d0	german translations shop and admin	2020-05-13 16:49:40 +02:00
Jan Bickel	64e5f19861	german translations	2020-05-13 16:49:17 +02:00
Jan Bickel	a8f8ecc23f	added: files for translation	2020-05-13 16:44:53 +02:00
Jitendra Singh	f3a49b35de	Merge pull request #3033 from Haendlerbund/flexible-exception-handling ... Improve exception handler	2020-05-13 12:53:44 +05:30
Jitendra Singh	7a84d81880	Merge pull request #3046 from rahulcs0082/development ... Development	2020-05-13 12:51:44 +05:30
rahulshukla-home	72a1866b8d	Issue #3044	2020-05-12 12:44:34 +05:30
ottopodo	9229e36175	Italian Translations	2020-05-11 19:19:28 +02:00
Florian Bosdorff	85ef3fe69b	remove unused exception handler; make exception handler extendable	2020-05-09 12:21:54 +02:00
Jitendra Singh	ad306f7c3f	Merge pull request #3017 from jitendra-webkul/1.0 ... Order comment email sent to customer	2020-05-07 14:24:57 +05:30
Pranshu Tomar	0893513b60	Order comment email sent to customer	2020-05-07 13:58:14 +05:30
Pranshu Tomar	16fcb02502	Removed unnecessary code from CartController	2020-04-28 19:32:50 +05:30
Pranshu Tomar	559954e88d	Issue #2954 fixed	2020-04-28 19:22:30 +05:30
rahulshukla-home	abac3a297f	max price issue in category	2020-04-28 14:40:08 +05:30
rahulshukla-home	837c5d44fa	fix category issue and change country,state order	2020-04-28 08:14:53 +05:30
Jitendra Singh	b3e18c063e	Merge pull request #2946 from jitendra-webkul/1.0 ... Cancel feature added in customer order	2020-04-27 13:14:41 +05:30
Pranshu Tomar	579490779c	Cancel feature added in customer order	2020-04-27 12:56:09 +05:30
Jitendra Singh	30061b8f8d	Merge pull request #2924 from cagartner/added_new_events_to_core ... Added new events to customer update and checkou, fixed some view rend…	2020-04-27 11:31:09 +05:30
José María Campaña	f4b6762589	Add Japanese translation	2020-04-22 15:23:00 -05:00
Carlos Augusto Gartner	716345e378	Added new events to customer update and checkou, fixed some view render events and pt_BR grammar	2020-04-21 18:18:34 -03:00
rahulshukla-home	d21e027db3	Issue #2721	2020-04-17 17:53:23 +05:30
rahulshukla-home	b65601ecd0	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-04-13 23:04:02 +05:30
rahulshukla-home	b88e239ad2	Issue #2543 fixed	2020-04-13 23:03:45 +05:30
Carlos Augusto Gartner	e293fbfce2	Added more view_render_events in the customer account views	2020-04-12 21:36:37 -03:00
rahulshukla-home	a1fa3f64e0	Issue #2794	2020-04-09 17:31:00 +05:30
Shubham Mehrotra	eda27956a5	margin added between wishlist icon and compare icon	2020-04-08 11:31:39 +05:30
Shubham Mehrotra	0c0dc5da60	checkout page issue	2020-04-02 17:13:36 +05:30
Shubham Mehrotra	e259d6b8bf	#2785	2020-04-01 17:58:10 +05:30
Shubham Mehrotra	965f9ae806	#2776	2020-03-27 12:13:48 +05:30
Shubham Mehrotra	1b14466d19	#2779 #2778 #2775	2020-03-27 12:02:03 +05:30
Jitendra Singh	6902057096	Merge pull request #2767 from shubhwebkul/patch-1 ... compare products in default theme	2020-03-26 13:27:11 +05:30
Carlos Augusto Gartner	4f20e888bf	Added new translations for shop and velocity	2020-03-25 14:29:44 -03:00
Shubham Mehrotra	15c4e0686b	compare products in default theme	2020-03-25 13:10:33 +05:30
Pranshu Tomar	b1049ac3ea	Conflicts resolved	2020-03-24 16:23:42 +05:30
Pranshu Tomar	ded3591ea6	Issue #2670 fixed	2020-03-24 15:41:43 +05:30
rahulshukla-home	f19206ab6e	Issue #2593 fixed	2020-03-24 11:26:03 +05:30
Pranshu Tomar	6b3a30645c	Removed commented code fom cart controller	2020-03-24 11:03:36 +05:30
Pranshu Tomar	2334cf4cc7	Issue #2724 fixed	2020-03-24 10:52:45 +05:30
Shubham Mehrotra	2ccf0271a2	#2713	2020-03-23 18:43:12 +05:30
Jitendra Singh	28f1ab7afe	Merged with master	2020-03-19 19:18:59 +05:30
mohd asif	a1124fc7b6	resolved conflicts	2020-03-19 18:07:25 +05:30
Jitendra Singh	5902f0050c	Merge pull request #2681 from vivek-webkul/patch-41 ... [Updated: Shop & admin email setting added in configuration.]	2020-03-19 15:36:27 +05:30
rahul shukla	7174ccbfd0	Issue #2549	2020-03-18 18:48:02 +05:30
rahul shukla	d9a391f1cc	Issue #2593 fixed	2020-03-18 16:15:33 +05:30
Jitendra Singh	663a679a5d	Merge pull request #2588 from Haendlerbund/order-workflow-improvements ... Order workflow improvements and tests	2020-03-18 14:50:48 +05:30
Vivek	ad76426fb5	[Updated: Shop & admin email setting added in configuration.]	2020-03-17 16:10:47 +05:30
Jitendra Singh	bf5ad13dac	Issue #2672 fixed	2020-03-17 12:25:04 +05:30
mohd asif	d2caa2af98	resolved commit	2020-03-17 09:36:45 +05:30
mohd asif	255b50454b	updated missing translation for the Persia for the shop front	2020-03-16 19:09:38 +05:30
mohd asif	8ac262ffa8	updated the missing translation for shop front for arabic and removed repated translation from english	2020-03-16 18:09:32 +05:30
mohd asif	121dc5f395	updated translation for the shop package for arabic and persia	2020-03-13 13:56:39 +05:30
Herbert Maschke	c14b1c8946	Merge branch 'bagisto/master' into order-workflow-improvements	2020-03-12 16:26:27 +01:00
mohd asif	9e6ed6f09d	fixed translation in all packages	2020-03-12 13:32:56 +05:30
Jitendra Singh	6063c113bf	Removed static text from shop datagrid	2020-03-11 12:15:03 +05:30
Herbert Maschke	7a3a1726bc	Merge branch 'bagisto/master' into order-workflow-improvements	2020-03-06 15:50:26 +01:00
Jitendra Singh	010ae65691	Resolved conflicts	2020-03-06 16:02:52 +05:30
Jitendra Singh	10db1838f2	Removed author information from every class	2020-03-05 19:28:42 +05:30
Jitendra Singh	d0fa3b2705	Replace DB alias with complete class name	2020-03-05 19:11:53 +05:30
Jitendra Singh	92261d4214	Improved comments in code	2020-03-05 19:07:08 +05:30
Jitendra Singh	41e06d5dc5	Improved code style	2020-03-04 12:02:53 +05:30
shubhammehrotra.symfony@webkul.com	d09c4b0ea7	misc. updates	2020-03-03 20:31:43 +05:30
Jitendra Singh	45ec4532fa	Resolved conflicts	2020-03-03 15:59:47 +05:30
shubhammehrotra.symfony@webkul.com	8a1ab165da	ajaxified add to cart, modified controllers	2020-03-02 16:54:38 +05:30
Herbert Maschke	895978e600	finish testCheckoutAsCustomer	2020-03-02 09:08:51 +01:00
Shubham Mehrotra	ab612d064f	misc. bug fixes	2020-02-29 15:35:50 +05:30
shubhammehrotra.symfony@webkul.com	a752e58ed1	resolved issues	2020-02-28 18:59:15 +05:30
Jitendra Singh	131e3f1e18	Quantity box checks added for booking product	2020-02-28 13:00:29 +05:30
Jitendra Singh	05be7a070a	Improved code style	2020-02-27 13:33:03 +05:30
Jitendra Singh	0f42e8ff8f	Resolved conflicts	2020-02-27 12:07:20 +05:30
rahul shukla	e37b4fed14	locale messgaes improvement	2020-02-26 16:34:41 +05:30
Jitendra Singh	91064cd0bc	Quantity availability check implemented for default booking	2020-02-26 13:11:24 +05:30
Jitendra Singh	d5b54b393b	Event booking type add cart updated	2020-02-25 16:42:32 +05:30
Jitendra Singh	7d2ff93f43	Resolve conflicts	2020-02-25 11:44:34 +05:30
Jitendra Singh	9eb7113aa4	Fixed else if indentation in javascript	2020-02-24 18:53:34 +05:30
Jitendra Singh	195eb82802	Replace else if with elseif	2020-02-24 17:49:12 +05:30
Jitendra Singh	c52e19d53d	Merge pull request #2546 from rahulshukla-webkul/development ... Development	2020-02-24 13:47:58 +05:30
rahul shukla	8fa7bc8c10	Issue #2451 fixed	2020-02-24 13:45:11 +05:30
Jitendra Singh	e552183e9a	Merge pull request #2523 from ghermans/dutch ... #2512 - Dutch translations and removing static text	2020-02-24 13:34:27 +05:30
Glenn Hermans	6f6f1c66a5	translations	2020-02-21 17:09:26 +01:00
Jitendra Singh	5c696f8d00	Resolved conflicts	2020-02-21 19:36:17 +05:30
Glenn Hermans	0f233f08fe	Updating translations	2020-02-21 12:36:26 +01:00
rahul shukla	253ac52cc1	post code in shipping address	2020-02-21 16:56:57 +05:30
Glenn Hermans	fc84c4a047	#2512 - Added more shop translations	2020-02-21 11:23:46 +01:00
Jitendra Singh	24e69e2cd9	Merge pull request #2247 from Haendlerbund/fix-tax-handling ... Fix tax handling	2020-02-21 15:20:35 +05:30
rahul shukla	a4b3316b29	Issue #2533 fixed and change log updated	2020-02-21 14:41:42 +05:30
ghermans	d4ce50da9f	#2512 more translations	2020-02-21 09:44:12 +01:00
ghermans	283c6e437c	#2512 starting to translate the shop files	2020-02-21 09:30:04 +01:00
Annika Wolff	d50510a626	resolve merge issue, add type hints in Cart helper function	2020-02-21 08:36:52 +01:00
Annika Wolff	154a933dc6	Merge branch 'master' into fix-tax-handling	2020-02-20 17:19:28 +01:00
rahul shukla	66ba69586d	filter issue in category	2020-02-20 16:31:46 +05:30
rahul shukla	6714b1d7c8	Issue #2468	2020-02-20 13:13:02 +05:30
Jitendra Singh	5f6e3be796	Improved shop package code style	2020-02-20 12:35:51 +05:30
rahul shukla	38f1251568	Issue #2468	2020-02-20 12:30:00 +05:30
prateek srivastava	e1cdff607b	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-02-19 16:26:06 +05:30
rahul shukla	86e31346d0	remove console	2020-02-19 16:17:31 +05:30
rahul shukla	d62b61b19c	Issue #2463	2020-02-19 16:12:54 +05:30
prateek srivastava	6052b6355d	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-02-19 15:42:35 +05:30
prateek srivastava	74251ef2d2	issue 2470 fixed	2020-02-19 15:42:00 +05:30
rahul shukla	33f882209a	code improvement	2020-02-19 15:32:52 +05:30
rahul shukla	b6cdcad01d	change depandeciy of slider component, hide attribute with option	2020-02-19 15:03:57 +05:30
Jitendra Singh	4801c2f371	Merge pull request #2497 from SteffenMahler/patch-1 ... Update CartController.php	2020-02-18 18:49:54 +05:30
SteffenMahler	b58ba0955e	Update CartController.php ... It would be very useful to have an event dispatched, if the "Buy Now" button of a product was clicked.	2020-02-18 14:08:02 +01:00
rahul shukla	bd82e011c0	Issue #2490	2020-02-18 18:34:32 +05:30
rahul shukla	8d2662b996	Issue #2467	2020-02-17 19:36:31 +05:30
rahul shukla	9d80f73319	Issue #2449	2020-02-13 14:41:40 +05:30
Jitendra Singh	2fce1383ce	Merge pull request #2413 from vivek-webkul/patch-28 ... [Fixed: Issue #2410 has been resolved.]	2020-02-11 11:09:58 +05:30
Vivek Sharma	ffea130723	[Fixed: Issue #2410 has been resolved.]	2020-02-10 13:28:22 +05:30
shubhammehrotra.symfony@webkul.com	6f37c37dd1	resolved conflicts	2020-02-10 12:25:22 +05:30
Steffen Mahler	59f1956a21	merge bagisto/master into fix-tax-handling	2020-02-08 20:48:27 +01:00
shubhammehrotra.symfony@webkul.com	8fc51a7be4	rtl updates	2020-02-08 19:00:58 +05:30
Vivek Sharma	d2a2b2a8c6	[Fixed: issue #2384 has been resolved.]	2020-02-08 12:59:08 +05:30
Jitendra Singh	3c11496274	Merge pull request #2351 from aayush-webkul/master ... Added old() function in Admin and Shop package	2020-02-07 15:53:24 +05:30
Steffen Mahler	b94fc9fc8c	merge master and resolve conflicts	2020-02-07 10:44:04 +01:00
Jitendra Singh	88cce4b262	Merge pull request #2368 from jitendra-webkul/1.0 ... Issue #2360 fixed	2020-02-07 14:00:05 +05:30
Jitendra Singh	32180aee33	Issue #2360 fixed	2020-02-07 13:59:14 +05:30
Aayush Bhatt	7fc6fd7d3d	old() function implimented in admin and shop package	2020-02-06 22:04:33 +05:30
Aayush Bhatt	3b74ee4129	Merge https://github.com/bagisto/bagisto	2020-02-06 20:22:38 +05:30
Aayush Bhatt	d9f2f1ab3d	Duplicate old() functioon fixed and working in admin panel	2020-02-06 20:07:26 +05:30
Jitendra Singh	4568703be2	Merge pull request #2347 from jitendra-webkul/1.0 ... Issue #2335 fixed	2020-02-06 19:22:18 +05:30
Jitendra Singh	be79142a7b	Issue #2335 fixed	2020-02-06 19:21:24 +05:30
Jitendra Singh	322468e200	Merge pull request #2333 from jitendra-webkul/1.0 ... Issue #2142 fixed	2020-02-06 17:19:45 +05:30
Jitendra Singh	4f71d4727b	Issue #2142 fixed	2020-02-06 17:18:51 +05:30
Jitendra Singh	51dc65c9a7	Merge pull request #2315 from vivek-webkul/patch-13 ... [Fixed: issue #2313 resolved.]	2020-02-06 15:21:05 +05:30
rahul shukla	cd739789f0	Issue #2317	2020-02-06 13:46:02 +05:30
Vivek Sharma	bc28c8c4fe	[Fixed: issue #2313 resolved.]	2020-02-06 12:37:50 +05:30
rahul shukla	570ce2610d	Change validation way in vat_id	2020-02-06 12:08:27 +05:30
Steffen Mahler	ae467fc182	merge master, refactoring tests	2020-02-04 18:13:09 +01:00
Annika Wolff	53c5d107a6	Merge branch 'master' into small-bugfix-and-tiny-refactoring	2020-02-04 14:08:46 +01:00
Steffen Mahler	7c661efd88	add unit tests, refactoring	2020-02-04 11:18:40 +01:00
Steffen Mahler	cb5e3a47f6	fix tax handling, add functional cest for cart	2020-02-04 08:50:37 +01:00
Jitendra Singh	453908a768	Merge pull request #2214 from Haendlerbund/introduce-company-name-and-sales-tax-id-columns ... add ability to provide company_name in address during checkout	2020-02-04 11:40:39 +05:30
rahul shukla	7ea4c4219c	Issue #2227	2020-02-03 18:57:50 +05:30
rahul shukla	9a9400fe23	Issue #2219	2020-02-03 17:01:23 +05:30
Steffen Mahler	8abce3302a	tax helper introduced, views changed to display multiple tax rates	2020-01-31 16:08:01 +01:00
Annika Wolff	e7c29f40e2	Merge branch 'master' into small-bugfix-and-tiny-refactoring	2020-01-31 09:41:58 +01:00
Herbert Maschke	76b58e9bd8	some first_name and last_name input fields	2020-01-31 05:59:12 +01:00
Herbert Maschke	6be3d086f8	add ability to provide company_name in address during checkout (optional)	2020-01-30 20:56:01 +01:00
Steffen Mahler	d3e00d4543	add functional test for cart, fix tests with usage of	2020-01-28 16:28:29 +01:00
Steffen Mahler	0d696c6b1a	merge remote-tracking branch 'bagisto/master' into small-bugfix-and-tiny-refactoring	2020-01-28 15:51:50 +01:00
Steffen Mahler	14c0276fce	update cart button is not shown, when only products without quantity box are in cart, tests added	2020-01-28 15:38:07 +01:00
rahul shukla	434b681962	Issue #2186	2020-01-28 19:09:15 +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	7293716b1b	Merge pull request #2170 from rahulshukla-webkul/development ... Issue #742 and #2165	2020-01-28 15:02:47 +05:30
rahul shukla	3144720c48	Issue #742 and #2165	2020-01-28 14:56:05 +05:30
Florian Bosdorff	5188b1b7f9	Merge 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns	2020-01-28 08:15:11 +01:00
Florian Bosdorff	d125f9eba0	add reporting for try-catch-sections	2020-01-27 17:06:03 +01:00
Steffen Mahler	223c96b205	.	2020-01-27 13:06:31 +01:00
Jitendra Singh	b8115c808e	Merge pull request #2144 from Haendlerbund/trigger-db-prefixes ... fix trigger according to optional db-prefix	2020-01-27 17:21:26 +05:30
Jitendra Singh	0b3a7a6c6a	Merge pull request #2157 from jitendra-webkul/1.0 ... Removed commented code	2020-01-27 16:52:08 +05:30
Jitendra Singh	8176317a59	Removed commented code	2020-01-27 16:46:58 +05:30
Jitendra Singh	3e2e6f2c75	Merge pull request #2156 from jitendra-webkul/1.0 ... Issue #2087 fixed	2020-01-27 16:42:01 +05:30
Jitendra Singh	25d94ea944	Issue #2087 fixed	2020-01-27 16:41:25 +05:30
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	4fd6599bda	Issue #2147	2020-01-27 13:24:22 +05:30
Florian Bosdorff	d2a8911aaa	fix trigger according to optional db-prefix	2020-01-26 21:10:57 +01:00
Steffen Mahler	a5c49e4b76	button 'update cart' will only be shown if corresponding products are in cart	2020-01-24 07:15:49 +01:00
Herbert Maschke	5ebb67dd81	Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns	2020-01-23 14:18:17 +01:00
rahul shukla	2c0b7e4e54	try and catch in password section and wishlist add remove	2020-01-23 15:32:06 +05:30
Jitendra Singh	956259cc32	Merge pull request #2123 from rahulshukla-webkul/development ... Issue #2087	2020-01-23 11:51:19 +05:30
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
rahul shukla	2d8f5f412e	Issue #2087	2020-01-23 10:42:09 +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	01f0fc9a57	2089 and updated codeception dependencies	2020-01-22 18:44:53 +05:30
Florian Bosdorff	61d9b59e5f	Merge master into issue-1183/guest-checkout-configuration	2020-01-22 08:10:45 +01:00
Herbert Maschke	8d1d03d25b	Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns	2020-01-21 13:44:09 +01:00
Jitendra Singh	92636543cd	Merge pull request #1970 from Haendlerbund/introduce-default-country ... introduce default_country application configuration key	2020-01-21 16:34:38 +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	82dbdee0b8	helper functions updated	2020-01-21 15:23:04 +05:30
rahul shukla	debf060b03	helper function updated	2020-01-21 15:13:01 +05:30
rahul shukla	e3db0b164c	conflict resolve	2020-01-21 13:24:19 +05:30
Jitendra Singh	176feecb55	Resolved conflicts	2020-01-20 19:59:04 +05:30
Jitendra Singh	b18f2292c4	Issue #2071 fixed	2020-01-20 19:57:10 +05:30
Jitendra Singh	dfa4272cf2	Merge pull request #2008 from Haendlerbund/category-url-structure-multiple-roots ... Set correct category url_path in multiple root categories environment	2020-01-20 13:27:04 +05:30
Annika Wolff	132dd6c0f0	introduce guest checkout configuration	2020-01-17 14:42:47 +01:00
Herbert Maschke	7c9908401f	improve the way server side validation errors are being displayed	2020-01-17 12:54:02 +01:00
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
Herbert Maschke	e0c2814f2e	Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns	2020-01-15 15:29:55 +01:00
Jitendra Singh	ab8001d20c	Merge pull request #2062 from jitendra-webkul/1.0 ... Issue #2054 fixed	2020-01-15 19:08:54 +05:30
Jitendra Singh	130ed41044	Issue #2054 fixed	2020-01-15 19:07:12 +05:30
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
Annika Wolff	91d6586ad8	resolve exception, rename function haveDownloadableItems	2020-01-15 11:53:48 +01:00
Annika Wolff	a75f3dab51	resolve conflicts	2020-01-15 11:37:38 +01:00
David Große	e0b0740a83	typo: s/formi/form	2020-01-14 13:07:49 +01:00
Jitendra Singh	3901c1ad2e	Merge pull request #2048 from rahulshukla-webkul/development ... Issue #2045	2020-01-14 15:27:47 +05:30
rahul shukla	9c7770b29e	Issue #2045	2020-01-14 15:25:04 +05:30
David Große	72c3e289c7	remove the splitting into first_name and last_name again - it can be desastrous to drop a column in a productive environment	2020-01-14 10:25:26 +01:00
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
David Große	7eee7e3134	split the 'name' column in the customer addresses into 'first_name' and 'last_name' - it is more common to save the data in this structure	2020-01-13 11:20:04 +01:00
Jitendra Singh	a42724d5f3	Merge pull request #2038 from jitendra-webkul/1.0 ... Issue #1795 fixed	2020-01-13 13:18:25 +05:30
Jitendra Singh	3368eb5ba5	Issue #1795 fixed	2020-01-13 13:17:27 +05:30
Jitendra Singh	1e18cebb00	Merge pull request #2037 from jitendra-webkul/1.0 ... Issue #1764 fixed	2020-01-13 12:45:25 +05:30
Jitendra Singh	cf36d252a0	Issue #1764 fixed	2020-01-13 12:44:36 +05:30
Jitendra Singh	9380a37479	Merge pull request #2036 from jitendra-webkul/1.0 ... Issue #1786 fixed	2020-01-13 12:38:30 +05:30
Jitendra Singh	27e728d54e	Issue #1786 fixed	2020-01-13 12:37:41 +05:30
David Große	24f6fb2290	display server side errors	2020-01-10 14:20:47 +01:00
David Große	109b503609	display vat_id and company_name in edit.blade.php	2020-01-10 14:16:34 +01:00
David Große	7429d32072	introduce VatValidator.php	2020-01-10 14:07:58 +01:00
David Große	98632b0de8	remove required html classes	2020-01-10 13:24:33 +01:00
David Große	3af9a825c9	add optional vat_id to customer addresses	2020-01-10 11:59:53 +01:00
Jitendra Singh	9d1887a9a1	Merge pull request #2026 from jitendra-webkul/1.0 ... Issue #1804 fixed	2020-01-10 16:28:27 +05:30
Jitendra Singh	a7d02d552f	Issue #1804 fixed	2020-01-10 16:27:35 +05:30
Jitendra Singh	30cb75c307	Merge pull request #2024 from jitendra-webkul/1.0 ... Issue #1821 fixed	2020-01-10 15:48:53 +05:30
David Große	3ca5c99f27	introduce company_name column to customer_addresses	2020-01-10 11:05:09 +01:00
Jitendra Singh	9fbe756075	Fixed review controller compact undefined variable issue	2020-01-10 15:14:29 +05:30
Jitendra Singh	01833962a9	Merge pull request #2023 from jitendra-webkul/1.0 ... Issue #1842 fixed	2020-01-10 14:05:25 +05:30
Jitendra Singh	8db495446a	Issue #1842 fixed	2020-01-10 14:00:11 +05:30
Jitendra Singh	a8d8580f89	Merge pull request #2022 from jitendra-webkul/1.0 ... Issue #1845 fixed	2020-01-10 13:54:04 +05:30
Jitendra Singh	9faef742d7	Issue #1845 fixed	2020-01-10 13:53:11 +05:30
Jitendra Singh	3a52d63ac9	Merge pull request #1985 from rabol/master ... Make it possible to specify timezone in .env	2020-01-10 13:32:30 +05:30
rahul shukla	b5b00bb4f8	Issue 2012	2020-01-09 11:33:54 +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
MonaHartdegen	c065631a58	set correct category url_path in multiple root categories environment	2020-01-06 15:37:55 +01:00
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
MonaHartdegen	f4499b4728	altered trigger to be compatible with multi root categories environment; tests still WIP	2020-01-03 15:22:09 +01:00
Jitendra Singh	ab5464641b	Merge pull request #2003 from Haendlerbund/make-api-routes-accessable ... Make API routes accessable	2020-01-03 18:08:20 +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
MonaHartdegen	d52ef533c7	replace wildcard route for products and categories with fallback route	2020-01-03 13:09:06 +01:00
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
MonaHartdegen	dc89cd6511	fixed product links in two views (replaced hard coded link with route)	2020-01-02 13:14:53 +01:00
peternuernberger	af28c35bf7	Merge branch 'master' of https://github.com/bagisto/bagisto into feature/update-npm-assets	2019-12-30 09:32:49 +01:00
rabol	029971e9cf	Fix bug that prevent user from signing up for newsletter	2019-12-28 15:36:40 +01:00
Annika Wolff	d47201af75	bugfixed quantity update when showQuantityBox is false	2019-12-27 14:41:32 +01:00
rahul shukla	5c0843c470	upgrade to lavael 6.0	2019-12-27 13:30:05 +05:30
jitendra	7aba45486f	Indexes created for all product types	2019-12-25 19:57:05 +05:30
rahul shukla	23a15be1e0	compatible with laravel 5.8	2019-12-24 19:31:13 +05:30