3990 Commits

Author	SHA1	Message	Date
rahulshukla-home	65f894689b	Issue #2942	2020-04-29 14:32:56 +05:30
Steffen Mahler	da90ed31b5	refactoring, variable renamed	2020-04-29 10:49:36 +02:00
Steffen Mahler	214d7a8161	merge branch 'add_tests_for_cart_rules' of https://github.com/Haendlerbund/bagisto into add_tests_for_cart_rules	2020-04-29 10:42:31 +02:00
Steffen Mahler	5d43e2b8bb	type hint changed	2020-04-29 10:40:41 +02:00
SteffenMahler	ede46da84b	Merge branch 'master' into add_tests_for_cart_rules	2020-04-29 10:31:06 +02:00
rahulshukla-home	6118cabbde	localization error message added in velocity theme	2020-04-29 13:55:04 +05:30
Annika Wolff	5e1c0ac5d2	resolve issue 2964	2020-04-29 10:03:37 +02:00
Herbert Maschke	3154d27f52	introduce channel and customer group filter for cart rule grid	2020-04-29 09:19:47 +02:00
Steffen Mahler	d973ec94c0	add CartRuleCest	2020-04-28 18:15:40 +02:00
Jitendra Singh	be3fe03e27	Merge pull request #2959 from jitendra-webkul/1.0 ... Issue #2945 fixed	2020-04-28 20:48:08 +05:30
Pranshu Tomar	b5ebfe79ea	Issue #2945 fixed	2020-04-28 20:34:14 +05:30
Jitendra Singh	a8c969d019	Merge pull request #2958 from jitendra-webkul/1.0 ... Issue #2954 fixed	2020-04-28 20:03:36 +05:30
Pranshu Tomar	1a716047ac	Issue #2954 fixed	2020-04-28 19:57:30 +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
namvarii	cd8e994efa	fix translation in add attribute button ... fix add button not translated to other language.	2020-04-28 18:09:21 +04:30
Jitendra Singh	10b05e58b1	Merge pull request #2955 from rahulcs0082/development ... max price issue in category	2020-04-28 17:30:50 +05:30
rahulshukla-home	abac3a297f	max price issue in category	2020-04-28 14:40:08 +05:30
Jitendra Singh	73ca29c476	Merge pull request #2953 from rahulcs0082/development ... fix category issue and change country,state order	2020-04-28 11:19:07 +05:30
Jitendra Singh	0e4a5e792f	Merge pull request #2947 from shubhwebkul/master ... resolved issue with product images carousel	2020-04-28 11:18:52 +05:30
rahulshukla-home	837c5d44fa	fix category issue and change country,state order	2020-04-28 08:14:53 +05:30
Jitendra Singh	22b4079fdb	Merge pull request #2952 from jitendra-webkul/1.0 ... Auto exchange rate feature added	2020-04-27 20:08:26 +05:30
Pranshu Tomar	b3b20a904c	Auto exchange rate feature added	2020-04-27 19:57:13 +05:30
Shubham Mehrotra	2a5c65bcea	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-04-27 13:44:07 +05:30
Shubham Mehrotra	0242a0cf2e	resolved issue with product images carousel	2020-04-27 13:43:22 +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	8d82b19d83	Merge pull request #2777 from gfd6th/master ... Add Cacheable Trait to Repository	2020-04-27 11:34:57 +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
Jitendra Singh	4115a3a4df	Merge pull request #2932 from shubhwebkul/master ... misc. bug fixes	2020-04-27 11:22:12 +05:30
Jitendra Singh	aababbf66e	Merge pull request #2934 from Haendlerbund/add-booking-product-template-only-if-view-exists ... Booking Products: Inject template only if exists	2020-04-27 11:20:19 +05:30
Vivek	d653cbd1b4	[Updated: getBaseImage() method updated for configurable product.]	2020-04-24 22:25:08 +05:30
Annika Wolff	7ab7654c6b	add check if view exists	2020-04-24 14:54:53 +02:00
Jitendra Singh	da9382d090	Merge pull request #2903 from Haendlerbund/unnecessary-channel-for-taxes ... Bugfix: Channel assigned to tax category	2020-04-24 18:03:48 +05:30
Jitendra Singh	a593f89412	Merge pull request #2927 from chemisax/master ... Add Japanese translation	2020-04-24 18:03:38 +05:30
Shubham Mehrotra	deb9a4c38f	content header path update	2020-04-24 16:40:39 +05:30
Shubham Mehrotra	1d7228ea54	#2919	2020-04-24 16:28:00 +05:30
Shubham Mehrotra	6fc769bfaf	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-04-24 15:26:35 +05:30
Shubham Mehrotra	9361e9e77f	removed layered navigation in searchproducts page	2020-04-24 15:26:20 +05:30
Shubham Mehrotra	d439077228	customer sidebar menu issue resolved	2020-04-24 15:25:43 +05:30
Shubham Mehrotra	b5b6532f3e	#2908	2020-04-24 15:25:25 +05:30
Jitendra Singh	9b58604c23	Merge pull request #2928 from jitendra-webkul/1.0 ... Moved commands to packages	2020-04-23 18:25:53 +05:30
Pranshu Tomar	8030b097e7	Moved command to packages	2020-04-23 13:46:47 +05:30
José María Campaña	f4b6762589	Add Japanese translation	2020-04-22 15:23:00 -05:00
Jitendra Singh	7629d85d16	Merge pull request #2910 from Haendlerbund/unified-addresses ... Unified addresses (#2902)	2020-04-22 17:05:57 +05:30
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
Jitendra Singh	6beb0f9b3d	Merge pull request #2921 from Haendlerbund/update-order-item-factory ... add option to OrderItemFactory to use existing product	2020-04-21 16:30:18 +05:30
Jitendra Singh	7f7a3a9678	Merge pull request #2904 from Haendlerbund/introduce-channel-and-channel-inventory-factory ... introduce 2 new factories for channel and channel inventory source	2020-04-21 16:30:09 +05:30
Annika Wolff	be435208df	add option to OrderItemFactory to use existing product	2020-04-21 10:52:48 +02:00
Shubham Mehrotra	ab50478351	update	2020-04-20 13:37:19 +05:30
Shubham Mehrotra	bc94f318f5	update	2020-04-20 13:17:42 +05:30
Florian Bosdorff	4e96ce5b59	fix typo in address migration	2020-04-20 09:37:39 +02:00
Shubham Mehrotra	76a9ed1085	#2915	2020-04-20 13:03:31 +05:30
Shubham Mehrotra	1403364942	responsive cart count update	2020-04-20 12:19:15 +05:30
Florian Bosdorff	754c52e556	rename address types	2020-04-20 08:22:31 +02:00
Shubham Mehrotra	f9f8b940e7	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-04-18 00:29:55 +05:30
Shubham Mehrotra	9b6b3eedc3	variant products images update issue resolved	2020-04-18 00:29:39 +05:30
Florian Bosdorff	910f76952f	fix address-constrains; fix address global scopes	2020-04-17 15:54:02 +02:00
rahulshukla-home	d21e027db3	Issue #2721	2020-04-17 17:53:23 +05:30
rahulshukla-home	10f76b2631	Issue #2793	2020-04-17 15:17:32 +05:30
Florian Bosdorff	01d4cb026f	fix address_type at many places; add tests for address relations	2020-04-17 11:09:59 +02:00
rahulshukla-home	29ecd9aa15	Issue #2863 fixed	2020-04-17 14:27:35 +05:30
rahulshukla-home	2b19040211	Issue #2884	2020-04-17 13:34:19 +05:30
Florian Bosdorff	5a9dfd8561	add unified address-table and handling for models	2020-04-16 21:13:19 +02:00
rahulshukla-home	3412da366f	Issue #2893	2020-04-16 19:18:01 +05:30
rahulshukla-home	bcb32f3121	removed dd	2020-04-16 18:19:56 +05:30
rahulshukla-home	4a57040843	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-04-16 18:17:07 +05:30
rahulshukla-home	2eb8aa972c	Issue #2895	2020-04-16 18:16:40 +05:30
Annika Wolff	3729b9daaf	introduce channel and channel inventory source factories	2020-04-16 14:05:42 +02:00
Annika Wolff	7a9f099b7b	remove channel from tax category	2020-04-16 10:25:45 +02:00
Shubham Mehrotra	53a12465f0	2875 update	2020-04-15 18:34:22 +05:30
Shubham Mehrotra	1f41b2ab06	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-04-15 17:47:29 +05:30
rahulshukla-home	09ee600713	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-04-15 15:11:23 +05:30
rahulshukla-home	1d502be939	Issue #2890	2020-04-15 15:11:08 +05:30
Shubham Mehrotra	e4c96ad3a5	#2875	2020-04-15 13:08:11 +05:30
Jitendra Singh	7c7b99c901	Merge pull request #2882 from shubhwebkul/master ... subcategory issue resolved	2020-04-14 12:08:28 +05:30
Shubham Mehrotra	ef7d718d1f	subcategory issue resolved	2020-04-14 11:05:25 +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
Jitendra Singh	fdd991a27b	Merge pull request #2879 from jitendra-webkul/1.0 ... Issue #2871 fixed	2020-04-13 21:06:30 +05:30
Pranshu Tomar	dd46e23628	Issue #2871 fixed	2020-04-13 20:58:34 +05:30
Jitendra Singh	f1cec6ebe4	Merge pull request #2878 from jitendra-webkul/1.0 ... Issue #2784 fixed	2020-04-13 19:43:04 +05:30
Pranshu Tomar	3d7d1ab574	Issue #2784 fixed	2020-04-13 16:50:05 +05:30
Jitendra Singh	94a08b7c86	Merge pull request #2867 from VaD1ke/translation-fixes ... Translation fixes	2020-04-13 16:01:44 +05:30
Jitendra Singh	c71353ffc2	Merge pull request #2872 from cagartner/add_view_events ... Added new view_render_event events	2020-04-13 16:01:09 +05:30
Shubham Mehrotra	21a62ff05a	#2876	2020-04-13 13:36:16 +05:30
Shubham Mehrotra	8e93a3ffb8	calculate height on change value of dropdown	2020-04-13 11:20:48 +05:30
Shubham Mehrotra	4b03e79b86	#2866	2020-04-13 11:03:39 +05:30
Carlos Augusto Gartner	1f30769a98	Created new view_render_events for admin order and invoice view	2020-04-12 22:08:51 -03:00
Carlos Augusto Gartner	5a3e1919d7	Added view_render_event to admin order view	2020-04-12 21:55:07 -03:00
Carlos Augusto Gartner	e293fbfce2	Added more view_render_events in the customer account views	2020-04-12 21:36:37 -03:00
Jitendra Singh	9508c3d05c	Merge branch 'master' into webinstall	2020-04-11 18:53:30 +05:30
VaD1ke	e1ae7216d5	Fix save-category btn translation for langs with noun case	2020-04-11 13:09:20 +03:00
VaD1ke	fe84dbb2fc	Translate mass-update for review status in admin grid	2020-04-11 13:03:31 +03:00
Pranshu Tomar	5310f9e17c	Fixed date icon issue	2020-04-10 15:33:48 +05:30
Jitendra Singh	9752f634e7	Merge pull request #2787 from Haendlerbund/add-option-for-set-current-channel ... add option to set current channel	2020-04-10 11:45:04 +05:30
Jitendra Singh	fa8120b1bf	Merge pull request #2692 from Haendlerbund/improve-have-product-faker ... refactor haveProduct() method to allow custom attribute handling	2020-04-10 11:43:34 +05:30
Jitendra Singh	8bee45f7f5	Merge pull request #2857 from shubhwebkul/master ... misc. bug fixes	2020-04-10 11:13:02 +05:30
rahulshukla-home	f887f070c7	Issue #2793	2020-04-09 22:07:04 +05:30
Shubham Mehrotra	72f11fb049	#2790	2020-04-09 20:19:36 +05:30
Shubham Mehrotra	9b56315f65	subcategory visibility issue in responsive	2020-04-09 19:58:25 +05:30
Shubham Mehrotra	bc23025ccc	#2856	2020-04-09 18:28:52 +05:30
Shubham Mehrotra	a1f4e1d66c	#2849	2020-04-09 17:59:12 +05:30
rahulshukla-home	7cae8df9aa	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-04-09 17:31:12 +05:30
rahulshukla-home	a1fa3f64e0	Issue #2794	2020-04-09 17:31:00 +05:30
Shubham Mehrotra	373a293c5a	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-04-09 17:25:20 +05:30
Shubham Mehrotra	63b423da58	#2691	2020-04-09 17:24:45 +05:30
Jitendra Singh	b82c47ea45	Merge pull request #2854 from shubhwebkul/master ... Issue #2834 resolved	2020-04-09 15:34:55 +05:30
Jitendra Singh	9375ed6a8e	Merge pull request #2852 from rahulcs0082/development ... Issue #2713 fixed	2020-04-09 15:34:27 +05:30
Pranshu Tomar	b3c6b938cf	Issue #2768 fixed	2020-04-09 15:24:54 +05:30
Pranshu Tomar	66ea50bb5c	Issue #2851 fixed	2020-04-09 15:16:24 +05:30
Pranshu Tomar	7d360626e0	Issue #2851 fixed	2020-04-09 14:24:25 +05:30
rahulshukla-home	b58cc7e3e5	Issue #2713 fixed	2020-04-09 13:55:40 +05:30
Shubham Mehrotra	187c99ce54	#2834	2020-04-09 13:26:33 +05:30
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