1621 Commits

Author	SHA1	Message	Date
Jitendra Singh	8d7faa865c	Merge pull request #3695 from devansh-webkul/adding_missing_translation ... Added missing translations	2020-08-11 18:49:52 +05:30
Jitendra Singh	bebcf38f9c	Merge pull request #3711 from akhtarkhan1/select_icon_payment_page ... issued fixed #3688	2020-08-11 18:46:06 +05:30
Devansh	61f0e0f296	Merge branch 'master' into adding_missing_translation	2020-08-11 17:38:49 +05:30
Jitendra Singh	aaf0d5c962	Merge pull request #3719 from rahulcs0082/development ... Issue #3717 fixed	2020-08-11 16:58:54 +05:30
Devansh	43eb5b7f83	Added Invoice State Check	2020-08-11 12:29:19 +05:30
rahulshukla-home	c8a70f7f36	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-08-11 12:04:31 +05:30
Shubham Mehrotra	bcc87623d8	updates	2020-08-11 12:04:10 +05:30
rahulshukla-home	ddcad7544c	Issue #3717 fixed	2020-08-11 12:02:54 +05:30
Devansh	104ba6ce1f	Invoice State Added To The Query	2020-08-10 22:28:23 +05:30
Shubham Mehrotra	17a5e453f5	updates	2020-08-10 22:20:46 +05:30
Shubham Mehrotra	e40afeaf90	update	2020-08-10 21:43:31 +05:30
Akhtar Khan	e9f40fa9d7	#3688	2020-08-10 21:30:52 +05:30
Shubham Mehrotra	78d015f41f	compare feature update	2020-08-10 21:24:59 +05:30
Akhtar Khan	76cadf49ca	changed files #3688	2020-08-10 21:13:09 +05:30
Akhtar Khan	0289094a7f	changed files #3688	2020-08-10 21:08:56 +05:30
Akhtar Khan	48a39ff498	Merge branch 'master' of https://github.com/bagisto/bagisto into select_icon_payment_page	2020-08-10 21:00:31 +05:30
Akhtar Khan	3a365a1869	final changed #3688	2020-08-10 20:57:44 +05:30
Akhtar Khan	44a68c8dbb	issued fixed #3688	2020-08-10 20:14:18 +05:30
Annika Wolff	58269996b2	Merge branch 'master' into check-if-item-in-cart-is-deactivated	2020-08-10 16:11:39 +02:00
Devansh	d7fc4aa233	Merge branch 'master' into adding_missing_translation	2020-08-10 19:38:48 +05:30
Akhtar Khan	32ca7b548b	removed white spaces	2020-08-10 18:35:15 +05:30
rahulshukla-home	5663afec6a	Issue #3494 fixed	2020-08-10 18:14:38 +05:30
Akhtar Khan	99c6d0a6d4	issue fixed 3688	2020-08-10 18:01:38 +05:30
Devansh	3b5764034a	Language Translation Copied From Velocity To Shop	2020-08-08 12:49:23 +05:30
Devansh	7a3fd15b11	From Shop Velocity Lang Dependencies Removed And Added That Language Translation To Shop Lang	2020-08-08 12:48:02 +05:30
Jitendra Singh	e401da600e	Merge pull request #3665 from cagartner/fix_composer_files ... Fix composer files	2020-08-07 14:53:49 +05:30
Steffen Mahler	c9f7c70d52	resolve conflicts	2020-08-06 15:23:32 +02:00
Devansh	0c748b6563	Merge branch 'master' into tooltip_placement	2020-08-06 12:53:06 +05:30
Jitendra Singh	45b3a61591	Merge pull request #3664 from devansh-webkul/compare_notification_issue ... Fixed no message on removing products or deleting all from compare list in default theme #3505	2020-08-06 12:46:49 +05:30
Devansh	d74e6e9cbc	Notification Added For All Items	2020-08-05 19:59:54 +05:30
Carlos Augusto Gartner	d5126e9257	Merge branch 'master' of github.com:bagisto/bagisto	2020-08-05 08:50:13 -03:00
Devansh	fbe5a9cc9b	Compare Product Issue Fixed	2020-08-05 17:03:10 +05:30
Devansh	f556ab26e6	Merge branch 'master' into tooltip_placement	2020-08-05 16:57:19 +05:30
Jitendra Singh	2d2275f306	Merge pull request #3625 from vishal-webkul/issue-3606 ... Issue #3606 fixed	2020-08-05 15:32:15 +05:30
Jitendra Singh	9e9066f28a	Merge pull request #3607 from devansh-webkul/unable_to_download_files_while_comparing_products ... Fixed unable to download files while comparing products #3501	2020-08-05 13:17:43 +05:30
Devansh	3cb5e5aee9	Merge branch 'master' into tooltip_placement	2020-08-05 13:08:15 +05:30
Devansh	927bc2105c	Translation Added To Default Theme	2020-08-05 13:04:36 +05:30
Devansh	8cc838e696	Tooltip Added On Default Theme	2020-08-05 12:37:15 +05:30
Jitendra Singh	07a9d8588a	Merge pull request #3608 from devansh-webkul/inactive_child_product_isssue ... Fixed inactive child product shouldn't visible in grouped product #3575	2020-08-05 11:07:00 +05:30
Devansh	ece0f9ed60	Added In Default Theme	2020-08-04 20:42:38 +05:30
Devansh	67ddf6020e	Added In Default Theme As Well	2020-08-04 20:29:19 +05:30
Carlos Augusto Gartner	540f64aa8f	git subrepo init (merge) --remote=git@github.com:bagistobrasil/core-shop.git packages/Webkul/Shop ... subrepo: subdir: "packages/Webkul/Shop" merged: "72ce4eea7" upstream: origin: "git@github.com:bagistobrasil/core-shop.git" branch: "master" commit: "none" git-subrepo: version: "0.4.1" origin: "https://github.com/ingydotnet/git-subrepo" commit: "a04d8c2"	2020-08-04 10:57:09 -03:00
Jitendra Singh	72ce4eea7e	Merge pull request #3619 from devansh-webkul/mail_issue_on_cancel_order ... Fixed admin is not getting mail when customer cancels order #3522	2020-08-04 17:26:32 +05:30
Devansh	c22bdf45ca	Template Fixed	2020-08-04 17:12:48 +05:30
Jitendra Singh	284fa3f406	Merge pull request #3626 from devansh-webkul/mail_are_not_sent_on_change_password ... Completed Enhancement on changing current password admin/customer should get mail #3526	2020-08-04 11:01:34 +05:30
vishal-webkul	27a2fd5c06	add blank stars in bliss theme star rating	2020-08-01 19:24:02 +05:30
Devansh	6c48756792	Removed Array From IT Locale File As It Is Already Present Their	2020-08-01 17:08:46 +05:30
Devansh	385eeb2d7e	Order ID Added To Subject	2020-08-01 17:03:05 +05:30
Devansh	d7e9c8b86d	Some correction done in the message	2020-08-01 15:37:20 +05:30
Devansh	f05b17aa99	Enahancement Done	2020-08-01 15:07:51 +05:30
vishal-webkul	b4cb34f971	issue #3606 fixed	2020-08-01 14:10:16 +05:30
Devansh	5a25eb14e1	Cancelled Order Mail Issue Fixed	2020-08-01 11:11:52 +05:30
Akhtar Khan	e587fe2448	Fixed issue	2020-07-29 19:37:02 +05:30
Akhtar Khan	abfac60381	Merge branch 'master' into patch4	2020-07-29 09:50:05 +05:30
Akhtar Khan	906496b7b1	Space issue fixed	2020-07-27 16:08:48 +05:30
Akhtar Khan	e7125d9a57	Update view.blade.php	2020-07-24 19:50:28 +05:30
Akhtar Khan	4e6d49ac83	Update app.scss ... add spacing	2020-07-24 19:35:49 +05:30
Akhtar Khan	af34c809a0	Merge branch 'master' of https://github.com/bagisto/bagisto into locale_broken_image	2020-07-24 18:55:35 +05:30
Akhtar Khan	e6d21c64d5	fixed	2020-07-24 13:09:03 +05:30
Akhtar Khan	fa8c8a52ab	fixed final	2020-07-24 13:03:10 +05:30
Akhtar Khan	a58b895127	fixed layout	2020-07-24 12:36:05 +05:30
Akhtar Khan	398fa8032c	RTL cancel button in order section #3521	2020-07-23 16:05:36 +05:30
Steffen Mahler	6f76bb4a97	merge bagisto/master into check-if-item-in-cart-is-deactivated	2020-07-22 09:34:45 +02:00
Akhtar Khan	0da8d86904	Fixed layout issue in order information in default theme at customer end #3521	2020-07-21 13:09:28 +05:30
shivam kumar	e8983f308d	issue #3514 resolved	2020-07-17 15:53:35 +05:30
rahulshukla-home	41fbb0adab	Issue #3505 fixed	2020-07-17 14:31:51 +05:30
Akhtar Khan	f114ba2dcb	Fixed layout issue in order and downloadable grid at customer #3472	2020-07-16 17:51:32 +05:30
Akhtar Khan	8c1561c142	Merge branch 'master' of https://github.com/bagisto/bagisto into patch3	2020-07-16 12:41:34 +05:30
Akhtar Khan	9b82845bb6	changes in compare file	2020-07-16 12:41:11 +05:30
mohd asif	822b86e126	fixed issue 3311 in default theme	2020-07-16 12:16:13 +05:30
Steffen Mahler	2b4615b9c0	resolve conflict in CartRule.php	2020-07-15 08:44:56 +02:00
Jitendra Singh	ac04d9418f	Merge pull request #3432 from asif-webkul/newissue ... fixed issue #3400 and #3399	2020-07-14 19:16:01 +05:30
Steffen Mahler	92970b4bd4	resolve conflict in Bundle.php	2020-07-14 13:36:15 +02:00
rahulshukla-home	63cb71bd2b	Issue #3460 fixed	2020-07-14 10:07:06 +05:30
Akhtar Khan	629fd5d60d	Final Change in the position of Add Address Button in Customer Account Section	2020-07-13 18:01:21 +05:30
Akhtar Khan	605ae744dd	changed the position of Add Address Button in Customer Account Section	2020-07-13 17:14:44 +05:30
rahulshukla-home	896356ec9b	Issue #3459 fixed	2020-07-10 10:38:44 +05:30
mohd asif	4c84e9c328	production css	2020-07-09 10:28:23 +05:30
mohd asif	f5b892e47c	Merge branch 'master' of https://github.com/bagisto/bagisto into newissue	2020-07-09 10:00:39 +05:30
mohd asif	f81e56ce2f	moved css to sass	2020-07-09 09:57:25 +05:30
jitendra	1eb2873588	Issue #3423 fixed	2020-07-07 13:36:14 +05:30
Akhtar Khan	819606d232	changed in design comparison	2020-07-06 21:06:05 +05:30
Akhtar Khan	673e3e6dac	changed in design comparison	2020-07-06 20:53:18 +05:30
mohd asif	5c268863c2	Merge branch 'master' of https://github.com/bagisto/bagisto	2020-07-06 17:01:34 +05:30
mohd asif	366876e8e1	fixed compare page ui issue #3400	2020-07-06 16:56:53 +05:30
rahulshukla-home	b53e0055e0	Issue #3423	2020-07-06 11:27:57 +05:30
Steffen Mahler	a44fa7445d	refactoring of validateCartItem methods of product types	2020-07-04 15:20:59 +02:00
mohammad asif	9dcfaf7d0a	fixed issue 3381 city does not allowed hyphen	2020-07-02 13:23:49 +05:30
Jitendra Singh	4ea9ad0d39	Merge pull request #3384 from Haendlerbund/customizeable-order-number-generators ... Customizeable order number generators	2020-06-30 22:52:07 +05:30
Florian Bosdorff	b3bdcc473e	change naming of order increment generator	2020-06-30 15:11:35 +02:00
jitendra	01a4e57d25	Issue #3354 fixed	2020-06-30 16:19:35 +05:30
Florian Bosdorff	e480c6cda4	Merge branch 'bagisto/master' into customizeable-order-number-generators	2020-06-30 10:46:53 +02:00
Florian Bosdorff	98111f686c	add ability to customize order incrment number generator	2020-06-30 09:46:48 +02:00
Shubham Mehrotra	212853d6c8	#3356	2020-06-26 15:10:02 +05:30
Shubham Mehrotra	e3f80b886f	#3354	2020-06-26 14:52:52 +05:30
Shubham Mehrotra	e806156dae	#3357	2020-06-26 14:18:02 +05:30
Shubham Mehrotra	e49041bbad	#3330	2020-06-23 16:51:49 +05:30
Steffen Mahler	f64a62dc29	merge 'bagisto/master' into check-if-item-in-cart-is-deactivated	2020-06-23 11:47:31 +02:00
Pranshu Tomar	3d7be74d5b	Issue #3320 fixed	2020-06-22 16:16:46 +05:30
Shubham Mehrotra	dac3487d1f	remove compare option from customer sidebar	2020-06-19 19:12:12 +05:30
Shubham Mehrotra	3d011e1c74	translation added	2020-06-19 13:37:14 +05:30
Shubham Mehrotra	76a1034f49	optional compare option in default theme	2020-06-19 13:26:16 +05:30
Shubham Mehrotra	3d44f95469	optional compare option	2020-06-19 13:16:01 +05:30
Pranshu Tomar	c9d59c6f38	Issue #3254 fixed	2020-06-17 12:44:18 +05:30
Steffen Mahler	3de5601df0	merge bagisto master, resolve conflicts	2020-06-17 08:29:55 +02:00
Pranshu Tomar	2c7d90deef	Homepage 404 issue fixed	2020-06-16 17:58:52 +05:30
Jitendra Singh	3b2df1f99c	Merge pull request #3193 from Haendlerbund/add-context-to-logging-when-adding-product-to-cart ... Add logging to exception thrown in cart	2020-06-16 13:54:52 +05:30
Jitendra Singh	6397665ab9	Merge pull request #3224 from jitendra-webkul/1.0 ... Fixed laravel migration issue & completed tensorflow image search fea…	2020-06-11 18:41:03 +05:30
Pranshu Tomar	c9dd20db7e	Fixed laravel migration issue & completed tensorflow image search feature on defaul theme	2020-06-11 18:34:16 +05:30
Annika Wolff	abbd5c4a31	slightly refactoring	2020-06-09 14:35:02 +02:00
Annika Wolff	dbc16cf7e6	add logging of catched exception	2020-06-09 10:14:06 +02:00
Steffen Mahler	a735180f38	refactoring, add language keys	2020-06-05 08:19:13 +02:00
Steffen Mahler	86dadf400d	merge branch 'bagisto/master' into check-if-item-in-cart-is-deactivated	2020-06-04 13:36:56 +02:00
Steffen Mahler	177327a7d2	rework removing of inactive products from cart, add error handling and messaging	2020-06-04 13:09:00 +02:00
İlyas Okay	ad9c85a0f5	Turkish Language added and English language duplicate rows deleted.	2020-06-03 18:11:28 +03:00
rahulshukla-home	b8417ff7d3	Issue #2804	2020-05-27 19:07:30 +05:30
rahulshukla-home	9963c87bd1	Merge branch 'master' of https://github.com/bagisto/bagisto into development	2020-05-27 18:37:06 +05:30
rahulshukla-home	2c002a0f8a	Issue #2729	2020-05-27 18:36:52 +05:30
Steffen Mahler	5a7ec123c7	fix typo	2020-05-22 12:02:33 +02:00
Steffen Mahler	764df61509	trigger pipeline again	2020-05-22 09:57:34 +02:00
Steffen Mahler	d664c92d30	trigger pipeline	2020-05-22 08:52:03 +02:00
Steffen Mahler	f04abcbc85	add field company_name to views	2020-05-22 08:31:11 +02:00
Steffen Mahler	d0d6f2b046	add field company_name to bliss views	2020-05-20 17:44:03 +02:00
Jitendra Singh	02faf5e610	Merge pull request #3098 from rahulcs0082/development ... Issue #3095 fixed.	2020-05-20 12:25:09 +05:30
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	96e730f848	#2775	2020-04-02 20:35:26 +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
prateek srivastava	36f795f09a	assets for production	2020-02-19 16:25:40 +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