3514 Commits

Author	SHA1	Message	Date
shubhammehrotra.symfony@webkul.com	c85813de37	checkout updates	2020-02-13 15:29:33 +05:30
Jitendra Singh	b3316a368c	Merge pull request #2455 from rahulshukla-webkul/development ... Issue #2449	2020-02-13 14:55:27 +05:30
rahul shukla	9d80f73319	Issue #2449	2020-02-13 14:41:40 +05:30
Vivek Sharma	0219862de0	[Fixed: issue #2440 resolved.]	2020-02-13 14:00:59 +05:30
shubhammehrotra.symfony@webkul.com	dc1888fceb	assets	2020-02-12 19:18:23 +05:30
shubhammehrotra.symfony@webkul.com	98cdcfed10	merged conflicts	2020-02-12 19:17:20 +05:30
shubhammehrotra.symfony@webkul.com	25e3da0fa7	misc. bug fixes	2020-02-12 19:15:34 +05:30
rahul shukla	f738cf4240	Issue #2439	2020-02-12 17:52:54 +05:30
Vivek Sharma	c9e6baff5d	[Fixed: issue #2440 has been resolved.]	2020-02-12 17:11:21 +05:30
Vivek Sharma	b6ab1b0f99	[Fixed: layout issue #2381 resolved.]	2020-02-12 16:46:06 +05:30
Vivek Sharma	7098e651d3	[Fixed: layout issue #2381 resolved.]	2020-02-12 16:42:40 +05:30
Vivek Sharma	8db782bacf	[Fixed: issue #2436 has been resolved.]	2020-02-12 15:13:07 +05:30
MonaHartdegen	2849ddd7db	added fields to order related factories	2020-02-12 09:58:50 +01:00
Jitendra Singh	ba8f44bea8	Merge pull request #2443 from jitendra-webkul/1.0 ... Converted configuration boolean type to switch	2020-02-12 13:46:25 +05:30
Jitendra Singh	881027ca4e	Converted configuration boolean type to switch	2020-02-12 13:45:26 +05:30
Jitendra Singh	8550c0424f	Merge pull request #2442 from shubhwebkul/velocity-updated ... checkout page updates	2020-02-12 13:20:42 +05:30
shubhammehrotra.symfony@webkul.com	3d3fa3408c	checkout page updates	2020-02-12 13:18:24 +05:30
Jitendra Singh	a6790b97d1	Issue #2438 fixed	2020-02-12 13:07:17 +05:30
Jitendra Singh	6243ad8c31	Merge pull request #2433 from jitendra-webkul/1.0 ... Issue #2250 fixed	2020-02-11 20:10:49 +05:30
Jitendra Singh	9c60312c21	Issue #2250 fixed	2020-02-11 20:06:38 +05:30
Jitendra Singh	c78b76f3aa	Merge pull request #2432 from jitendra-webkul/1.0 ... Fixed intentation in CoreConfigRepository	2020-02-11 19:18:15 +05:30
Jitendra Singh	ae8c9311cb	Merge pull request #2431 from vivek-webkul/patch-32 ... [Fixed: layout issue regarding #2399 resolved.]	2020-02-11 19:13:55 +05:30
Jitendra Singh	fab5cc7a4f	Fixed intentation in CoreConfigRepository	2020-02-11 19:13:39 +05:30
Vivek Sharma	31b7db34cb	[Fixed: layout issue regarding #2399 resolved.]	2020-02-11 18:59:35 +05:30
Vivek Sharma	bef1068d70	Fixed: button alignment corrected.	2020-02-11 18:40:58 +05:30
Jitendra Singh	13a5b3a116	Merge pull request #2429 from shubhwebkul/velocity-updated ... minor bug fixes	2020-02-11 18:33:57 +05:30
shubhammehrotra.symfony@webkul.com	4323637bf9	minor bugs	2020-02-11 18:15:06 +05:30
Jitendra Singh	c042ef5d90	Merge pull request #2428 from jitendra-webkul/1.0 ... Converted checkbox into switch	2020-02-11 18:00:41 +05:30
Jitendra Singh	300feaec0f	Converted checkbox into switch	2020-02-11 17:56:25 +05:30
shubhammehrotra.symfony@webkul.com	afa4ea627c	Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated	2020-02-11 17:50:03 +05:30
shubhammehrotra.symfony@webkul.com	d331c36bd8	misc. bug fixes	2020-02-11 17:49:48 +05:30
Jitendra Singh	fe911cc2dc	Issue #2398 fixed	2020-02-11 17:16:10 +05:30
Jitendra Singh	0caa8010d2	Issue #2424 fixed	2020-02-11 16:37:10 +05:30
Jitendra Singh	df88b605be	Issue #2416 fixed	2020-02-11 15:18:33 +05:30
Jitendra Singh	37d99c526f	Issue #2417 fixed	2020-02-11 15:08:41 +05:30
Jitendra Singh	002a977e22	Issue #2417 fixed	2020-02-11 15:02:04 +05:30
Jitendra Singh	66f29937e9	Merge pull request #2405 from vivek-webkul/patch-23 ... [Fixed: issue #2322 has been resolved.]	2020-02-11 13:54:12 +05:30
Jitendra Singh	b2b90d566a	Merge pull request #2380 from shaiv-webkul/master ... #2364 issue fixed	2020-02-11 13:43:55 +05:30
Vivek Sharma	52ac7f8aaa	[resolved conflict.]	2020-02-11 13:42:04 +05:30
Vivek Sharma	b3b830e094	[Saved.]	2020-02-11 13:40:12 +05:30
Vivek Sharma	1fa7f93c2d	[Saved.]	2020-02-11 13:38:03 +05:30
Vivek Sharma	424a0a1595	[Saved.]	2020-02-11 13:36:38 +05:30
shubhammehrotra.symfony@webkul.com	081a90d3d0	Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated	2020-02-11 13:34:48 +05:30
shubhammehrotra.symfony@webkul.com	77e63a51b5	publishable assets issue resolved	2020-02-11 13:34:31 +05:30
Vivek Sharma	4c574a26ff	[Fixed: changes card blade file.]	2020-02-11 13:30:54 +05:30
Vivek Sharma	213a622fec	[Saved]	2020-02-11 13:29:22 +05:30
Vivek Sharma	817d46bb89	[Fixed: conflict resolved.]	2020-02-11 13:23:21 +05:30
Jitendra Singh	5ec6559a07	Issue #2395 fixed	2020-02-11 13:10:14 +05:30
Jitendra Singh	3f3962681b	Merge pull request #2385 from vivek-webkul/patch-17 ... [Fixed: issue #2378 has been resolved.]	2020-02-11 12:35:17 +05:30
Vivek Sharma	7ad61082c3	[Fixed: changes added.]	2020-02-11 12:31:18 +05:30
Vivek Sharma	0f03c184b4	[Saved]	2020-02-11 12:14:53 +05:30
Vivek Sharma	bb9e6d5e5a	[Fixed: conflict resolved.]	2020-02-11 11:58:44 +05:30
Vivek Sharma	c880879f5f	[Fixed: conflict resolved.]	2020-02-11 11:38:42 +05:30
Jitendra Singh	3d9eb5f91f	Merge pull request #2414 from vivek-webkul/patch-29 ... [Fixed: Issue #2397 has been resolved.]	2020-02-11 11:10:11 +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
Jitendra Singh	f8ef2d85e8	Merge pull request #2409 from vivek-webkul/patch-27 ... [Fixed: Issue #2399 has been resolved.]	2020-02-11 11:09:32 +05:30
Jitendra Singh	f2666c4c8f	Merge pull request #2407 from vivek-webkul/patch-25 ... [Fixed: Issue #2402 has been resolved.]	2020-02-11 11:09:11 +05:30
Jitendra Singh	86e86db559	Merge pull request #2404 from vivek-webkul/patch-22 ... [Fixed: issue #2381 has been resolved.]	2020-02-11 11:08:17 +05:30
Jitendra Singh	6204d5ad42	Merge pull request #2401 from vivek-webkul/patch-21 ... [Fixed: issue #2386 has been resolved.]	2020-02-11 11:07:48 +05:30
Jitendra Singh	25b0973a4d	Merge pull request #2396 from vivek-webkul/patch-20 ... [Fixed: issue #2391 has been fixed.]	2020-02-11 11:07:22 +05:30
Jitendra Singh	66e398817d	Merge pull request #2394 from vivek-webkul/patch-19 ... [Fixed: #2390 and #2389 have been resolved.]	2020-02-11 11:06:44 +05:30
Jitendra Singh	ca864b2d8a	Merge pull request #2383 from vivek-webkul/patch-16 ... [Fixed: issue #2329 has been resolved.]	2020-02-11 11:05:59 +05:30
Jitendra Singh	b7537d9578	Merge pull request #2376 from shubhwebkul/velocity-updated ... misc. bug fixes	2020-02-11 11:05:00 +05:30
Jitendra Singh	9b738f60bb	Merge pull request #2375 from shivam-webkul/master ... #2070 issue fixed	2020-02-11 10:50:51 +05:30
Herbert Maschke	c27b70b420	load correct locale in CategoryController.php	2020-02-10 15:21:03 +01:00
Herbert Maschke	d574ab1beb	Merge branch 'bagisto/master' into locale-improvements	2020-02-10 15:11:43 +01:00
Herbert Maschke	45160d2099	fix some javascript i have destroyed previously accidentally	2020-02-10 15:07:14 +01:00
Herbert Maschke	38dbb6384d	obey the default channel and configured default locale in product edit form	2020-02-10 15:05:03 +01:00
shubhammehrotra.symfony@webkul.com	cd83d6bbcc	misc. updates	2020-02-10 19:06:45 +05:30
Vivek Sharma	dd58890395	[Fixed: Issue #2397 has been resolved.]	2020-02-10 13:48:44 +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
Vivek Sharma	ae6ab80d1e	Merge pull request #2379 from rahulshukla-webkul/development ... Issue #2377	2020-02-10 10:51:31 +05:30
Steffen Mahler	59f1956a21	merge bagisto/master into fix-tax-handling	2020-02-08 20:48:27 +01:00
Steffen Mahler	7dff220da9	fix issue with zip based taxes, added functional test	2020-02-08 20:42:32 +01:00
shubhammehrotra.symfony@webkul.com	8fc51a7be4	rtl updates	2020-02-08 19:00:58 +05:30
shubhammehrotra.symfony@webkul.com	5a6289d4ce	rtl updates	2020-02-08 19:00:25 +05:30
Vivek Sharma	57ddb147c3	[Fixed: Extra line removed from product page.]	2020-02-08 18:37:50 +05:30
Vivek Sharma	2706e8a181	[Fixed: Issue #2399 has been resolved.]	2020-02-08 18:33:51 +05:30
Vivek Sharma	fb696d27e5	[Fixed: Issue #2400 has been resolved.]	2020-02-08 18:17:52 +05:30
Vivek Sharma	b95636e2ec	[Fixed: Issue #2402 has been resolved.]	2020-02-08 17:38:33 +05:30
Vivek Sharma	8a955e3b14	[Fixed: issue #2322 has been resolved.]	2020-02-08 16:29:09 +05:30
Vivek Sharma	c0d2dc83d0	[Fixed: issue #2381 has been resolved.]	2020-02-08 15:33:59 +05:30
Vivek Sharma	af1ebddeef	[Fixed: issue #2386 has been resolved.]	2020-02-08 15:10:37 +05:30
Vivek Sharma	4edbd82967	[Fixed: issue #2391 has been fixed.]	2020-02-08 13:46:48 +05:30
Vivek Sharma	63556473c8	[Fixed: #2390 and #2389 have been resolved.]	2020-02-08 13:22:49 +05:30
Vivek Sharma	d2a2b2a8c6	[Fixed: issue #2384 has been resolved.]	2020-02-08 12:59:08 +05:30
Vivek Sharma	62876ea703	[Fixed: issue #2378 has been resolved.]	2020-02-08 11:40:29 +05:30
Steffen Mahler	00c43e21de	cleanup	2020-02-07 19:23:15 +01:00
Steffen Mahler	1d08f8a1f5	extend API endpoint for Cart by taxes	2020-02-07 19:09:41 +01:00
Vivek Sharma	ceccbf9db2	[Fixed: issue #2329 has been resolved.]	2020-02-07 18:57:46 +05:30
shaiv-webkul	b7f722a3c4	#2364 issue fixed	2020-02-07 18:23:31 +05:30
rahul shukla	178ca4af74	Logic improvement	2020-02-07 17:20:55 +05:30
rahul shukla	d39201c877	Issue #2377	2020-02-07 17:17:30 +05:30
shivam kumar	15a6a25256	#2070 issue fixed	2020-02-07 16:40:03 +05:30
shubhammehrotra.symfony@webkul.com	af8e3e77b9	Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated	2020-02-07 16:37:28 +05:30
shubhammehrotra.symfony@webkul.com	ae63bfd3c2	checkout updates	2020-02-07 16:37:01 +05:30
shubhammehrotra.symfony@webkul.com	432bb60570	velocity admin panel bugs	2020-02-07 16:01:52 +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
shaiv-webkul	f47f06de31	#2180 fixed	2020-02-07 15:48:20 +05:30
Herbert Maschke	35a9e90780	add improvements to locale determination on product creation	2020-02-07 11:16:00 +01:00
shaiv-webkul	d43efc505a	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-02-07 15:29:52 +05:30
shubhammehrotra.symfony@webkul.com	79a8faa028	Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated	2020-02-07 15:22:29 +05:30
shubhammehrotra.symfony@webkul.com	6962d4df0d	misc. resolved issues	2020-02-07 15:22:05 +05:30
Steffen Mahler	b94fc9fc8c	merge master and resolve conflicts	2020-02-07 10:44:04 +01:00
rahul shukla	8e32328b52	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-02-07 15:04:11 +05:30
rahul shukla	3504226a6a	Issue #2366	2020-02-07 15:04:00 +05:30
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
rahul shukla	40517df331	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-02-07 13:49:15 +05:30
rahul shukla	0358a84a2c	Issue #2357	2020-02-07 13:49:01 +05:30
shaiv-webkul	13047f266f	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-02-07 13:24:16 +05:30
Jitendra Singh	e94d1ad146	Merge pull request #2365 from jitendra-webkul/1.0 ... Issue #1977 fixed	2020-02-07 13:19:55 +05:30
Jitendra Singh	e517d66e71	Issue #1977 fixed	2020-02-07 13:18:48 +05:30
shaiv-webkul	3516322e1f	#2180 issue fixed	2020-02-07 13:10:03 +05:30
Jitendra Singh	e8b34451ed	Merge pull request #2361 from jitendra-webkul/1.0 ... Issue #1977 fixed	2020-02-07 12:57:04 +05:30
Jitendra Singh	cc5df27870	Issue #1977 fixed	2020-02-07 12:56:18 +05:30
rahul shukla	2ad1ab3f79	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-02-07 11:06:06 +05:30
rahul shukla	84f8c9fb71	Issue #2328	2020-02-07 11:03:28 +05:30
shubhammehrotra.symfony@webkul.com	d6e6419c9c	reset password page updates	2020-02-07 10:26:47 +05:30
Aayush Bhatt	7fc6fd7d3d	old() function implimented in admin and shop package	2020-02-06 22:04:33 +05:30
shubhammehrotra.symfony@webkul.com	cde599c7a2	reset-password page updates	2020-02-06 21:23:58 +05:30
shubhammehrotra.symfony@webkul.com	5cbb6fc23e	#2249	2020-02-06 21:17:59 +05:30
shubhammehrotra.symfony@webkul.com	f7bea02c4e	misc. bug fixes	2020-02-06 21:13:02 +05:30
Aayush Bhatt	75ef8f9b54	Duplicate old() function removed	2020-02-06 20:23:56 +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
shubhammehrotra.symfony@webkul.com	8ee5d3db83	Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated	2020-02-06 19:57:30 +05:30
Jitendra Singh	e703bd7e2c	Merge pull request #2349 from vivek-webkul/patch-15 ... [Fixed: issue #2346 resolved.]	2020-02-06 19:57:15 +05:30
shubhammehrotra.symfony@webkul.com	64692f6e3c	misc. bug fixes	2020-02-06 19:57:13 +05:30
Vivek Sharma	ba775a14e5	[Fixed: issue #2346 resolved.]	2020-02-06 19:56:21 +05:30
Jitendra Singh	9b42d0cecd	Merge pull request #2348 from jitendra-webkul/1.0 ... Issue #2307 fixed	2020-02-06 19:30:09 +05:30
Jitendra Singh	d75374c610	Issue #2307 fixed	2020-02-06 19:29:18 +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	8bf70ecbc9	Merge pull request #2345 from jitendra-webkul/1.0 ... Issue #2339 fixed	2020-02-06 19:17:13 +05:30
Jitendra Singh	1a3bc44a88	Issue #2339 fixed	2020-02-06 19:16:22 +05:30
Jitendra Singh	156eb5a130	Merge pull request #2344 from jitendra-webkul/1.0 ... Issue #2340 fixed	2020-02-06 19:08:19 +05:30
Jitendra Singh	543a229c9d	Issue #2340 fixed	2020-02-06 19:07:36 +05:30
Aayush Bhatt	2a0d461d9e	old() function implemented in admin package	2020-02-06 18:52:10 +05:30
Jitendra Singh	204a3148c5	Merge pull request #2342 from rahulshukla-webkul/development ... Development	2020-02-06 18:48:47 +05:30
rahul shukla	0467995267	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-02-06 18:35:02 +05:30
rahul shukla	59ea3941ee	Issue #2328	2020-02-06 18:34:43 +05:30
shivam kumar	3c093a603a	resolved conflicts	2020-02-06 18:12:43 +05:30
shivam kumar	a19736b936	resolved conflicts	2020-02-06 18:09:41 +05:30
shivam kumar	6aaca3f693	updates	2020-02-06 18:08:43 +05:30
shivam kumar	17fe108512	Merge branch 'master' of https://github.com/shivam-webkul/bagisto	2020-02-06 18:06:56 +05:30
shivam kumar	7f4cfab440	resolved issues	2020-02-06 18:06:00 +05:30
Jitendra Singh	c3959328b1	Merge pull request #2338 from jitendra-webkul/1.0 ... Move to wishlist issues fixed if product is already in wishlist	2020-02-06 17:50:21 +05:30
Jitendra Singh	e06a35b282	Move to wishlist issues fixed if product is already in wishlist	2020-02-06 17:49:23 +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	e18027c612	Merge pull request #2332 from jitendra-webkul/1.0 ... Issue #2126 fixed	2020-02-06 17:13:13 +05:30
Jitendra Singh	9f80cff693	Issue #2126 fixed	2020-02-06 17:12:41 +05:30
shubhammehrotra.symfony@webkul.com	ff72440c76	resolved issues	2020-02-06 17:01:00 +05:30
shubhammehrotra.symfony@webkul.com	ea4341341d	resolved issues	2020-02-06 16:29:20 +05:30
shivam kumar	89ebcf9917	#2274 #2275 solved	2020-02-06 16:14:31 +05:30
shivam kumar	dec0c8208a	Merge branch 'master' of https://github.com/bagisto/bagisto ... commit	2020-02-06 15:58:02 +05:30
rahul shukla	7f7a8bc1cd	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-02-06 15:57:50 +05:30
rahul shukla	0bd6096e26	Issue #2189	2020-02-06 15:57:31 +05:30
Vivek Sharma	3b40adb199	[Fixed: issue #2320 resolved.]	2020-02-06 15:39:58 +05:30
shivam kumar	3c0b804d3e	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-02-06 15:32:06 +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
Vivek Sharma	e619c25880	[Fixed: GuestCheckoutCest issue resolved in Velocity checkout cart index file.]	2020-02-06 13:49:38 +05:30
rahul shukla	7f35dddbda	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-02-06 13:47:18 +05:30
rahul shukla	cd739789f0	Issue #2317	2020-02-06 13:46:02 +05:30
Jitendra Singh	64666a62c6	Merge pull request #2312 from rahulshukla-webkul/development ... Issue #2297	2020-02-06 13:32:36 +05:30
Jitendra Singh	ff4af0f838	Merge pull request #2316 from jitendra-webkul/1.0 ... Issue #2299 fixed	2020-02-06 12:42:40 +05:30
shivam kumar	caa60cab60	resolved issue #2274, #2275	2020-02-06 12:42:15 +05:30
Jitendra Singh	6aafa8cee8	Issue #2299 fixed	2020-02-06 12:41:36 +05:30
shivam kumar	7ed5967875	ee	2020-02-06 12:40:40 +05:30
Vivek Sharma	bc28c8c4fe	[Fixed: issue #2313 resolved.]	2020-02-06 12:37:50 +05:30
Aayush Bhatt	ff1e315fc7	Admin dropdown UI fixed	2020-02-06 12:26:35 +05:30
rahul shukla	570ce2610d	Change validation way in vat_id	2020-02-06 12:08:27 +05:30
Aayush Bhatt	0694fbd7eb	Issue #2189 resolved	2020-02-06 11:59:45 +05:30
Aayush Bhatt	28a4aaa5ac	Bug fixed	2020-02-06 11:57:53 +05:30
rahul shukla	1be6498bec	Issue #2297	2020-02-06 11:50:07 +05:30
shivam kumar	8014305c75	#2274, #2275 resolved	2020-02-06 11:47:02 +05:30
Jitendra Singh	e4ee9b425f	Merge pull request #2311 from vivek-webkul/patch-12 ... [Fixed: issues #2271 and #2285 resolved.]	2020-02-06 11:18:14 +05:30
Vivek Sharma	8dd6d575bb	[Fixed: issues #2271 and #2285 resolved.]	2020-02-06 11:13:47 +05:30
shubhammehrotra.symfony@webkul.com	d6ef323ba5	Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated	2020-02-06 10:59:44 +05:30
shubhammehrotra.symfony@webkul.com	3ccdd86a81	resolved issues	2020-02-06 10:59:27 +05:30
Jitendra Singh	a196e13a03	Merge pull request #2305 from naresh-webkul/master ... resolved issue [#2273]	2020-02-06 10:43:38 +05:30
Jitendra Singh	ee0494b6dd	Merge pull request #2298 from shubhwebkul/velocity-updated ... Resolved Issues	2020-02-06 10:42:06 +05:30
Jitendra Singh	08ec6b27d6	Merge pull request #2301 from shaiv-webkul/master ... 2281 solved	2020-02-06 10:41:24 +05:30
shubhammehrotra.symfony@webkul.com	8adb1c22bb	resolved issues	2020-02-05 21:32:41 +05:30
shubhammehrotra.symfony@webkul.com	80db7e3556	resolved conflits	2020-02-05 21:05:13 +05:30
naresh verma	745131970e	resolved issue [#2273]	2020-02-05 21:03:15 +05:30
shubhammehrotra.symfony@webkul.com	75e3771ffa	misc. bug fixes & (#2245)	2020-02-05 21:02:37 +05:30
shivam kumar	24fcdd006b	#2274 #2275 solved	2020-02-05 20:53:39 +05:30
shivam kumar	2716332832	#2274 #2275 solved	2020-02-05 20:36:09 +05:30
Jitendra Singh	c019891c50	Fixed velocity webpack mix file	2020-02-05 20:31:31 +05:30
shaiv-webkul	246c644630	2281 solved	2020-02-05 20:09:34 +05:30
shubhammehrotra.symfony@webkul.com	63caba4d9c	Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated	2020-02-05 19:42:30 +05:30
shubhammehrotra.symfony@webkul.com	828aedf028	resolved issues	2020-02-05 19:42:04 +05:30
Jitendra Singh	47b010ce6b	Merge pull request #2296 from jitendra-webkul/1.0 ... Issue #2295 fixed	2020-02-05 19:39:58 +05:30
Jitendra Singh	9f86e4fcca	Issue #2295 fixed	2020-02-05 19:38:52 +05:30
shubhammehrotra.symfony@webkul.com	be79466981	resolved issues	2020-02-05 19:36:49 +05:30
Jitendra Singh	49a9762fed	Merge pull request #2290 from vivek-webkul/patch-9 ... [Fixed: Issue #2279 related to Sort By functionality is not working.]	2020-02-05 19:31:58 +05:30
Jitendra Singh	22019814fe	Merge pull request #2294 from rahulshukla-webkul/development ... Issue #2256	2020-02-05 19:31:40 +05:30
rahul shukla	4a007fda4e	Issue #2256	2020-02-05 19:15:44 +05:30
Jitendra Singh	d3451b0980	Merge pull request #2292 from rahulshukla-webkul/development ... Development	2020-02-05 19:00:28 +05:30
Jitendra Singh	98390b2ce7	Merge pull request #2291 from jitendra-webkul/1.0 ... Issue #1267 fixed	2020-02-05 18:59:46 +05:30
Jitendra Singh	4ef21c827a	Issue #1267 fixed	2020-02-05 18:53:57 +05:30
rahul shukla	3ba5a07c45	Issue #2258	2020-02-05 18:53:39 +05:30
rahul shukla	976b48125f	Issue #2258	2020-02-05 18:51:44 +05:30
Vivek Sharma	2889e2a124	[Fixed: Issue #2279 related to Sort By functionality is not working.]	2020-02-05 17:56:49 +05:30
MonaHartdegen	b0946ef97d	added ids to sections in accordians/downloadable.blade.php	2020-02-05 13:23:50 +01:00
Aayush Bhatt	004914dc6a	Issue #1656 fixed	2020-02-05 17:33:03 +05:30
rahul shukla	5a23226c23	Issue #2251	2020-02-05 17:29:48 +05:30
rahul shukla	0b7a2f8588	resolve conflict	2020-02-05 16:10:30 +05:30
rahul shukla	16e4a109ea	Configurtion form validation improvement	2020-02-05 16:07:00 +05:30
Jitendra Singh	f8451ebb84	Merge pull request #2244 from shubhwebkul/velocity-updated ... Velocity theme update	2020-02-05 16:06:52 +05:30
Steffen Mahler	e678a467fc	call collectTotals in saveCustomerAddress	2020-02-05 11:18:21 +01:00
shubhammehrotra.symfony@webkul.com	b444223b29	resolved issues	2020-02-05 15:10:34 +05:30
rahul shukla	ff37467e70	Issue #2239	2020-02-05 12:06:16 +05:30
rahul shukla	a2d642f35d	revert tpye	2020-02-05 11:32:29 +05:30
rahul shukla	1b5b47fc80	Issue #2269	2020-02-05 11:29:57 +05:30
rahul shukla	832e66025e	Issue #2270	2020-02-05 11:14:45 +05:30
rahul shukla	6038bbf505	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-02-05 11:06:20 +05:30
rahul shukla	be71b01c17	Issue #2268	2020-02-05 11:06:06 +05:30
SteffenMahler	0380628fa3	Merge branch 'master' into fix-tax-handling	2020-02-04 17:51:09 +01:00
shubhammehrotra.symfony@webkul.com	b6ce521cde	Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated	2020-02-04 20:02:09 +05:30
shubhammehrotra.symfony@webkul.com	0c9a9302a2	resolved issues	2020-02-04 19:59:38 +05:30
Steffen Mahler	dd8f653df4	minor improvements	2020-02-04 14:48:15 +01:00
shubhammehrotra.symfony@webkul.com	600c11585f	resolved issues	2020-02-04 19:04:53 +05:30
Steffen Mahler	a61446f1aa	refactoring	2020-02-04 14:31:18 +01:00
Annika Wolff	53c5d107a6	Merge branch 'master' into small-bugfix-and-tiny-refactoring	2020-02-04 14:08:46 +01:00
Steffen Mahler	721091cf32	unit test	2020-02-04 13:27:47 +01:00
shubhammehrotra.symfony@webkul.com	3d19b7f4c8	resolved issues and hot-categories from ajax	2020-02-04 17:47:39 +05:30
Jitendra Singh	a5559808f5	Merge pull request #2140 from shubhwebkul/velocity-updated ... bagisto velocity theme updates	2020-02-04 16:30:31 +05:30
Steffen Mahler	7c661efd88	add unit tests, refactoring	2020-02-04 11:18:40 +01:00
Jitendra Singh	193880eb89	Merge pull request #2235 from Haendlerbund/default-channel-and-locale-improvements ... obey the default channel that has been set in config/app.php	2020-02-04 13:23:56 +05:30
Jitendra Singh	ce7176e5ef	Merge pull request #2234 from vivek-webkul/patch-8 ... [Added: review delete api route added.]	2020-02-04 13:23:32 +05:30
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
Jitendra Singh	9246311fa8	Merge pull request #2236 from rahulshukla-webkul/development ... Issue #2227	2020-02-04 11:39:20 +05:30
Jitendra Singh	749b23924a	Merge pull request #2238 from jitendra-webkul/1.0 ... Issue #2237 fixed	2020-02-04 11:25:20 +05:30
Jitendra Singh	8f2d1779ee	Issue #2237 fixed	2020-02-04 11:20:22 +05:30
rahul shukla	f624f45a4a	Issue #1976	2020-02-03 19:14:26 +05:30
rahul shukla	7ea4c4219c	Issue #2227	2020-02-03 18:57:50 +05:30
Herbert Maschke	4833d9f8ec	obey the default channel that has been set in config/app.php	2020-02-03 13:34:05 +01:00
Vivek Sharma	136deb0049	[Added: review delete api route added.]	2020-02-03 17:31:09 +05:30
shubhammehrotra.symfony@webkul.com	0cf4cc181a	product-card wishlist icon	2020-02-03 17:14:58 +05:30
rahul shukla	b090f5264f	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-02-03 17:01:35 +05:30
rahul shukla	9a9400fe23	Issue #2219	2020-02-03 17:01:23 +05:30
Jitendra Singh	d6fd342341	Merge pull request #2228 from mohdfaizdev/2225 ... Fixed issue 2225	2020-02-03 13:51:20 +05:30
Jitendra Singh	c1a11e275a	Merge pull request #2231 from rahulshukla-webkul/development ... Issue #2226	2020-02-03 13:43:07 +05:30
rahul shukla	ee97642b7a	Issue #2226	2020-02-03 13:39:13 +05:30
Jitendra Singh	b4f4fc5529	Issue #2182 fixed	2020-02-03 13:14:11 +05:30
Jitendra Singh	6560e13045	Resolved conflict	2020-02-03 13:03:32 +05:30
Jitendra Singh	fa3c5deac6	Issue #2203 fixed	2020-02-03 13:01:54 +05:30
Mohd Faiz	970d05c1c4	Fixed issue 2225	2020-02-03 12:22:04 +05:30
Shubham Mehrotra	c51cb168e8	new and featured products from ajax	2020-02-02 19:55:03 +05:30
Shubham Mehrotra	fd4657f991	Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated	2020-02-01 13:50:10 +05:30
Shubham Mehrotra	1f6ce71303	resolved issues	2020-02-01 13:42:53 +05:30
Steffen Mahler	8abce3302a	tax helper introduced, views changed to display multiple tax rates	2020-01-31 16:08:01 +01:00
shubhammehrotra.symfony@webkul.com	be3b8e34a7	category and category products through ajax	2020-01-31 20:01:36 +05:30
Jitendra Singh	09a7cc949a	Merge pull request #2222 from jitendra-webkul/1.0 ... Issue #2202 fixed	2020-01-31 19:17:19 +05:30
Jitendra Singh	677cd7e542	Issue #2202 fixed	2020-01-31 19:16:45 +05:30
Annika Wolff	e7c29f40e2	Merge branch 'master' into small-bugfix-and-tiny-refactoring	2020-01-31 09:41:58 +01:00
Annika Wolff	ab9300bbef	merged conflicting factory manually	2020-01-31 09:40:12 +01:00
Jitendra Singh	09fe8cea1c	Merge pull request #2220 from rahulshukla-webkul/development ... Development	2020-01-31 13:58:47 +05:30
Jitendra Singh	a378c09f23	Merge pull request #2208 from vivek-webkul/patch-2 ... [Fixed: changed customer group code for newly created customer.]	2020-01-31 13:58:26 +05:30
rahul shukla	7fdf5b66ab	Issue #2173	2020-01-31 13:31:38 +05:30
rahul shukla	c64bb4f85b	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-01-31 13:19:00 +05:30
rahul shukla	6565f25153	Issue #2182	2020-01-31 13:18:40 +05:30
Jitendra Singh	37dba8eabf	Merge pull request #2218 from jitendra-webkul/1.0 ... Issue #2203 fixed	2020-01-31 12:53:17 +05:30
Jitendra Singh	48398597bf	Issue #2203 fixed	2020-01-31 12:48:35 +05:30
Jitendra Singh	d9d7c2bc40	Merge pull request #2215 from Haendlerbund/introduce-some-cart-factories ... add some factories	2020-01-31 12:35:25 +05:30
Jitendra Singh	4ebc76cc64	Merge pull request #2217 from jitendra-webkul/1.0 ... Issue #2207 fixed	2020-01-31 12:28:22 +05:30
Jitendra Singh	dd634691fe	Issue #2207 fixed	2020-01-31 12:23:52 +05:30
Jitendra Singh	3c16599ddb	Merge pull request #2211 from Haendlerbund/add-channel-and-locale-filter-to-product-grid ... Add channel and locale filter to product grid	2020-01-31 12:03:59 +05:30
shubhammehrotra.symfony@webkul.com	e578d7d1db	route issue resolved	2020-01-31 11:53:31 +05:30
Herbert Maschke	178f89165e	add required validations	2020-01-31 06:06:13 +01:00
Herbert Maschke	76b58e9bd8	some first_name and last_name input fields	2020-01-31 05:59:12 +01:00
Herbert Maschke	4d28188efb	move factories into appropriate packages and remove redundant ones	2020-01-31 05:42:13 +01:00
Herbert Maschke	e76c1794b9	add some factories into webkul core package to enhance testing potential	2020-01-30 21:01:45 +01:00
Herbert Maschke	6be3d086f8	add ability to provide company_name in address during checkout (optional)	2020-01-30 20:56:01 +01:00
Florian Bosdorff	389b40fdce	Merge branch 'bagisto/master' into add-channel-and-locale-filter-to-product-grid	2020-01-30 16:04:57 +01:00
shubhammehrotra.symfony@webkul.com	7e2abffede	rtl initial	2020-01-30 18:21:04 +05:30
rahul shukla	ebab486fc1	merge with master	2020-01-30 16:21:00 +05:30
Vivek Sharma	2ff9ebfa17	[Fixed: changed customer group code for newly created customer.]	2020-01-30 15:57:56 +05:30
rahul shukla	b40c2173a8	Issue #2204	2020-01-30 15:22:39 +05:30
Steffen Mahler	8b196c9c9c	merge remote-tracking branch 'bagisto/master' into fix-tax-handling	2020-01-29 14:12:43 +01:00
rahul shukla	3ac48ee883	Issue #2192	2020-01-29 18:27:47 +05:30
shubhammehrotra.symfony@webkul.com	6923e43c1e	Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated	2020-01-29 17:51:38 +05:30
shubhammehrotra.symfony@webkul.com	b76bed2a89	minor bug fixes	2020-01-29 17:41:42 +05:30
shubhammehrotra.symfony@webkul.com	d23d3b4f8c	search in particular category	2020-01-29 17:33:28 +05:30
rahul shukla	7c3c63e445	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-01-29 16:46:23 +05:30
rahul shukla	40e85523a1	Issue #2185	2020-01-29 16:46:10 +05:30
Jitendra Singh	25d99cc10a	Merge pull request #2200 from jitendra-webkul/1.0 ... Issue #2176, #2196 fixed	2020-01-29 16:40:54 +05:30
Jitendra Singh	813f61eeaa	Issue #2176, #2196 fixed	2020-01-29 16:37:20 +05:30
Steffen Mahler	d722ba8665	change annotation comment	2020-01-29 11:43:19 +01:00
rahul shukla	a5853bb030	Issue #2198	2020-01-29 16:09:49 +05:30
rahul shukla	97332a1fc3	Issue #2192	2020-01-29 16:06:56 +05:30
rahul shukla	906366b6d4	Issue #2192	2020-01-29 13:48:31 +05:30
rahul shukla	50c6970c74	#Issue 2190	2020-01-29 13:32:16 +05:30
Jitendra Singh	62060fcbea	Merge pull request #2193 from jitendra-webkul/1.0 ... Issue #1988 fixed	2020-01-29 12:53:02 +05:30
Jitendra Singh	b4dacd4db6	Added translation seeder to DatabaseSeeder class	2020-01-29 12:52:06 +05:30
Jitendra Singh	0b67488a0b	Issue #1988 fixed	2020-01-29 12:51:12 +05:30
Steffen Mahler	90e638582b	fix wrong product state in haveVirtualProduct	2020-01-28 16:49:26 +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
shubhammehrotra.symfony@webkul.com	ff3f0cf780	misc. bug fixes	2020-01-28 19:49:34 +05:30
rahul shukla	434b681962	Issue #2186	2020-01-28 19:09:15 +05:30
rahul shukla	a71cc1c887	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-01-28 19:08:08 +05:30
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	c69f19701f	Issue #2185	2020-01-28 18:51:13 +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	2db836c201	Shipping discount issue fixed during refund creation	2020-01-28 17:14:37 +05:30
shubhammehrotra.symfony@webkul.com	922e3608be	Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated	2020-01-28 17:07:43 +05:30
shubhammehrotra.symfony@webkul.com	7d842a9d06	responsive updates	2020-01-28 17:05:22 +05:30
Jitendra Singh	700949619b	Merge pull request #2175 from rahulshukla-webkul/development ... Issue #2143	2020-01-28 17:00:51 +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
rahul shukla	4ecfaac44d	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-01-28 16:54:11 +05:30
rahul shukla	c3d3473738	Issue #2143	2020-01-28 16:06:25 +05:30
Jitendra Singh	c75e4a0042	Merge pull request #2174 from jitendra-webkul/1.0 ... Issue #2173 fixed	2020-01-28 15:19:39 +05:30
Jitendra Singh	c9769717d0	Issue #2173 fixed	2020-01-28 15:18:51 +05:30
Jitendra Singh	dae09859f3	Merge pull request #2172 from jitendra-webkul/1.0 ... Issue #2162 fixed	2020-01-28 15:16:43 +05:30
Jitendra Singh	fec990a149	Issue #2162 fixed	2020-01-28 15:15:36 +05:30
Jitendra Singh	a10a906759	Merge pull request #2171 from jitendra-webkul/1.0 ... Issue #2167 fixed	2020-01-28 15:10:43 +05:30
Jitendra Singh	f9b2ee4ae7	Issue #2167 fixed	2020-01-28 15:03:00 +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
Jitendra Singh	7a77cf380a	Merge pull request #2169 from jitendra-webkul/1.0 ... Issue #2168 fixed	2020-01-28 13:58:29 +05:30
Jitendra Singh	64fd205298	Issue #2168 fixed	2020-01-28 13:47:44 +05:30
Jitendra Singh	ed2de87d06	Merge pull request #2166 from jitendra-webkul/1.0 ... Issues #1189, #1148 fixed	2020-01-28 13:24:03 +05:30
Jitendra Singh	7b32b2e516	Issues #1189, #1148 fixed	2020-01-28 13:18:30 +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
Jitendra Singh	50e028d28d	Merge pull request #2161 from rahulshukla-webkul/development ... Issue #2155	2020-01-28 11:42:45 +05:30
rahul shukla	905bbeb4a8	test case changes	2020-01-28 11:32:26 +05:30
rahul shukla	e3e7c47b15	updated comment	2020-01-28 10:57:17 +05:30
rahul shukla	469ed35ede	Issue #2155	2020-01-28 10:55:00 +05:30
Florian Bosdorff	bf53dd49f3	remove unused use statement	2020-01-27 17:25:37 +01:00
Florian Bosdorff	d125f9eba0	add reporting for try-catch-sections	2020-01-27 17:06:03 +01:00
shubhammehrotra.symfony@webkul.com	fb5ee7c6d7	view order page updates	2020-01-27 19:49:02 +05:30
Jitendra Singh	0cd4a2678a	Merge pull request #1996 from Haendlerbund/introduce-api-token-columns-into-database ... add missing api_token columns to database (table customers and admins)	2020-01-27 18:31:13 +05:30
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