Commit Graph

5767 Commits

Author SHA1 Message Date
devansh bawari da5b8a4ca7 Filter Added For All 2020-12-24 17:29:10 +05:30
devansh bawari ca2de63b48 Alias Filter Added 2020-12-24 16:50:40 +05:30
devansh bawari 4737f95410 Some Minor Fix 2020-12-24 16:09:10 +05:30
Glenn Hermans 3c49cd9fff
Merge pull request #4391 from rahulshukla-webkul/development
#3638 fixed
2020-12-23 14:47:20 +01:00
rahul shukla 22ba6c9534 Issue #4392 2020-12-23 18:21:31 +05:30
Glenn Hermans 7907f16243
Merge pull request #4387 from howdu/fix-recently-viewed
Recently view typo and use view priceHTML
2020-12-23 12:27:19 +01:00
rahul shukla 00997bfbff #3638 fixed 2020-12-23 15:40:27 +05:30
Jitendra Singh 82d457f328
Merge pull request #4377 from howdu/fix-limit-per-page
Fix limit per page for datagrid
2020-12-23 15:36:49 +05:30
howdu 4a1562ddc8 Update page limit to use vue loop 2020-12-23 09:58:32 +00:00
Robin Singh 81393d9672 Administrator role typo fix 2020-12-23 14:06:00 +05:30
howdu e3400ba302 Fix typo and use priceHTML 2020-12-22 10:47:51 +00:00
devansh bawari 86401b4ff1 Seeder Updated 2020-12-21 19:56:33 +05:30
devansh bawari 2f124c5a3f Fixed Filter Locale & Channel List. Channel Symbol Added. 2020-12-21 19:22:31 +05:30
devansh bawari c31037d787 Some Refactoring And Index Page Filteration Added 2020-12-21 16:10:54 +05:30
devansh bawari 5539776ab9 Channel Table Seeder And Datagrid Updated 2020-12-21 14:32:55 +05:30
devansh bawari 2b6438b567 Channel Translation Completed 2020-12-21 13:58:22 +05:30
Devansh 884b945c8b Store And Update Channel Front End Comleted 2020-12-21 10:38:19 +05:30
howdu 7ca57d4ab3 Fix limit per page for datagrid
Link 'models' itemsPerPage property with datagrid
2020-12-18 17:25:47 +00:00
Glenn Hermans 803075f303
Merge pull request #4360 from devansh-webkul/issue-4350
Fixed taxes not applied to Shipping Cost #4350
2020-12-18 12:46:53 +01:00
devansh bawari 88782d9327 Language Translation Added 😇 2020-12-18 17:02:55 +05:30
Glenn Hermans cd6bcadc69
Merge pull request #4375 from polarag/master
Fix security risk for null emails
2020-12-18 12:27:38 +01:00
polarag c5bc5207e7
Added spaces 2020-12-18 13:13:16 +02:00
devansh bawari 96cab203e7 Value Updated In Seeder 2020-12-18 16:03:18 +05:30
devansh bawari 179c59b2de Option Added For Tax Calculation 2020-12-18 13:00:13 +05:30
polarag 0c2e30349c
Fix security risk for null emails
The returned email from Facebook is sometimes null. Bagisto tries to match the returned email from Facebook against the database, which would allow logins to accounts that have a null email which may not belong to the Facebook user trying to login, and therefore such user accounts might be breached.

This commit checks for null emails first, and returns a null customer instead of the first customer with a null email.
2020-12-18 03:28:30 +02:00
Shubham Mehrotra 19f7a26f41 function used to fetch current channel 2020-12-14 19:24:30 +05:30
devansh bawari 4dd71a2e1a Text Area Issue Fixed 2020-12-14 14:05:06 +05:30
devansh bawari 3ac25cf746 Tax On Shipping Price Also 2020-12-14 13:33:25 +05:30
Glenn Hermans d01c57dae7
Merge pull request #4348 from darinda/patch-4
Make VatIdRule accept empty strings as VAT id
2020-12-14 06:12:43 +01:00
Glenn Hermans 549a658860
Merge pull request #4298 from devansh-webkul/issue-4242
fix #4242
2020-12-11 04:02:50 +01:00
Rene Hrdina eb371b77c0
Make VatIdRule accept empty strings as VAT id 2020-12-10 17:24:31 +01:00
Glenn Hermans 62b3aa99df
Merge pull request #4341 from devansh-webkul/issue-4325
Fixed address is not saving on onepage checkout #4325
2020-12-09 17:34:56 +01:00
devansh bawari cfa95e04b6 Address Issue Fixed 2020-12-09 14:41:23 +05:30
Glenn Hermans 80520bc8cc
Merge pull request #4342 from shubhwebkul/master
code enhancement
2020-12-08 16:04:44 +01:00
Glenn Hermans b7f6af7b75
Merge pull request #4316 from devansh-webkul/issue-4283
Fixed zoom event which is not working when changing mouse hover from video to image #4283
2020-12-08 15:44:00 +01:00
Glenn Hermans 667f91b8ad
Merge pull request #4332 from naresh-webkul/master
added repository for attribute option translation
2020-12-07 18:59:24 +01:00
Glenn Hermans b00b85c6b8
Merge pull request #4330 from naresh-webkul/4329
fixed issue #4329
2020-12-07 18:57:41 +01:00
Shubham Mehrotra 24ec12175e code enhancement 2020-12-07 21:16:06 +05:30
devansh bawari 9c4c21db33 Loader Added On Save Address Only 2020-12-07 14:06:12 +05:30
devansh bawari e49908b314 Merge branch 'master' into issue-4242 2020-12-04 20:29:07 +05:30
devansh bawari b36027efc4 Recompiled 2020-12-04 20:26:49 +05:30
devansh bawari d2bd499e46 Merge branch 'master' into issue-4283 2020-12-04 20:25:59 +05:30
Jaseel P V 0cd9cf2753 Image filter enable/disable issue solved 2020-12-04 18:53:37 +05:30
rahul shukla e296d06f8e fix for rtl 2020-12-04 15:09:43 +05:30
rahul shukla 4320f4b004 enhancement #4321 done with all required changes 2020-12-04 13:01:52 +05:30
rahul shukla 6ce2116a49 Merge branch 'development' of https://github.com/rahulcs0082/bagisto into development 2020-12-04 11:54:33 +05:30
Rene Hrdina f168d18123
fix some german translations 2020-12-02 16:32:39 +01:00
naresh verma 7767132336 added repository for attribute option translation 2020-12-02 17:25:05 +05:30
Danijel Dedic df8cfd56c5 Make logo an favicon nullable 2020-12-02 12:53:16 +01:00
naresh verma 3d1cb347db fixed issue #4329 2020-12-02 17:17:59 +05:30
devansh bawari a17f9ba39a Recompiled 2020-12-02 09:31:16 +05:30
devansh bawari acdc93e208 Merge branch 'master' into issue-4283 2020-12-02 09:30:13 +05:30
Jitendra Singh 46e7b31b53
Merge pull request #4310 from devansh-webkul/reverted-changes
Added missing extended classes
2020-12-01 15:17:03 +05:30
rahulshukla-home 20a7378258 added configuration in buy now button display 2020-11-30 12:52:57 +05:30
rahulshukla-home 35c3b119cc #4321 fixed 2020-11-30 11:50:11 +05:30
devansh bawari 8ef8ec7b88 Compiled Files 2020-11-27 11:11:36 +05:30
devansh bawari dff0466971 Added Method 2020-11-27 11:10:04 +05:30
devansh bawari 62c71062f3 Merge remote-tracking branch 'upstream/master' into issue-4283
Merged With Master
2020-11-26 18:22:02 +05:30
devansh bawari c4538b67bf Seperated Image And Video Container 2020-11-26 18:21:33 +05:30
devansh bawari de753b0fcb Merge branch 'master' into reverted-changes
Merged with master.
2020-11-26 14:38:11 +05:30
devansh bawari 012a8e9969 Merge branch 'master' into issue-4299
Merged with master.
2020-11-26 14:37:01 +05:30
devansh bawari f5651166da Merge branch 'master' into issue-4242
Merged With Master
2020-11-26 14:36:27 +05:30
devansh bawari ed2b8c8fb7 Adjusted Hardcoded Value 2020-11-26 14:07:14 +05:30
rahulshukla-home bea41e9e42 optimization code 2020-11-26 13:55:22 +05:30
Jitendra Singh 59f4fadb25
Merge pull request #4309 from devansh-webkul/issue-4306
Fixed slider is not working properly in new product grid #4306
2020-11-26 13:52:05 +05:30
devansh bawari 810cdfd35a Dynamic Path Added To Debugger 2020-11-25 20:32:01 +05:30
devansh bawari fe96926179 Changes Added Which Has Been Reverted 2020-11-25 18:28:21 +05:30
devansh bawari 7abf408a45 Overided Default Laravel Command 2020-11-25 18:08:49 +05:30
devansh bawari 004dcf2663 Merge branch 'master' into issue-4242
Merged With Master
2020-11-25 17:35:32 +05:30
devansh bawari f7c834337b Dynamic Div Width Detection Added 2020-11-25 15:29:07 +05:30
devansh bawari ca7a52e54c Some Changes Done 2020-11-25 12:58:07 +05:30
devansh bawari 985aae53a8 Merge remote-tracking branch 'upstream/master' into issue-4299
Merged With Master
2020-11-25 12:50:50 +05:30
devansh bawari 68e17fc711 Fixed Issue For Non Attributes 2020-11-25 12:49:49 +05:30
devansh bawari 9a116ca5ec Hardcoded Value Added In Last 2020-11-25 11:56:46 +05:30
rahulshukla-home 2cbd9e56be Issue #4294 fixed 2020-11-24 21:37:44 +05:30
rahulshukla-home 8003b6e658 remove unused code 2020-11-24 21:16:51 +05:30
rahulshukla-home e1fb46afcf Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-11-24 21:15:11 +05:30
rahulshukla-home 7cf6d1e475 Issue #3932 fixed 2020-11-24 21:14:47 +05:30
jitendra 8ff2c87288 Fixed typo in file name 2020-11-24 18:17:32 +05:30
jitendra eb90d85722 Excluded module if they dont have models, views and queries 2020-11-24 17:48:37 +05:30
jitendra 711beb1786 Added Bagisto Debugbar 2020-11-24 17:48:37 +05:30
Jitendra Singh 770b516338
Merge pull request #4296 from devansh-webkul/image-zoom-issue
Fixed zoom image functionality #4283
2020-11-24 14:18:43 +05:30
rahulshukla-home c3383e36b9 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-11-24 12:59:58 +05:30
rahulshukla-home 0a241ae6b5 Issue #4287 fixed 2020-11-24 12:59:39 +05:30
devansh bawari 937db83b3e Merge branch 'issue-4242' of https://github.com/devansh-webkul/bagisto into issue-4242
Merged
2020-11-24 12:38:05 +05:30
devansh bawari c70a324f40 Merge branch 'master' into issue-4242
Merged With Master
2020-11-24 12:27:35 +05:30
devansh bawari c405d09c54 Issue Fixed For Videos As Well 2020-11-24 11:13:16 +05:30
devansh bawari ae97bda400 Image Zoom Issue Fixed 2020-11-24 10:27:58 +05:30
Jitendra Singh f1af54dc5e
Merge pull request #4276 from rahulcs0082/development
option to add video in advertisement and product gallery for default theme
2020-11-24 00:03:48 +05:30
rahulshukla-home 96983129e9 broken image link for video in velocity theme for mobile 2020-11-23 19:53:03 +05:30
devansh bawari 367ec88a52 Default Title Added 2020-11-23 19:20:39 +05:30
devansh bawari b6c9dc1b98 Text Message Added 2020-11-23 18:32:37 +05:30
rahulshukla-home cdd2a45e5b correct the url 2020-11-23 16:16:58 +05:30
rahulshukla-home 123bc59a04 conflict resove & merge with master 2020-11-23 16:12:38 +05:30
rahulshukla-home 0a14463465 empty image issue 2020-11-23 16:06:29 +05:30
rahulshukla-home 760bd0f9c9 copy video issue solve 2020-11-23 16:02:18 +05:30
rahulshukla-home 4ad221ec05 mobile view issue 2020-11-23 15:42:50 +05:30
devansh bawari 872dd9468d Merge remote-tracking branch 'upstream/master' into paypal-server-side-integration
Merged With Master
2020-11-23 14:23:00 +05:30
devansh bawari 6f0151806d Allowed IPs Added 2020-11-23 13:54:56 +05:30
devansh bawari a4176aafdf Height Increased 2020-11-21 17:10:08 +05:30
devansh bawari 945e54aad3 Some Changes Done 2020-11-21 17:06:34 +05:30
devansh bawari 36409d0ac7 Recompiled 2020-11-20 21:38:32 +05:30
devansh bawari c6e6138617 Merge remote-tracking branch 'upstream/master' into issue-4283 2020-11-20 21:37:35 +05:30
rahulshukla-home d6e5b940ec fixes mouse issue 2020-11-20 20:24:11 +05:30
rahulshukla-home c7d36aa81b merge with master 2020-11-20 19:03:37 +05:30
rahulshukla-home 4eb0119dec fixes as per comment 2020-11-20 19:01:50 +05:30
devansh bawari dc10b37d92 Some Changes Done 2020-11-20 18:41:08 +05:30
devansh bawari 8bb4b4c767 Recompiled 2020-11-20 18:28:41 +05:30
devansh bawari d60f023fae Merge remote-tracking branch 'upstream/master' into issue-4283 2020-11-20 18:28:09 +05:30
devansh bawari 9ec4e9094e Width and Height Decreased 2020-11-20 18:26:42 +05:30
devansh bawari 7a391e32a7 Recompiled 2020-11-20 16:37:44 +05:30
devansh bawari 5ff8c5f037 Merge remote-tracking branch 'upstream/master' into some-minor-issue 2020-11-20 16:36:51 +05:30
Glenn Hermans f446987584
Merge pull request #4280 from devansh-webkul/issue-4119
Flash Message Added #4119
2020-11-20 11:54:55 +01:00
mohd asif cbca9da84a fixed issue #4281 2020-11-20 13:50:19 +05:30
rahulshukla-home e3a7ee9ac3 fix locale issues in admin 2020-11-20 12:54:18 +05:30
rahulshukla-home 56f1c2eb95 validation added in video upload 2020-11-20 12:33:38 +05:30
devansh bawari d68e765243 Maintenance Field Added 2020-11-20 12:17:21 +05:30
rahulshukla-home ee7973aac2 merge with master 2020-11-20 11:47:56 +05:30
rahulshukla-home 296cb99d4d product video added for velocity theme 2020-11-20 11:43:56 +05:30
devansh bawari 561d598ae8 Merge branch 'master' into issue-4119
Merged
2020-11-20 10:27:34 +05:30
Jitendra Singh 0ce2e7a2aa
Merge pull request #4274 from devansh-webkul/issue-4265
Fixed compare page for responsive and ability to drag compare product #4265
2020-11-19 20:26:49 +05:30
Jitendra Singh e755146174
Merge pull request #4275 from devansh-webkul/issue-4269
Fixed error on loading category page results whoops no product found in mobile view #4269
2020-11-19 20:26:37 +05:30
devansh bawari b38ee636d3 Recompiled 2020-11-19 19:52:37 +05:30
devansh bawari 3c6c4e45d7 Merge remote-tracking branch 'upstream/master' into some-minor-issue 2020-11-19 19:51:26 +05:30
rahulshukla-home 0dacfd8072 test case failure fix 2020-11-19 17:49:21 +05:30
devansh bawari 47348d77ac Cart Key Triggered 2020-11-19 17:37:03 +05:30
devansh bawari 001187884f Some Self Reviewed 2020-11-19 17:06:12 +05:30
rahulshukla-home 0c45247e16 Enhancement #4250 done for default theme 2020-11-19 15:25:39 +05:30
rahulshukla-home 2c9b131fd3 Enhancement #4250 done for default theme 2020-11-19 15:23:51 +05:30
devansh bawari 76bab882dd isMobile Removed 2020-11-19 13:26:57 +05:30
devansh bawari b754f1e848 Footer Issue Fixed 2020-11-19 12:01:00 +05:30
devansh bawari 1664a058c1 Recompiled 2020-11-18 19:32:40 +05:30
devansh bawari 7a4e98f614 Minor Issue Fixed 2020-11-18 19:32:29 +05:30
devansh bawari 200e0f7ef6 Language Translation Added 2020-11-18 18:50:11 +05:30
devansh bawari e63525a6c2 Some Changes Done 2020-11-18 18:49:53 +05:30
devansh bawari 1222f5d14a Integration Completed 2020-11-18 18:40:29 +05:30
devansh bawari 41103f3b8e Merge remote-tracking branch 'upstream/master' into paypal-server-side-integration
Merged With Master
2020-11-18 15:48:43 +05:30
devansh bawari ae863dcfef Paypal SDK Installed 2020-11-18 12:57:48 +05:30
rahulshukla-home 25b2603a2e Enhancement #4257 implemented 2020-11-18 12:37:33 +05:30
rahulshukla-home 4b3be2b2ca Enhancement #4257 implemented 2020-11-18 12:34:34 +05:30
rahulshukla-home 225d01c1c6 merge with master 2020-11-18 11:05:55 +05:30
rahulshukla-home d6464a9c4c failure test case 2020-11-18 11:02:10 +05:30
devansh bawari 2aa27e5232 Test Case 2020-11-18 09:48:28 +05:30
rahulshukla-home a3d8257a31 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-11-17 17:07:18 +05:30
Jitendra Singh 130ae68d33
Merge pull request #4263 from devansh-webkul/issue-4262
Fixed minimum order amount should also accept the minimum value #4262
2020-11-17 16:31:00 +05:30
rahulshukla-home 47f7926ff3 Issue #4246 fixed 2020-11-17 15:48:59 +05:30
devansh bawari b688aaf321 Formatted Price According To Translation 2020-11-16 20:42:37 +05:30
devansh bawari 8bd986e637 Translation Updated 2020-11-16 20:42:03 +05:30
devansh bawari 64dad2b27c Compilation Added 2020-11-16 20:27:11 +05:30
devansh bawari 8e6db8509d Changes Done According To Method 2020-11-16 20:26:49 +05:30