Commit Graph

6448 Commits

Author SHA1 Message Date
Glenn Hermans 85f3fece81
Merge pull request #4802 from devansh-webkul/issue-4799
Dynamic product image resizing implemented #4799
2021-04-16 16:01:15 +02:00
devansh bawari bf0c724504 Translations Added 2021-04-16 19:14:52 +05:30
devansh bawari e7dcd2c757 Core Configs Added 2021-04-16 19:14:39 +05:30
devansh bawari 312d6a150d Fixed #4800 2021-04-16 13:59:32 +05:30
devansh bawari cf3285191e Zip Mandatory Removed On Disabled Zip Range 2021-04-16 12:15:35 +05:30
devansh bawari a0fced67a1 Arranged Method Name 2021-04-15 17:36:17 +05:30
devansh bawari 6f00123afe Some More Refactors 2021-04-15 17:29:48 +05:30
devansh bawari 1b7925984c Removed . As folder is not empty. 2021-04-15 14:59:09 +05:30
devansh bawari a28ca57692 One Comment Updated 2021-04-15 14:44:13 +05:30
devansh bawari 234d8b4f76 DataGrid Further Enhanced 2021-04-15 13:47:22 +05:30
devansh bawari 7eb2e5328e Completed Datagrid Improvement 2021-04-15 12:17:24 +05:30
devansh bawari 26aa35c6be Necesssary Details Refactored 2021-04-14 20:29:49 +05:30
devansh bawari 146fe40577 Merge remote-tracking branch 'upstream/master' into datagrid-improvement 2021-04-14 19:57:05 +05:30
devansh bawari 0443050288 Sort And Filter Collection Refactored 2021-04-14 19:56:29 +05:30
devansh bawari f54b4f65a5 Get Collections Method Refactored 2021-04-14 17:54:41 +05:30
devansh bawari eddb40a957 Query String Method Refactored 2021-04-14 17:02:39 +05:30
devansh bawari 0475a66e2d One Method Refactored 2021-04-14 15:01:13 +05:30
devansh bawari 19b6bac1e7 One File Removed And Some Method Sortings Done 2021-04-14 14:03:32 +05:30
devansh bawari 33388641b9 Z Index Down To 1 For Clickable 2021-04-14 12:56:48 +05:30
devansh bawari dc5d2382ab Z Index Removed 2021-04-14 12:53:53 +05:30
devansh bawari 3b6b1c53e7 Paypal Partner Attribution ID Added 2021-04-12 12:14:54 +05:30
rahul shukla ef3ee7494c Issue #2715 fixed 2021-04-09 14:35:14 +05:30
Glenn Hermans 34f6cfa6da
Merge pull request #4786 from devansh-webkul/attributes-rename-issue
Some Changes Done For L x W x H/D on product description #3196
2021-04-08 12:21:02 +02:00
Jitendra Singh 78f9390474
Merge pull request #4780 from rahulshukla-webkul/4754
Done with - #4754
2021-04-08 15:01:13 +05:30
devansh bawari 10355a8189 Numbering Arranged 2021-04-08 14:58:26 +05:30
devansh bawari b1ec093e75 Seeder Updated 2021-04-08 14:51:07 +05:30
Jitendra Singh c434c62ebd
Merge pull request #4781 from rahulshukla-webkul/4779
Issue #4779 fixed
2021-04-08 14:50:58 +05:30
rahul shukla f23b559a8e Fixes alignment issue 2021-04-08 14:44:06 +05:30
rahul shukla 1f37d1d3f9 Fixes as per comment 2021-04-08 13:48:16 +05:30
devansh bawari dc079df746 Date Time Component Enhanced 2021-04-08 11:13:38 +05:30
rahul shukla e43874c255 Issue #4779 fixed 2021-04-07 18:02:05 +05:30
rahul shukla 961ccea17d Merge branch 'master' of https://github.com/bagisto/bagisto into 4754 2021-04-07 17:00:48 +05:30
rahul shukla e1a0b4a817 Done with enhancement #4754 2021-04-07 17:00:25 +05:30
devansh bawari 4a407ae0ae Merge branch 'master' into php-8-support 2021-04-06 10:44:09 +05:30
Glenn Hermans 09b3c9d25f
Merge pull request #4759 from rahulshukla-webkul/4752
fixed #4752
2021-04-06 05:36:59 +02:00
rahul shukla cec4912041 Issue #4773 fixed 2021-04-05 14:06:04 +05:30
devansh bawari a81b37aeb9 Merge branch 'master' into php-8-support 2021-03-25 21:16:03 +05:30
devansh bawari 4cadfbc94d PHP 8 Support Added 2021-03-25 20:04:47 +05:30
Glenn Hermans a06943c695
Merge pull request #4765 from devansh-webkul/issue-4758
Integer type added to quantity #4758
2021-03-25 13:42:48 +01:00
Glenn Hermans b1fce951fc
Merge pull request #4764 from devansh-webkul/s-3
SVG Sanitizer Enhanced - SA3
2021-03-25 12:33:59 +01:00
devansh bawari bbd4ba1982 Some Code Fixes 2021-03-25 16:24:25 +05:30
devansh bawari e4ac40955d Type Added 2021-03-25 16:16:45 +05:30
devansh bawari 7bbf0c4bb5 SVG Sanitizer Enhanced 2021-03-25 14:10:47 +05:30
rahul shukla b848be65e9 Enhancement #4752 fixed 2021-03-24 17:06:14 +05:30
Glenn Hermans 3141e28b01
Merge pull request #4757 from devansh-webkul/issue-4755
Fixed issue in which selecting all channels from admin product list throws error #4755
2021-03-23 19:30:19 +01:00
Glenn Hermans 23080a4b59
Merge pull request #4756 from devansh-webkul/issue-4751
Icon Positions Changed #4751
2021-03-23 18:24:02 +01:00
Glenn Hermans 76da5bf91c
Merge pull request #4750 from rahulshukla-webkul/4748
Issue #4748 fixed
2021-03-23 13:28:33 +01:00
devansh bawari a6eef6824c Case Handled 2021-03-23 17:57:14 +05:30
devansh bawari 8b4f075002 Icon Positions Changed 2021-03-23 17:22:35 +05:30
Glenn Hermans 315976236e
Merge pull request #4743 from rahulshukla-webkul/development
Issue #4735 fixed
2021-03-22 15:25:22 +01:00
rahul shukla 5e087c850a Issue #4748 fixed 2021-03-22 16:17:51 +05:30
Jitendra Singh 6b2382518b
Merge pull request #4739 from devansh-webkul/issue-4729
Fixed products which are not exist inside a category and still they are visible on the category page #4729
2021-03-22 14:09:02 +05:30
rahul shukla a5bc6e7334 Enhancement done #3778 2021-03-19 20:18:33 +05:30
rahul shukla f36afb8d50 Enhancement done #3778 2021-03-19 20:07:58 +05:30
rahul shukla 776fba349f add another class for css 2021-03-19 16:57:45 +05:30
rahul shukla a6482d5274 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-03-19 15:33:22 +05:30
rahul shukla ba37438ab7 chnages as per comment 2021-03-19 15:22:24 +05:30
rahul shukla e96ea332d2 Merge branch 'master' of https://github.com/bagisto/bagisto into 3477 2021-03-19 14:23:01 +05:30
rahul shukla eade4b3910 Resize of image done 2021-03-19 14:22:53 +05:30
devansh bawari 6698ef2eb0 Merge branch 'master' into issue-4729 2021-03-18 19:22:10 +05:30
rahul shukla 0a8578e796 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-03-18 13:09:00 +05:30
Jitendra Singh 25fec09081
Merge pull request #4731 from devansh-webkul/issue-4730
Product Deletion Code Removed #4730
2021-03-17 19:38:19 +05:30
devansh bawari 207ec1d096 Merge branch 'master' into issue-4729 2021-03-17 16:38:36 +05:30
devansh bawari 1f7fa4ef66 Merge branch 'master' into issue-4730 2021-03-17 16:38:00 +05:30
rahul shukla f95a693473 Issue #4735 fixed 2021-03-16 13:28:05 +05:30
devansh bawari dd5effeb2b Shop Provider Update 2021-03-16 10:33:42 +05:30
Daniel Spiridonoff 2315f2da5a
Merge branch 'master' into spanish-language 2021-03-15 14:50:34 -03:00
Jitendra Singh a373e0cf33
Merge pull request #4713 from devansh-webkul/s-6
Paypal IPN Issue Fixed - SA6
2021-03-15 21:07:16 +05:30
devansh bawari b5b1b0453c Query Fixed 2021-03-15 20:06:58 +05:30
rahul shukla c47e3c8c3f Order transaction for paypal standard 2021-03-15 19:57:39 +05:30
devansh bawari 078d7e39dc Some Fixes Done 2021-03-15 18:28:09 +05:30
rahul shukla 5aa2ea7455 Translation added for all lang for transaction and align en lang 2021-03-15 15:05:31 +05:30
devansh bawari 000f5b4703 Merge branch 'master' into s-6 2021-03-15 11:52:06 +05:30
devansh bawari ce6af93d72 Merge branch 'master' into issue-4730 2021-03-15 11:37:25 +05:30
devansh bawari 3652d1a4bb Model Instance Given To Events 2021-03-15 11:36:42 +05:30
Daniel Spiridonoff 033d6b23f7 Update spanish translation for Admin module 2021-03-13 13:07:25 -03:00
Daniel Spiridonoff 5a89b10795 Spanish language seeder added for channels 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff a1f85814da Corrected format 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff b3aed5f6fe Update spanish translation for states 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff 6a13758273 Spanish translation for states 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff ac219bf80d Spanish language added 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff 16560c8ea4 Spanish translation for countries 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff 8c0f8728cc Upgrade spanish translation for Admin and Shop modules 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff 599e629b22 Spanish translation for BookingProduct, Core, Customer, SocialLogin, Ui and Velocity modules 2021-03-13 12:57:30 -03:00
devansh bawari 7e8892c22d Merge branch 'master' into s-6 2021-03-12 19:26:04 +05:30
devansh bawari 47722198b3 Merge branch 'master' into issue-4730 2021-03-12 19:25:09 +05:30
rahul shukla 5997bbd940 Order Transaction added for paypal smart button 2021-03-12 19:11:06 +05:30
rahul shukla 14bf78a195 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-03-12 19:07:45 +05:30
rahul shukla 7282bcabfc Order Transaction added for paypal smart button 2021-03-12 19:07:08 +05:30
devansh bawari b9cf2a6544 Some Exception Handled On Dashboard Page 2021-03-12 18:48:55 +05:30
devansh bawari 57c2b20ac9 Merge remote-tracking branch 'upstream/master' into issue-4730 2021-03-12 18:29:17 +05:30
Glenn Hermans 0d10ddb8f9
Merge pull request #4721 from devansh-webkul/responsive-admin
Enhancement Completed Responsive Admin #4295
2021-03-12 13:49:50 +01:00
devansh bawari 76e3bbe4a2 Product Deletion Code Removed 2021-03-12 18:10:52 +05:30
Jitendra Singh 12e81a36f0
Merge pull request #4706 from devansh-webkul/issue-4698
Fixed category slug which is not translation based #4698
2021-03-12 16:42:39 +05:30
devansh bawari a0ad610a69 Merge remote-tracking branch 'upstream/master' into responsive-admin 2021-03-12 13:45:35 +05:30
devansh bawari 74633a6ee5 Merge branch 'master' into responsive-admin 2021-03-12 13:44:47 +05:30
devansh bawari 09b67455c3 Merge branch 'master' into issue-4698 2021-03-12 13:34:20 +05:30
devansh bawari e8189013e0 Merge branch 'master' into s-6 2021-03-12 13:33:13 +05:30
devansh bawari 45ddd14798 Merge branch 'master' into s-4 2021-03-12 13:31:35 +05:30
Jitendra Singh 40915dcbfb
Merge pull request #4728 from devansh-webkul/issue-4727
Fixed error `addToCartHtml` which is not defined on the compare page #4727
2021-03-12 12:54:16 +05:30
Jitendra Singh bc8bc6814f
Merge pull request #3924 from devansh-webkul/duplicate_order_issue
Fixed duplicate order number getting generated when placed order simultaneously #3902
2021-03-12 12:52:39 +05:30
devansh bawari 19e95b2eca Key Added 2021-03-12 12:28:25 +05:30
devansh bawari 87829b8380 Merge remote-tracking branch 'upstream/master' into issue-4698 2021-03-12 11:04:37 +05:30
devansh bawari bc935e2df3 Variables Updated 2021-03-12 10:54:02 +05:30
Glenn Hermans 8728d58720
Merge pull request #4725 from devansh-webkul/issue-4722
Fixed getting exception on wishlist when add configurable item on cart #4722
2021-03-11 16:19:40 +01:00
devansh bawari 18f4a6f58f Wishlist Check Fixed 2021-03-11 18:57:56 +05:30
Jitendra Singh 5a267a64eb
Merge pull request #4718 from devansh-webkul/issue-4715
Hindi Language Support Added For PDF #4715
2021-03-11 17:47:15 +05:30
devansh bawari 20a198b674 Support Added To Customer Also 2021-03-11 16:26:35 +05:30
devansh bawari fb71b6647c Merge branch 'master' into issue-4708 2021-03-11 13:10:31 +05:30
devansh bawari d2f75b2a90 Merge branch 'master' into s-6 2021-03-11 13:10:04 +05:30
devansh bawari ef72ca9294 Merge branch 'master' into issue-4698 2021-03-11 13:09:26 +05:30
devansh bawari bd4ae3bb36 Merge branch 'master' into duplicate_order_issue 2021-03-11 13:08:10 +05:30
devansh bawari 24f4c8a032 Merge branch 'master' into s-4 2021-03-11 13:07:31 +05:30
devansh bawari d2a5c45a88 Merge branch 'master' into issue-4715 2021-03-11 13:06:54 +05:30
devansh bawari 6e05b61f02 Merge branch 'master' into responsive-admin 2021-03-11 13:06:12 +05:30
devansh bawari 90fd113df1 Admin Button Refactored 2021-03-11 12:35:05 +05:30
devansh bawari 33aaaae5b9 UI Package SCSS Added And Some Clean Ups 2021-03-11 11:51:11 +05:30
devansh bawari 4906ff67bc Icons Added 2021-03-11 11:01:07 +05:30
Glenn Hermans 22397d1b2d
Merge pull request #4712 from danispiri/paraguay-states
Paraguay states
2021-03-11 03:49:02 +01:00
rahul shukla 897c0cdc29 Rating field added in review datagrid 2021-03-10 19:33:25 +05:30
devansh bawari e2ed7ac0cd Random Icon Added 2021-03-10 18:30:23 +05:30
devansh bawari 39f45d4c31 Functionality Completed Design Pending 2021-03-10 17:33:17 +05:30
rahul shukla 787436359d PR failure 2021-03-10 15:30:43 +05:30
rahul shukla 511b328325 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-03-10 15:17:06 +05:30
rahul shukla 51cb46a13b Issue #4702 fixed 2021-03-10 15:16:50 +05:30
devansh bawari d2e7ddc115 Merge remote-tracking branch 'upstream/master' into responsive-admin 2021-03-10 15:16:49 +05:30
Jitendra Singh 7cf20a1720
Merge pull request #4716 from devansh-webkul/slider-issue
Image Slider And Gallery Constraints Fixed
2021-03-10 15:11:59 +05:30
devansh bawari c646d13115 Some Filter Glitch Fixed 2021-03-10 14:54:28 +05:30
Daniel Spiridonoff b3b0f58af0 Paraguay departments (states) added 2021-03-09 17:34:35 -03:00
devansh bawari 2045c33435 Thumbnail Issue Fixed 2021-03-09 19:36:02 +05:30
Poghos Boyajyan 51a7b9ddc2
Used repository instead of DB facade
This part conflicts with concord and SAAS customizer
2021-03-09 16:14:58 +04:00
devansh bawari ac20f0980a Support Added 2021-03-09 16:40:39 +05:30
devansh bawari cb29d5b58b Noto Sans Font Added 2021-03-09 16:39:52 +05:30
devansh bawari eb840eb323 Hind Font Added 2021-03-09 16:39:34 +05:30
rahul shukla 2d207b6770 removed spacing 2021-03-09 15:34:59 +05:30
rahul shukla c297b84ecc Enhancement #3477, images for variant product 2021-03-09 15:32:49 +05:30
rahul shukla df39bc402e Merge branch 'master' of https://github.com/bagisto/bagisto into 3477 2021-03-09 15:14:39 +05:30
rahul shukla 2897d0238d Enhancement #3477, images for variant product 2021-03-09 15:14:27 +05:30
devansh bawari ffd59db410 Mobile Device Space Width Issue Fixed 2021-03-09 13:23:28 +05:30
devansh bawari b48ed86b9b Gallery Issue Fixed 2021-03-09 13:11:45 +05:30
devansh bawari ed28ae530c Constraints Fixed 2021-03-09 12:33:33 +05:30
devansh bawari eabeaa4314 Merge branch 'master' into s-4 2021-03-09 11:29:59 +05:30
devansh bawari 8ed3597ce2 Merge branch 'master' into duplicate_order_issue 2021-03-09 11:29:36 +05:30
devansh bawari d0d7525cdd Merge branch 'master' into issue-4698 2021-03-09 11:28:43 +05:30
devansh bawari 2194e13dc9 Merge branch 'master' into s-6 2021-03-09 11:28:03 +05:30
devansh bawari 17269c10b4 Fixed some exceptions for guest. Removed unnecessary events for guest. Will only triggered on customer. 2021-03-09 11:19:30 +05:30
devansh bawari 8f7ab2a3b1 Duplicated Images Removed 2021-03-09 11:00:42 +05:30
devansh bawari be80e1d7ab Merge remote-tracking branch 'upstream/master' into issue-4708 2021-03-09 10:56:33 +05:30
Glenn Hermans e60646b791
Merge pull request #4710 from agustavo87/master
FIX: currencies "value"s and "phone" fields formated for API
2021-03-08 12:26:24 +01:00
Glenn Hermans 2178f32678
Merge pull request #4705 from devansh-webkul/issue-4690
Fixed variant images which are not visible in a sorted manner as uploaded in backend #4690
2021-03-08 12:22:29 +01:00
Gustavo Ayala 97a20d933a CHORE: clean white space 2021-03-08 08:14:20 -03:00
devansh bawari 8d485032f0 Parent Image Added 2021-03-08 13:42:15 +05:30
devansh bawari 6b0b4b32dc IPN Issue Fixed 2021-03-08 11:34:28 +05:30
Gustavo Ayala d787802a0f FIX: currencies "value"s and "phone" fields formated for API
- "value" of a currencie can't have more than 2 decimal places
- "phone" field can't have non-number characters.
2021-03-07 16:39:51 -03:00
devansh bawari f0b532a676 Validator Class Has Been Removed 2021-03-05 16:57:11 +05:30
devansh bawari bf9663a2a4 Merge remote-tracking branch 'upstream/master' into issue-4698 2021-03-05 15:44:59 +05:30
Glenn Hermans d6ed93bb91
Merge pull request #4704 from devansh-webkul/issue-4691
Some CSS issues has been fixed #4691
2021-03-05 10:52:02 +01:00
devansh bawari 2876831e6f Order Arranged 2021-03-05 13:43:39 +05:30
devansh bawari b26f3a135c Unshift Replace With Push In Shop PAckage Also 2021-03-05 11:43:24 +05:30
devansh bawari bffe993a3b Merge remote-tracking branch 'upstream/master' into issue-4690 2021-03-05 11:41:24 +05:30
Jonathan Bertoldi 4773747e01 Fixed admin theme not loading with custom admin url 2021-03-04 16:58:42 -03:00
devansh bawari 4baccc3c0c Merge branch 'master' into duplicate_order_issue 2021-03-04 20:08:21 +05:30
devansh bawari 2cec01659f Merge branch 'master' into s-4 2021-03-04 20:07:59 +05:30
devansh bawari 6542213053 Slug Added To All Locale~ 2021-03-04 12:10:15 +05:30
devansh bawari 1ed54e8e8d Unshift Replaced With Push 2021-03-03 20:06:07 +05:30
devansh bawari ba11ad5645 Missed Check Added 2021-03-03 16:59:06 +05:30
devansh bawari ea486c55de Some Warning Fixed 2021-03-03 14:24:22 +05:30
devansh bawari ecccbdea23 Some CSS Issue Fixed 2021-03-03 14:09:12 +05:30
devansh bawari 82a56761c8 Merge remote-tracking branch 'upstream/master' into s-3 2021-03-02 13:02:27 +05:30
devansh bawari e0354b3795 Some Handling Done 2021-03-02 12:52:02 +05:30
devansh bawari b37fe3d7a1 Sanitize Trait Added For Universal Support 2021-03-02 10:46:04 +05:30
devansh bawari 3df10d8c74 Removed Some Code! - Reference: 2021-03-02 10:20:34 +05:30
Glenn Hermans e56182b37e
Merge pull request #4538 from devansh-webkul/web-vital-v2
Text Compression and Cache Policy Added [Web Vital/Light House Work]
2021-03-01 16:32:19 +01:00
Glenn Hermans b51a50bcfe
Merge pull request #4681 from devansh-webkul/allowed_ip_issue
Allowed IP Exception Handled
2021-03-01 16:17:26 +01:00
Glenn Hermans 9bd52fe7df
Merge pull request #4696 from devansh-webkul/s-1
Some Cart Issue Fixed - SA1
2021-03-01 16:17:17 +01:00
Glenn Hermans 2a24098cb5
Merge pull request #4697 from devansh-webkul/s-2
Invoice Issue Fixed - SA2
2021-03-01 16:17:07 +01:00
devansh bawari f9b51f8367 SVG Sanitizer Package Added 2021-03-01 19:05:19 +05:30
Glenn Hermans e58d64e38c
Merge pull request #4695 from devansh-webkul/issue-4686
Fixed configurable item which is still visible on search page when out of stock is disabled #4686
2021-03-01 11:47:47 +01:00
Glenn Hermans 7da34dd29a
Merge pull request #4689 from rahulshukla-webkul/development
Issue #4682 fixed
2021-03-01 11:47:13 +01:00
devansh bawari 373296ccd6 Invoice ID Check Added 2021-03-01 12:12:44 +05:30
devansh bawari 50ca8bba1f Security Issue Fix In Cart 2021-03-01 10:57:00 +05:30
devansh bawari f9b93b01d6 Merge branch 'master' into duplicate_order_issue 2021-03-01 10:20:49 +05:30
devansh bawari 147e11a3ad Recompiled 2021-03-01 10:19:44 +05:30
devansh bawari ee55236f9c Merge branch 'master' into web-vital-v2 2021-03-01 10:18:44 +05:30
devansh bawari 6f367e0a69 Merge branch 'master' into allowed_ip_issue 2021-03-01 10:15:41 +05:30
devansh bawari 958cca1cf7 Merge remote-tracking branch 'upstream/master' into issue-4686 2021-03-01 09:41:09 +05:30
devansh bawari 65661e0f25 Query Enhanced 2021-02-28 23:46:19 +05:30
devansh bawari 13610a8dcf DB Prefix Added 2021-02-27 19:04:31 +05:30
devansh bawari ea3c0874c3 Out Of Stock Query Updated For Configurable Product 2021-02-27 18:42:43 +05:30
Glenn Hermans 8caecd4bd6
Merge pull request #4688 from devansh-webkul/issue-4685
Fixed blank space which remains on the homepage when disabling out of stock item from backend #4685
2021-02-26 16:11:57 +01:00
Nikolay Andreev 1097fa84f2 Changes 2021-02-26 11:44:10 +02:00
rahul shukla 53b1447220 database prefix added 2021-02-26 14:31:51 +05:30
rahul shukla 872e936daa Query optimized 2021-02-26 14:02:36 +05:30
rahul shukla 20d3601ff1 merge with master 2021-02-26 12:29:06 +05:30
rahul shukla 77c3947ec2 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-02-26 12:26:36 +05:30
rahul shukla 2552900d62 Issue #4682 fixed 2021-02-26 12:26:12 +05:30
devansh bawari b94a41a39d Merge remote-tracking branch 'upstream/master' into issue-4685 2021-02-25 18:38:10 +05:30
devansh bawari de0c76eaa1 Handled Null Case 2021-02-25 18:37:40 +05:30
devansh bawari a7cd68545b Remove Icon Added 2021-02-25 11:26:48 +05:30
devansh bawari 52b24a3566 Layout Fixed 2021-02-25 11:26:48 +05:30
devansh bawari a20c9cc0e9 Merge branch 'master' into duplicate_order_issue 2021-02-24 16:53:27 +05:30
devansh bawari 574544efd3 Merge branch 'master' into web-vital-v2 2021-02-24 16:53:06 +05:30
devansh bawari e269272776 Allowed IP Exception Handled 2021-02-24 11:50:53 +05:30
devansh bawari 0d9a0f0edb Merge branch 'master' into web-vital-v2 2021-02-23 18:10:56 +05:30
devansh bawari 09e876e747 Merge branch 'master' into duplicate_order_issue 2021-02-23 18:10:36 +05:30
nikolayandreev 93a5ec7d56 Revert the parameter rename, but keep new functionality 2021-02-23 13:51:19 +02:00
nikolayandreev a352370394 Progress 2021-02-23 13:51:19 +02:00
nikolayandreev 0f27f5c880 Added back getMinimalPrice in AbstractType 2021-02-23 13:51:19 +02:00
nikolayandreev d6398da5c3 Changed ProductController key for API endpoint /products?category_id to /products?categories=1,2,3 or categories=1 2021-02-23 13:51:19 +02:00
nikolayandreev b3e1c63fd3 Add capability to serach via multiple categoryIds in the REST API 2021-02-23 13:51:19 +02:00
nikolayandreev 63d86f5def Update getMaximamPrice() to return product price instead of getMinimalPrice() in AbstractType.
Solving issue with Simple products where price and special_price were the same amount in the REST API.
2021-02-23 13:51:19 +02:00
Glenn Hermans 30c0560e96
Merge pull request #4669 from devansh-webkul/issue-4641
User Friendly Messages Updated #4641
2021-02-22 14:35:50 +01:00
devansh bawari d5b478fb84 Translation Added 2021-02-22 18:33:03 +05:30
devansh bawari 5388dc04dc Message Fixed 2021-02-22 18:12:41 +05:30
devansh bawari fb8b0f64ca Messages Updated! 2021-02-22 17:46:09 +05:30
rahul shukla 46b2ab9dd2 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-02-22 15:03:54 +05:30
rahul shukla 04ca4fac7d Issue #4344 fixed 2021-02-22 15:03:38 +05:30
devansh bawari 0f67bbe95f Merge branch 'master' into duplicate_order_issue 2021-02-22 10:50:04 +05:30
devansh bawari 26900badb6 Merge branch 'master' into web-vital-v2 2021-02-22 10:49:11 +05:30
devansh bawari 5303059a94 Asterisk Added 2021-02-22 10:07:13 +05:30
rahul shukla 82c15cc62d Issue #4659 fixed 2021-02-19 18:46:42 +05:30
rahul shukla ea66157655 Issue #4645 fixed and product videos added in product api 2021-02-19 15:43:21 +05:30
rahul shukla e581c950df Issue #4643 fixed 2021-02-19 13:34:39 +05:30
Jitendra Singh cc35f228f5
Merge pull request #4639 from rahulshukla-webkul/optimization
Optimization
2021-02-16 12:34:14 +05:30
rahul shukla a95c04470a Conflict resolve and check added 2021-02-16 12:23:15 +05:30
Jitendra Singh d8500e24d3
Merge pull request #4537 from vivek-webkul/patch-44
[Updated: Duplicate queries removed.]
2021-02-16 12:08:27 +05:30
rahul shukla 3abc4aa80d optimization 2021-02-16 11:23:29 +05:30
rahul shukla 06ce1abb82 Merge branch 'master' of https://github.com/bagisto/bagisto into 4573 2021-02-15 18:30:30 +05:30
rahul shukla f16f36766b fixes as per comment 2021-02-15 18:20:30 +05:30
Glenn Hermans bfb5915b4d
Merge pull request #4619 from devansh-webkul/issue-4615
Fixed back icon which is not working properly at admin end #4615
2021-02-15 11:21:54 +01:00
rahul shukla db30a2e442 fixes as per comment 2021-02-15 15:38:08 +05:30
rahul shukla b1464eb91a Issue #4624 fixed 2021-02-15 13:47:27 +05:30
Glenn Hermans 74e97d231d
Merge pull request #4622 from devansh-webkul/blank-channel-slider
Blank Channel Name On Slider Fixed
2021-02-12 17:20:01 +01:00
devansh bawari 61959d6727 Blank Channel Name On Slider Fixed 2021-02-12 21:24:42 +05:30
devansh bawari 9de96b117a Merge branch 'master' into web-vital-v2 2021-02-12 21:14:16 +05:30
devansh bawari 4b5d96076c Merge branch 'master' into duplicate_order_issue 2021-02-12 21:13:49 +05:30
devansh bawari 663946cd7c Merge branch 'master' into optimization 2021-02-12 21:13:21 +05:30
devansh bawari 6e42efbb18 Fixed One Route 2021-02-12 21:08:32 +05:30
devansh bawari ff343b9e6d Routes Added 2021-02-12 20:56:21 +05:30
devansh bawari d66438289a Core Config Check Added 2021-02-12 20:08:35 +05:30
devansh bawari fa540e0262 Merge remote-tracking branch 'upstream/master' into issue-4615 2021-02-12 19:15:26 +05:30
devansh bawari b6e0621e9e For Add And Edit Product Index Route Added 2021-02-12 19:14:53 +05:30
rahul shukla f37d157461 Merge branch 'master' of https://github.com/bagisto/bagisto into 4573 2021-02-12 19:10:23 +05:30
rahul shukla bce929dab9 Issue #4573 fixed 2021-02-12 19:10:09 +05:30
Glenn Hermans 5f16a87b2c
Merge pull request #4614 from devansh-webkul/issue-4597
Fixed add a product to wishlist twice issue #4597
2021-02-12 14:38:16 +01:00
Glenn Hermans dd89361778
Merge pull request #4559 from devansh-webkul/paypal-refund-feature
Paypal refund feature added
2021-02-12 14:19:47 +01:00
Glenn Hermans ab7eadaa22
Merge pull request #4612 from devansh-webkul/issue-4592
Fixed layout issues on front end #4592
2021-02-12 14:19:36 +01:00
Glenn Hermans df6308cb68
Merge pull request #4595 from devansh-webkul/issue-4588
Fixed channel drop down which gets blank when admin panel filter based on new locale #4588
2021-02-12 14:19:21 +01:00
devansh bawari 6cd6b94af9 Extra Usage Checks For The Support 2021-02-12 17:53:17 +05:30
devansh bawari af4d625c55 Merge remote-tracking branch 'upstream/master' into issue-4597 2021-02-12 17:38:23 +05:30