Commit Graph

1463 Commits

Author SHA1 Message Date
Jitendra Singh 45e61682cd
Merge pull request #3013 from jitendra-webkul/1.0
Order comment feature added
2020-05-06 22:52:09 +05:30
Pranshu Tomar 2a9c3de89a Order comment feature added 2020-05-06 22:48:48 +05:30
Jitendra Singh adaeaf7087
Merge pull request #3010 from jitendra-webkul/1.0
Product multiple image select feature added
2020-05-06 17:08:29 +05:30
Pranshu Tomar 95caad1e7a Product multiple image select feature added 2020-05-06 17:02:44 +05:30
Jitendra Singh 7639dfbf51
Merge pull request #2962 from Haendlerbund/channel-filter-for-cart-rule-grid
introduce channel and customer group filter for cart rule grid
2020-05-01 18:09:48 +05:30
rahulshukla-home 584b2ae9bd favicon for admin login 2020-04-30 18:31:41 +05:30
rahulshukla-home 2753c7b1d5 configuration added for favicon in admin 2020-04-29 16:35:04 +05:30
Herbert Maschke 3154d27f52 introduce channel and customer group filter for cart rule grid 2020-04-29 09:19:47 +02:00
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 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
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 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 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
Florian Bosdorff 01d4cb026f fix address_type at many places; add tests for address relations 2020-04-17 11:09:59 +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 2eb8aa972c Issue #2895 2020-04-16 18:16:40 +05:30
Annika Wolff 7a9f099b7b remove channel from tax category 2020-04-16 10:25:45 +02:00
rahulshukla-home 1d502be939 Issue #2890 2020-04-15 15:11:08 +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 94a08b7c86
Merge pull request #2867 from VaD1ke/translation-fixes
Translation fixes
2020-04-13 16:01:44 +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
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
Jitendra Singh 9375ed6a8e
Merge pull request #2852 from rahulcs0082/development
Issue #2713 fixed
2020-04-09 15:34:27 +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
shivam kumar 61f27800fd issue #2792 resolved 2020-04-07 19:51:42 +05:30
Shubham Mehrotra 0005241794 misc. updates 2020-03-30 21:09:40 +05:30
Carlos Augusto Gartner 3ab051c07a Added translation to velocity and fixed some admin translations 2020-03-25 12:59:15 -03:00
rahulshukla-home 4510a42d34 testing 2020-03-24 02:17:17 +05:30
Jitendra Singh 1ff5aaab92 Issue #2706 fixed 2020-03-23 14:48:03 +05:30
mohd asif a1124fc7b6 resolved conflicts 2020-03-19 18:07:25 +05:30
Jitendra Singh deda73af48 Issue #2594 fixed 2020-03-19 17:07:46 +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
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 893564977f Issue #2518 fixed 2020-03-18 17:15:44 +05:30
Vivek ad76426fb5 [Updated: Shop & admin email setting added in configuration.] 2020-03-17 16:10:47 +05:30
mohd asif d2caa2af98 resolved commit 2020-03-17 09:36:45 +05:30
mohd asif e7a9303b51 updated missing translation for portoguese in admin package 2020-03-16 16:24:04 +05:30
mohd asif 65814e0f04 upadated missing translation for Dutch for admin package 2020-03-16 14:07:08 +05:30
mohd asif 9901209a4b upadated missing translation for persian in admin package 2020-03-16 13:25:14 +05:30
mohd asif 1e5baab3a4 added missed translation for arabic 2020-03-16 10:56:10 +05:30
mohd asif ae1215834b upadated remaining translation for ar 2020-03-13 18:43:14 +05:30
Jitendra Singh 195344e8a2
Merge pull request #2653 from jitendra-webkul/1.0
Issue #2638 fixed
2020-03-13 18:31:15 +05:30
Jitendra Singh 9b60f0b8ec Issue #2638 fixed 2020-03-13 17:51:46 +05:30
mohd asif dd4875004a updated translation for arabic and persia for admin package 2020-03-13 12:29:51 +05:30
mohd asif f01ab851fb fixed some more language translation issue in arabic and persia 2020-03-12 19:30:39 +05:30
mohd asif 9e6ed6f09d fixed translation in all packages 2020-03-12 13:32:56 +05:30
Annika Wolff 65b5ec9232 bugfix: show multiple flash messages in admin panel 2020-03-11 10:45:18 +01:00
Jitendra Singh 101df848d6 Remove static text from grid 2020-03-06 20:03:32 +05:30
Jitendra Singh 8ca9bd864c Remove static text from grid 2020-03-06 19:49:47 +05:30
Jitendra Singh 010ae65691 Resolved conflicts 2020-03-06 16:02:52 +05:30
Jitendra Singh 276a2e288b
Merge pull request #2612 from Haendlerbund/revert-2603-development
Revert "Development"
2020-03-06 15:16:08 +05:30
Jitendra Singh 955da20b45 Improved comments in code 2020-03-05 19:49:14 +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
rahul shukla caccfcf840 Issue #2605 2020-03-05 16:28:19 +05:30
rahul shukla 72d7ca8851 Issue #2616 2020-03-05 16:04:12 +05:30
Jitendra Singh a6ce67151f Improved comments in code 2020-03-05 11:04:57 +05:30
Annika Wolff 152cde9e5c
Revert "Development" 2020-03-04 11:27:34 +01:00
Jitendra Singh 41e06d5dc5 Improved code style 2020-03-04 12:02:53 +05:30
rahul shukla e8ad719112 product datagrid locale and channel query improvement 2020-03-03 18:48:23 +05:30
rahul shukla 641b80d28a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-03-03 18:34:00 +05:30
rahul shukla 77b86ee786 query chnages for product datagrid 2020-03-03 18:33:38 +05:30
Jitendra Singh 45ec4532fa Resolved conflicts 2020-03-03 15:59:47 +05:30
Jitendra Singh 4a6ac73bb6 Improved code style 2020-02-28 15:55:53 +05:30
Jitendra Singh 131e3f1e18 Quantity box checks added for booking product 2020-02-28 13:00:29 +05:30
shubhammehrotra.symfony@webkul.com ce56c13fd0 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-27 20:21:37 +05:30
Jitendra Singh 0dd0897e68
Merge pull request #2542 from ghermans/shipments
Improved order shipments info
2020-02-27 18:38:53 +05:30
shubhammehrotra.symfony@webkul.com 87f801dbce changes from master 2020-02-27 16:16:29 +05:30
shubhammehrotra.symfony@webkul.com 13312e8234 compare product's dynamic attributes 2020-02-27 16:14:00 +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 b0b4935006 time added in cart rules 2020-02-26 16:58:53 +05:30
Jitendra Singh 7d2ff93f43 Resolve conflicts 2020-02-25 11:44:34 +05:30
Glenn Hermans 9de680c47d
Fix conflicts 2020-02-24 17:49:43 +01:00
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
rahul shukla 10d8ec249a laguage updated for order 2020-02-24 15:04:18 +05:30
Jitendra Singh c52e19d53d
Merge pull request #2546 from rahulshukla-webkul/development
Development
2020-02-24 13:47:58 +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
rahul shukla e927ebd821 product name issue 2020-02-24 12:31:18 +05:30
Glenn Hermans ea69a74443
Added translations 2020-02-22 15:15:55 +01:00
Glenn Hermans e3413d5f45
Updated shipments table view 2020-02-22 15:15:09 +01:00
Jitendra Singh 5c696f8d00 Resolved conflicts 2020-02-21 19:36:17 +05:30
Jitendra Singh 2e24c2e2e5 Updated event booking system 2020-02-21 19:13:15 +05:30
ghermans d4ce50da9f #2512 more translations 2020-02-21 09:44:12 +01:00
ghermans 22f5391f5c More translations 2020-02-21 01:48:25 +01:00
ghermans 6174a78926 More translations 2020-02-21 01:16:32 +01:00
ghermans 89ebea48e6 removed spacing 2020-02-20 20:24:39 +01:00