3876 Commits

Author	SHA1	Message	Date
Shubham Mehrotra	c2022a9b50	checkout page email validation	2020-04-08 18:55:20 +05:30
hexu	81c6a1b538	Merge pull request #3 from bagisto/master ... update	2020-04-08 20:43:49 +08:00
Shubham Mehrotra	67a4720af9	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-04-08 11:31:50 +05:30
Shubham Mehrotra	eda27956a5	margin added between wishlist icon and compare icon	2020-04-08 11:31:39 +05:30
shivam kumar	61f27800fd	issue #2792 resolved	2020-04-07 19:51:42 +05:30
Jitendra Singh	b3e326d5d7	Merge pull request #2839 from shivam-webkul/master ... code changed for api	2020-04-07 15:28:50 +05:30
Shubham Mehrotra	16d359a709	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-04-07 13:57:12 +05:30
Shubham Mehrotra	9e768afa3c	#2329	2020-04-07 13:57:01 +05:30
shivam kumar	c059d137b2	code changed for api	2020-04-07 12:50:40 +05:30
shivam kumar	4ec82687cd	api changes	2020-04-06 21:47:17 +05:30
Shubham Mehrotra	804dc01512	compare page update height after loading images	2020-04-06 14:48:54 +05:30
Shubham Mehrotra	0e06a114af	customer accordian design update	2020-04-06 10:46:11 +05:30
Shubham Mehrotra	26b0e253d1	customer panel accordian view and file picker view	2020-04-06 10:27:07 +05:30
Herbert Maschke	df6dc49313	Merge branch 'bagisto/master' into improve-have-product-faker	2020-04-04 11:14:29 +02:00
Shubham Mehrotra	b92e6796c3	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-04-03 17:42:12 +05:30
Shubham Mehrotra	9bcc6242dd	customer options click issue resolved	2020-04-03 17:41:57 +05:30
Shubham Mehrotra	4c8ad5068b	category call get products method	2020-04-03 17:41:27 +05:30
rahulshukla-home	961850b2e9	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-04-03 13:31:32 +05:30
rahulshukla-home	07f351322d	revert back changes in format price	2020-04-03 13:31:09 +05:30
Shubham Mehrotra	bc838a2269	remove irrelevant xhr	2020-04-03 11:20:52 +05:30
Shubham Mehrotra	96e730f848	#2775	2020-04-02 20:35:26 +05:30
Shubham Mehrotra	ff20147e23	remove irrelevant css	2020-04-02 19:50:59 +05:30
Shubham Mehrotra	438aab3021	bundled assets	2020-04-02 19:22:11 +05:30
Shubham Mehrotra	9f36a8847c	modal view update	2020-04-02 19:20:35 +05:30
Shubham Mehrotra	0c0dc5da60	checkout page issue	2020-04-02 17:13:36 +05:30
Shubham Mehrotra	efd96f8259	{git commit -m	2020-04-02 12:49:44 +05:30
Jitendra Singh	f4249f25f6	Merge pull request #2815 from shubhwebkul/patch-2 ... misc. bug fixes	2020-04-01 18:39:13 +05:30
Jitendra Singh	256c6fd4b5	Merge pull request #2802 from Haendlerbund/pr-2753/flickering-locale-factory ... fix still flickering locale factory	2020-04-01 18:36:03 +05:30
Jitendra Singh	6e18ea7f8e	Merge pull request #2803 from Haendlerbund/fix_tax_rate_rounding ... Fix tax rate rounding	2020-04-01 18:35:53 +05:30
Shubham Mehrotra	3f8741e671	resolved conflicts	2020-04-01 18:29:48 +05:30
Shubham Mehrotra	a5e9c23530	checkout page margin added	2020-04-01 18:26:27 +05:30
Shubham Mehrotra	e259d6b8bf	#2785	2020-04-01 17:58:10 +05:30
Shubham Mehrotra	eabbbfe15a	#2808	2020-04-01 16:21:22 +05:30
Shubham Mehrotra	dd88a81f92	remove line	2020-04-01 12:26:21 +05:30
Herbert Maschke	292e7c5e08	raise generated default inventory quantity to _at least_ 100 to avoid sellout in checkout tests	2020-03-31 15:41:50 +02:00
Herbert Maschke	62ceb45ee5	raise generated default inventory quantity to 80 to avoid sellout in checkout tests	2020-03-31 15:34:09 +02:00
Herbert Maschke	2bf180e24f	generate product as "buyable as guest" by default	2020-03-31 15:10:18 +02:00
Herbert Maschke	5219b03265	4,1,1000	2020-03-31 15:01:42 +02:00
Herbert Maschke	e83917a2e6	attempt to fake 4 instead of 2 decimals in price	2020-03-31 14:50:54 +02:00
Herbert Maschke	5e89baf4e9	improve randomFloat faker values	2020-03-31 14:46:08 +02:00
Herbert Maschke	3048ae4a7b	restore createInventory, its necessary...	2020-03-31 14:40:40 +02:00
Herbert Maschke	0f5913fbba	various code style improvements	2020-03-31 14:35:01 +02:00
Steffen Mahler	1b884cdb42	refactoring, fix typo	2020-03-31 09:12:47 +02:00
Steffen Mahler	c13ae36494	fix tax rate rounding	2020-03-30 19:30:10 +02:00
Shubham Mehrotra	2bd1458990	Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1	2020-03-30 21:09:59 +05:30
Shubham Mehrotra	0005241794	misc. updates	2020-03-30 21:09:40 +05:30
Herbert Maschke	f7a69d4a30	optimize fetching of possible attributes in Laravel5Helper.php haveProduct() method	2020-03-30 15:03:27 +02:00
Herbert Maschke	613b3ea523	Merge branch 'bagisto/master' into improve-have-product-faker	2020-03-30 14:43:30 +02:00
Annika Wolff	505014266e	fix still flickering locale factory	2020-03-30 11:05:45 +02:00
Jitendra Singh	88ce2bd320	Merge pull request #2799 from jitendra-webkul/1.0 ... Issue #2764 fixed	2020-03-29 16:25:41 +05:30
Pranshu Tomar	4fd49df5c5	Issue #2764 fixed	2020-03-29 16:20:43 +05:30
Jitendra Singh	633db5e4bd	Merge pull request #2798 from jitendra-webkul/1.0 ... Issue #2763 fixed	2020-03-29 16:12:09 +05:30
Pranshu Tomar	b28ac37c8f	Issue #2763 fixed	2020-03-29 15:35:56 +05:30
Florian Bosdorff	271c0e38ac	add option to set current channel	2020-03-27 16:07:53 +01:00
Shubham Mehrotra	200ac87cb1	#2780	2020-03-27 15:10:30 +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
hexu	1b6fee90ef	Add repository cacheable trait ... self::findByField does not work for repository cache, so I change it to $this->findByField	2020-03-27 12:03:18 +08:00
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
Carlos Augusto Gartner	3ab051c07a	Added translation to velocity and fixed some admin translations	2020-03-25 12:59:15 -03:00
Shubham Mehrotra	15c4e0686b	compare products in default theme	2020-03-25 13:10:33 +05:30
Shubham Mehrotra	38b65dd78f	resolved conflicts	2020-03-24 20:15:13 +05:30
Shubham Mehrotra	139bd36443	forget password message	2020-03-24 20:11:48 +05:30
Pranshu Tomar	7e81f0bf4f	Fixed validation issue	2020-03-24 19:59:06 +05:30
Shubham Mehrotra	6aaef49e2a	resolved conflicts	2020-03-24 19:32:07 +05:30
Shubham Mehrotra	b079b6f83c	wishlist issue	2020-03-24 19:28:37 +05:30
Jitendra Singh	411365d476	Revert "Upgraded velocity theme npm dependencies"	2020-03-24 19:23:01 +05:30
Shubham Mehrotra	cf2610f239	cart move to wishlist issue resolved	2020-03-24 19:18:00 +05:30
Shubham Mehrotra	11746a9ca6	resolved conflicts	2020-03-24 18:47:57 +05:30
Shubham Mehrotra	3514612fe9	#2610	2020-03-24 18:44:38 +05:30
Jitendra Singh	c01c70e776	Merge pull request #2758 from jitendra-webkul/1.0 ... Upgraded velocity theme npm dependencies	2020-03-24 18:20:03 +05:30
Pranshu Tomar	3d3a2d6036	Resolve conflicts	2020-03-24 18:13:58 +05:30
Pranshu Tomar	80508e7a06	Upgraded velocity theme npm dependencies	2020-03-24 18:09:02 +05:30
Shubham Mehrotra	299cdfdde7	Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1	2020-03-24 17:24:26 +05:30
Shubham Mehrotra	23ddd66e7f	#2750	2020-03-24 17:24:03 +05:30
Jitendra Singh	ce2c329e63	Merge pull request #2755 from shubhwebkul/patch-1 ... Issue #2600 resolved	2020-03-24 17:12:17 +05:30
Shubham Mehrotra	10c39a8de2	resolved conflicts	2020-03-24 16:45:56 +05:30
Jitendra Singh	1d9b2659b9	Merge pull request #2753 from Haendlerbund/prevent-locale-factory-from-flickering ... prevent locale factory from flickering	2020-03-24 16:45:12 +05:30
Pranshu Tomar	cf314c964e	Fixed undefind variable issue in rental booking helper	2020-03-24 16:42:57 +05:30
Shubham Mehrotra	f7187a3f2f	Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1	2020-03-24 16:27:30 +05:30
Shubham Mehrotra	773e41dab4	#2600	2020-03-24 16:27:12 +05:30
Pranshu Tomar	50decb81cb	Conflicts resolved	2020-03-24 16:25:10 +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
Annika Wolff	8a2a84b1e6	get existing locale or create new one	2020-03-24 10:58:20 +01:00
Jitendra Singh	e6e84dfdf9	Merge pull request #2751 from jitendra-webkul/1.0 ... Issue #2717 fixed	2020-03-24 14:01:00 +05:30
Pranshu Tomar	66213ab5f3	Issue #2717 fixed	2020-03-24 13:54:17 +05:30
Jitendra Singh	80a342b20b	Merge pull request #2745 from shubhwebkul/patch-1 ... Issue #2610 resolved	2020-03-24 11:38:41 +05:30
Jitendra Singh	c67f971a90	Merge pull request #2748 from rahulcs0082/development ... Development	2020-03-24 11:37:13 +05:30
rahulshukla-home	f19206ab6e	Issue #2593 fixed	2020-03-24 11:26:03 +05:30
Jitendra Singh	1e84811539	Merge pull request #2747 from jitendra-webkul/1.0 ... Issue #2715 fixed	2020-03-24 11:06:37 +05:30
Pranshu Tomar	4b84b89251	Issue #2715 fixed	2020-03-24 11:05:34 +05:30
Pranshu Tomar	6b3a30645c	Removed commented code fom cart controller	2020-03-24 11:03:36 +05:30
Jitendra Singh	3a4dfa3180	Merge pull request #2746 from jitendra-webkul/1.0 ... Issue #2724 fixed	2020-03-24 10:57:28 +05:30
Pranshu Tomar	2334cf4cc7	Issue #2724 fixed	2020-03-24 10:52:45 +05:30
Shubham Mehrotra	0af1f87929	Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1	2020-03-24 10:33:22 +05:30
Shubham Mehrotra	7e082f7aa3	#2610	2020-03-24 10:33:03 +05:30
rahulshukla-home	4510a42d34	testing	2020-03-24 02:17:17 +05:30
Jitendra Singh	1f5ec6aa72	Merge pull request #2743 from jitendra-webkul/1.0 ... Issue #2722 fixed	2020-03-23 22:57:33 +05:30
Pranshu Tomar	6d5cc8a456	Issue #2722 fixed	2020-03-23 22:53:23 +05:30
Jitendra Singh	e0a4051f71	Merge pull request #2742 from jitendra-webkul/1.0 ... Issue #2728 fixed	2020-03-23 22:16:18 +05:30
Pranshu Tomar	b03f0075aa	Issue #2728 fixed	2020-03-23 22:12:21 +05:30
Jitendra Singh	e20aa40e06	Merge pull request #2741 from jitendra-webkul/1.0 ... Issue #2719 fixed	2020-03-23 22:03:30 +05:30
Pranshu Tomar	b158c54480	Issue #2719 fixed	2020-03-23 21:54:55 +05:30
Jitendra Singh	076dcdc3e0	Merge pull request #2740 from jitendra-webkul/1.0 ... Issue #2716 fixed	2020-03-23 20:25:51 +05:30
Pranshu Tomar	7b88e20153	Issue #2716 fixed	2020-03-23 20:21:48 +05:30
Jitendra Singh	7495116893	Merge pull request #2737 from shubhwebkul/patch-1 ... misc. bug fixes	2020-03-23 19:18:17 +05:30
Pranshu Tomar	f8194ff430	Issue #2714 fixed	2020-03-23 18:59:04 +05:30
Shubham Mehrotra	129abae0f6	Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1	2020-03-23 18:43:36 +05:30
Shubham Mehrotra	2ccf0271a2	#2713	2020-03-23 18:43:12 +05:30
Pranshu Tomar	c181ef7ec8	Issue #2712 fixed	2020-03-23 18:01:06 +05:30
Shubham Mehrotra	5cd33c9c0e	Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1	2020-03-23 17:49:46 +05:30
Shubham Mehrotra	4b1abde920	wishlist products update logged-in customer	2020-03-23 17:49:21 +05:30
Pranshu Tomar	45b6849006	Issue #2708 fixed	2020-03-23 15:29:40 +05:30
Pranshu Tomar	0f3651783e	Issue #2708 fixed	2020-03-23 15:28:33 +05:30
Jitendra Singh	9b2589ad45	Merge pull request #2734 from shubhwebkul/patch-1 ... misc. bug fixes	2020-03-23 14:56:00 +05:30
Jitendra Singh	1ff5aaab92	Issue #2706 fixed	2020-03-23 14:48:03 +05:30
Shubham Mehrotra	9cf7b960e8	Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1	2020-03-23 14:14:49 +05:30
Shubham Mehrotra	59ba5a56f9	#2732 #2579	2020-03-23 14:14:11 +05:30
Jitendra Singh	80d64146e1	Merge pull request #2733 from jitendra-webkul/1.0 ... Issue #2704 fixed	2020-03-23 13:53:09 +05:30
Jitendra Singh	6380d9096e	Merge pull request #2731 from SteffenMahler/patch-5 ... add CartRuleCouponFactory	2020-03-23 13:49:06 +05:30
Pranshu Tomar	93e31b3ac8	Issue #2704 fixed	2020-03-23 13:47:08 +05:30
SteffenMahler	85319272a2	add CartRuleCouponFactory ... this is for testing purposes	2020-03-23 08:15:02 +01:00
phillipcodes	1486576840	Update CustomerAddress.php	2020-03-23 08:01:28 +01:00
Shubham Mehrotra	10381769df	Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1	2020-03-23 10:56:38 +05:30
Shubham Mehrotra	198088f728	responsive console error resolved	2020-03-23 10:56:27 +05:30
ghermans	cea497812e	fixed typo	2020-03-23 04:51:32 +01:00
ghermans	bd6c3aa1df	Added dutch locale	2020-03-23 04:31:33 +01:00
Shubham Mehrotra	c1d39a22f4	product card default image	2020-03-20 16:41:18 +05:30
Jitendra Singh	6de80fff2f	Merge pull request #2711 from jitendra-webkul/1.0 ... Issue #2707 fixed	2020-03-20 16:13:54 +05:30
Pranshu Tomar	af1846a814	Issue #2707 fixed	2020-03-20 15:46:42 +05:30
Shubham Mehrotra	5e82c8c1e6	responsive cart page update	2020-03-20 15:05:44 +05:30
Shubham Mehrotra	b7ccb5c214	#2640	2020-03-20 13:25:49 +05:30
Jitendra Singh	28f1ab7afe	Merged with master	2020-03-19 19:18:59 +05:30
Jitendra Singh	0f827ff64c	Merge pull request #2699 from shubhwebkul/velocity-updated ... Issue #2592 Resolved	2020-03-19 18:53:05 +05:30
shubhammehrotra.symfony@webkul.com	7de8e6a0d4	misc. updates	2020-03-19 18:45:43 +05:30
mohd asif	a1124fc7b6	resolved conflicts	2020-03-19 18:07:25 +05:30
shubhammehrotra.symfony@webkul.com	3e2dd34ddd	#2592	2020-03-19 17:57:52 +05:30
Jitendra Singh	3ae60bf94e	Merge pull request #2697 from jitendra-webkul/1.0 ... Issue #2594 fixed	2020-03-19 17:12:22 +05:30
Jitendra Singh	deda73af48	Issue #2594 fixed	2020-03-19 17:07:46 +05:30
Jitendra Singh	edee5c2f16	Merge pull request #2696 from shubhwebkul/velocity-updated ... misc. bug fixes	2020-03-19 16:53:54 +05:30
shubhammehrotra.symfony@webkul.com	9f45675399	remove debugger	2020-03-19 16:44:12 +05:30
shubhammehrotra.symfony@webkul.com	c80bf519e8	#2693, #2641	2020-03-19 16:39:29 +05:30
Jitendra Singh	4ee1ad8e76	Merge pull request #2695 from SteffenMahler/patch-4 ... update Cart.php	2020-03-19 16:38:02 +05:30
SteffenMahler	14efa58c0a	tiny fixes, add before event	2020-03-19 12:02:11 +01:00
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
SteffenMahler	62eaad1091	update Cart.php ... Dispatch an event after function calculateItemsTax() is finished	2020-03-19 10:38:47 +01:00
Herbert Maschke	c76c7a1d88	introduce cart belongsTo Relation in Order Model	2020-03-19 08:17:29 +01:00
shubhammehrotra.symfony@webkul.com	787304b6f2	quick view update	2020-03-19 11:25:05 +05:30
Herbert Maschke	b8e4692114	refactor haveProduct() method to allow custom attribute handling	2020-03-18 14:59:10 +01:00
Jitendra Singh	7faf5bb97f	Merge pull request #2690 from rahulshukla-webkul/development ... Issue #2549	2020-03-18 18:52:02 +05:30
rahul shukla	7174ccbfd0	Issue #2549	2020-03-18 18:48:02 +05:30
Jitendra Singh	001262e6de	Merge pull request #2688 from jitendra-webkul/1.0 ... Issue #2518 fixed	2020-03-18 17:19:27 +05:30
Jitendra Singh	893564977f	Issue #2518 fixed	2020-03-18 17:15:44 +05:30
rahul shukla	d9a391f1cc	Issue #2593 fixed	2020-03-18 16:15:33 +05:30
Jitendra Singh	7b5930f8bc	Merge pull request #2686 from jitendra-webkul/1.0 ... Issue #2613 fixed	2020-03-18 14:54:31 +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
Jitendra Singh	bc39a19f49	Issue #2613 fixed	2020-03-18 14:50:20 +05:30
Jitendra Singh	3002723e78	Merge pull request #2683 from phillipcodes/patch-1 ... Fix cart discount naming in API	2020-03-18 13:41:12 +05:30
Jitendra Singh	45ce9b03db	Merge pull request #2685 from jitendra-webkul/1.0 ... Issue #2677 fixed	2020-03-18 13:34:29 +05:30
Jitendra Singh	17abfdb1d6	Issue #2677 fixed	2020-03-18 13:24:12 +05:30
phillipcodes	7fdc8fd4a6	Update Cart.php	2020-03-17 15:05:00 +01:00
Vivek	ad76426fb5	[Updated: Shop & admin email setting added in configuration.]	2020-03-17 16:10:47 +05:30
shubhammehrotra.symfony@webkul.com	e96c6011e0	Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated	2020-03-17 15:48:29 +05:30
shubhammehrotra.symfony@webkul.com	c06aeadb37	product add to cart issue resolved on PDP	2020-03-17 15:48:10 +05:30
Jitendra Singh	279ab5b237	Merge pull request #2679 from jitendra-webkul/1.0 ... Issue #2669 fixed	2020-03-17 15:38:48 +05:30
Jitendra Singh	d76a8d8dec	Issue #2669 fixed	2020-03-17 15:34:33 +05:30
shubhammehrotra.symfony@webkul.com	d5b1e84fdb	#2678	2020-03-17 14:00:07 +05:30
shubhammehrotra.symfony@webkul.com	32701de737	#2666	2020-03-17 13:34:44 +05:30
shubhammehrotra.symfony@webkul.com	ca4ae665f1	#2667	2020-03-17 13:13:24 +05:30
Jitendra Singh	8ac4946352	Merge pull request #2676 from jitendra-webkul/1.0 ... Issue #2671 fixed	2020-03-17 13:02:41 +05:30
Jitendra Singh	cdc1eb7bc1	Issue #2671 fixed	2020-03-17 13:01:37 +05:30
Jitendra Singh	df9611d030	Merge pull request #2673 from jitendra-webkul/1.0 ... Issue #2672 fixed	2020-03-17 12:26:23 +05:30
Jitendra Singh	bf5ad13dac	Issue #2672 fixed	2020-03-17 12:25:04 +05:30
shubhammehrotra.symfony@webkul.com	f354d0aafa	shimmer effect added in wishlist and comparison	2020-03-17 11:44:22 +05:30
mohd asif	47c4a5ef42	upadated missing translation for dutch and protoguese in velocity package	2020-03-17 10:12:33 +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
shubhammehrotra.symfony@webkul.com	ce90035edb	hide compare, wishlist icon	2020-03-16 18:52:37 +05:30
shubhammehrotra.symfony@webkul.com	d83bc00289	Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated	2020-03-16 18:47:10 +05:30
shubhammehrotra.symfony@webkul.com	61f949f43e	#2646	2020-03-16 18:46:56 +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
shubhammehrotra.symfony@webkul.com	bc362144c3	added shimmer effect product cards	2020-03-16 16:33:53 +05:30
mohd asif	e7a9303b51	updated missing translation for portoguese in admin package	2020-03-16 16:24:04 +05:30
Jitendra Singh	1eb1954a4f	Merge pull request #2665 from shubhwebkul/velocity-updated ... misc. bug fixes	2020-03-16 15:10:48 +05:30
mohd asif	65814e0f04	upadated missing translation for Dutch for admin package	2020-03-16 14:07:08 +05:30
shubhammehrotra.symfony@webkul.com	cc12549336	#2636	2020-03-16 13:40:21 +05:30
shubhammehrotra.symfony@webkul.com	ee4f81004c	#2639	2020-03-16 13:34:01 +05:30
mohd asif	9901209a4b	upadated missing translation for persian in admin package	2020-03-16 13:25:14 +05:30
Vivek	e1ed114d74	[Updated: Core/Config.php modified.]	2020-03-16 13:13:57 +05:30
Jitendra Singh	96ab5e390e	Merge pull request #2662 from jitendra-webkul/1.0 ... Issue #2660 fixed	2020-03-16 11:57:51 +05:30
Jitendra Singh	282545e1c4	Issue #2660 fixed	2020-03-16 11:53:39 +05:30
Vivek	1572075443	[Updated: worked on conflict.]	2020-03-16 11:10:07 +05:30
Jitendra Singh	355a6a5c5d	Merge pull request #2659 from jitendra-webkul/1.0 ... Issue #2658 fixed	2020-03-16 11:03:00 +05:30
Jitendra Singh	7182400059	Issue #2658 fixed	2020-03-16 11:02:14 +05:30
mohd asif	1e5baab3a4	added missed translation for arabic	2020-03-16 10:56:10 +05:30
Jitendra Singh	7072a60cda	Merge pull request #2657 from jitendra-webkul/1.0 ... Issue #2654 fixed	2020-03-13 19:16:48 +05:30
Jitendra Singh	7413e1577e	Issue #2654 fixed	2020-03-13 19:15:59 +05:30
Jitendra Singh	65b34add4b	Merge pull request #2656 from jitendra-webkul/1.0 ... Catalog price rule issue fixed if discounted and normal price is same	2020-03-13 19:08:08 +05:30