Commit Graph

5738 Commits

Author SHA1 Message Date
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
devansh bawari 88e85cbbe3 Facade And Model Method Added 2020-11-16 20:25:36 +05:30
devansh bawari 5dce2f1a95 Compilation Done 2020-11-16 18:26:18 +05:30
devansh bawari 43e6f363d5 Equal Sign Added 2020-11-16 18:26:05 +05:30
rahulshukla-home 71a84b3ee7 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-11-16 15:03:49 +05:30
rahulshukla-home 581c33fa92 Issue #4248 fixed 2020-11-16 15:03:25 +05:30
devansh bawari fee22e8491 Refactoring Done 2020-11-13 14:55:03 +05:30
devansh bawari 9496ee3637 Merge branch 'master' into stopped_migration
Merged with master.
2020-11-13 11:59:47 +05:30
devansh bawari 8a5c6dc6b8 Merge branch 'master' into issue-4119
Merged with master.
2020-11-13 11:54:39 +05:30
devansh bawari 46fd10ddc4 Merge branch 'master' into issue-4119
Merged With Master
2020-11-12 19:12:11 +05:30
devansh bawari 76380e747a Merge branch 'master' into issue-3978
Merged With Master
2020-11-12 19:10:15 +05:30
devansh bawari 888c4c982b Recompiled 2020-11-12 15:15:38 +05:30
devansh bawari 770530cefa Merge remote-tracking branch 'upstream/master' into issue-3487 2020-11-12 15:14:30 +05:30
Jitendra Singh d96fdaf074
Merge pull request #4249 from devansh-webkul/issue-4029
Completed feature request to have a minimum order amount #4029
2020-11-12 15:02:31 +05:30
devansh bawari e87162e2e3 Imports Sorted And Some Removed 2020-11-12 13:27:27 +05:30
devansh bawari ccccc0d63c API Added For Minimum Amount Check 2020-11-12 13:24:35 +05:30
devansh bawari 4a884b3b60 RTL Issue Fixed For Multiple Images 2020-11-12 11:47:32 +05:30
devansh bawari 70f9e1fd57 Small Mistake Fixed 2020-11-11 19:53:07 +05:30
devansh bawari ef74d42ff6 Product Number To Copy Added 2020-11-11 19:49:22 +05:30
devansh bawari 00cc98a697 Merge remote-tracking branch 'upstream/master' into issue-4114
Merged  With Master
2020-11-11 18:41:28 +05:30
devansh bawari 31a1d573e7 Min height Added 2020-11-11 18:41:15 +05:30
devansh bawari 87c12b3b35 Merge remote-tracking branch 'upstream/master' into issue-4119
Merged With Master
2020-11-11 16:34:59 +05:30
Glenn Hermans 709e29e656
Merge pull request #4251 from devansh-webkul/issue-3978
Enhancement completed for adding product number #3978
2020-11-11 12:03:24 +01:00
devansh bawari 03e0c7ad30 Parsing Issue Fixed 2020-11-11 16:19:54 +05:30
devansh bawari 7e93672192 Translation Added 2020-11-10 18:08:50 +05:30
devansh bawari 444f36d9c5 Product Number Added For Admin Filteration 2020-11-10 17:59:47 +05:30
devansh bawari f3a6a929c4 Migration Added 2020-11-10 17:53:20 +05:30
devansh bawari b807c0ece7 Seeder Arrangement And Data Added 2020-11-10 17:39:09 +05:30
Glenn Hermans fe58315e5f
Merge pull request #4244 from vishal-webkul/issue-4228
Issue #4228 Fixed
2020-11-10 10:31:10 +01:00
devansh bawari 4a7f4bf986 Merge branch 'master' into issue-4119
Merged With Master
2020-11-10 14:52:22 +05:30
devansh bawari f457220e36 Completed 2020-11-10 13:54:56 +05:30
devansh bawari e8e1538e84 Recompiled 2020-11-10 13:09:18 +05:30
devansh bawari 7cfd396f47 Merge remote-tracking branch 'upstream/master' into issue-4029 2020-11-10 13:08:17 +05:30
devansh bawari 18322873aa Removed From One Page 2020-11-10 13:06:40 +05:30
devansh bawari d054bf8242 Reverted Two Files 2020-11-10 12:40:36 +05:30
devansh bawari 8c0395e8f7 One File Reverted 2020-11-10 12:15:02 +05:30
devansh bawari 5f75fa7fb2 Component Added For Both Themes 2020-11-10 12:08:46 +05:30
vishal.kushwaha650 24db2e81d4 remove wrong if condition 2020-11-10 11:55:37 +05:30
vishal.kushwaha650 d668f6de16 Same image warning issue resolved 2020-11-10 11:39:06 +05:30
devansh bawari 9eb317402e Component Added For Default Theme 2020-11-10 11:37:03 +05:30
vishal.kushwaha650 445c912217 Add Translation and implement in default theme 2020-11-10 10:45:49 +05:30
devansh bawari 5ce0a82fea Recompiled 2020-11-10 09:57:31 +05:30
devansh bawari 6639cf03cc Merge remote-tracking branch 'upstream/master' into issue-3929 2020-11-10 09:56:07 +05:30
Jitendra Singh 679594076b
Merge pull request #4245 from devansh-webkul/default_depend
Required Field Depend On Status
2020-11-09 22:02:07 +05:30
devansh bawari 6c211183a1 Added On The Basis Of Status 2020-11-09 20:07:27 +05:30
devansh bawari d27bbd7027 Added For Default Theme As Well 2020-11-09 19:44:41 +05:30
devansh bawari 19e04369f6 Dummy Translation Added 2020-11-09 18:38:18 +05:30
devansh bawari 4890420b2d Merge remote-tracking branch 'upstream/master' into issue-4029
Merged With Master
2020-11-09 18:25:37 +05:30
devansh bawari e47662e6a5 Warning Message Added In Place Order As Well 2020-11-09 18:23:47 +05:30
jitendra 67fc98db83 Conflicts resolved 2020-11-09 17:02:00 +05:30
jitendra f65c0c22a8 Updated typo for paypal label and changed the default sort order for payment methods 2020-11-09 17:00:25 +05:30
devansh bawari a3a858a459 Minimum Order Check Added To Cart 2020-11-09 16:53:32 +05:30
Jitendra Singh 2e8c26b606
Merge pull request #4243 from mo7amedmamdouh/bugfix/fix-rtl-carousel-slider
Bugfix carousel RTL
2020-11-09 16:03:32 +05:30
Mohamed Mamdouh d1e1cbbc89 Bugfix - correctly inject direction prob to slider 2020-11-09 11:58:14 +02:00
devansh bawari 9bc9f7e217 Console Log Removed 2020-11-09 14:56:39 +05:30
devansh bawari fd90a5ab37 Merge remote-tracking branch 'upstream/master'
Merged With Master
2020-11-09 14:20:48 +05:30
devansh bawari 433225ad81 Required Field Depend On Status 2020-11-09 14:20:32 +05:30
vishal.kushwaha650 d91d7cec58 Merge branch 'master' of https://github.com/vishal-webkul/bagisto into issue-4228 2020-11-09 10:25:55 +05:30
vishal.kushwaha650 7c15850520 Issue #4228 Fixed 2020-11-09 10:22:57 +05:30
Mohamed Mamdouh 8a74a22325 Bugfix carousel RTL 2020-11-08 17:34:11 +02:00
devansh bawari 40bde1a95d Merge remote-tracking branch 'upstream/master' into issue-4234
Merged With Master
2020-11-06 15:54:19 +05:30
devansh bawari 03a1f44def Default Value Added 2020-11-06 15:53:44 +05:30
Jitendra Singh 4ed2df4814
Merge pull request #4231 from vishal-webkul/issue-4229
Issue #4229 Fixed
2020-11-05 20:25:47 +05:30
devansh bawari 8534e55d0b Added In Responsive 2020-11-05 19:10:46 +05:30
vishal.kushwaha650 e03fab4d0c Issue #4229 Fixed 2020-11-05 18:18:05 +05:30
devansh bawari a189924823 Stopped Migration From Getting Published 2020-11-05 13:41:02 +05:30
devansh bawari a621542417 Finishing Done 2020-11-03 18:31:56 +05:30
devansh bawari e69543b31b Common Component Completed 2020-11-03 17:20:47 +05:30
devansh bawari d2f9e786fa Strict Typing Check Added For Common Component 2020-11-03 14:53:38 +05:30
devansh bawari db302a9d43 Recompiled 2020-11-03 12:20:42 +05:30
devansh bawari 74c06598d9 Merge remote-tracking branch 'upstream/master' into issue-3929 2020-11-03 12:20:07 +05:30
devansh bawari d94bf2417d Completed Recently Viewed Product Dependency 2020-11-03 12:17:29 +05:30
Glenn Hermans a0970f590d
Merge pull request #4153 from jaseelbavu/issue-4082
Added bulk category delete functionality
2020-11-02 17:16:33 +01:00
Jaseel P V 0de1f9e64b Added check for products in individual category delete | Fixed bug while selecting category for mass delete 2020-11-02 20:32:25 +05:30
Jitendra Singh e9591f6c0f
Merge pull request #4224 from jitendra-webkul/master
Removed commented code from paypal smart button controller
2020-11-02 17:36:33 +05:30
jitendra fdd6bca458 Removed commented code from paypal smart button controller 2020-11-02 17:36:04 +05:30
Jitendra Singh d6201b3c11
Merge pull request #4223 from jitendra-webkul/master
Paypal smart button issue fixed
2020-11-02 17:34:27 +05:30
jitendra 3cd5344448 Paypal smart button issue fixed 2020-11-02 17:33:57 +05:30
devansh bawari 233e87d7ef Some Work Done 2020-11-02 16:18:57 +05:30
Jitendra Singh 9de3a335b2
Merge pull request #4183 from devansh-webkul/issue-4181
Minimum Height Added #4181
2020-11-02 15:00:33 +05:30
Jitendra Singh 76f4db6adf
Merge pull request #4213 from asif-webkul/issue4127
fixed Issue  #4127
2020-11-02 14:20:51 +05:30
Jitendra Singh ac2ee68504
Merge pull request #4221 from devansh-webkul/issue-4220
Duplicated Images Removed #4220
2020-11-02 13:27:32 +05:30
Jitendra Singh 56159902d1
Merge pull request #4222 from devansh-webkul/dummy-1
Added regular price when sale price is added
2020-11-02 13:14:42 +05:30
devansh bawari f5d1eeb426 Removed From Velocity Assets Images 2020-11-02 13:02:36 +05:30
devansh bawari 8fbb1faea3 Just Final Step Finishing 2020-11-02 12:25:29 +05:30
Jitendra Singh b6dbdef04a
Merge pull request #4210 from rahulcs0082/development
Development
2020-11-02 12:24:56 +05:30
devansh bawari 549df39875 Merge branch 'master' into dummy-1
Merged With Master
2020-11-02 12:12:44 +05:30
devansh bawari 383edab8b5 Duplicated Images Removed 2020-11-02 11:59:21 +05:30
devansh bawari aa3ba2d24f Recompiled 2020-11-02 10:13:08 +05:30
devansh bawari b1cf108f11 Merge branch 'master' into issue-4181 2020-11-02 10:12:25 +05:30
devansh bawari fef875a3a8 Recompiled 2020-11-02 10:08:39 +05:30
devansh bawari 02080db646 Merged With Master 2020-11-02 10:07:49 +05:30
mohd asif 620c687683 Merge branch 'master' of https://github.com/bagisto/bagisto into issue4127 2020-11-01 11:39:49 +05:30
mohd asif 4f91ccf028 fixed issue #4127 2020-11-01 11:38:17 +05:30
devansh bawari 5aebd1b4e8 Merge branch 'master' into dummy-1
Merged With Master
2020-10-30 21:05:59 +05:30
devansh bawari fcac81c0d4 Recompiled 2020-10-30 21:01:12 +05:30
devansh bawari 6ff6b325d6 Merge branch 'master' into issue-4181 2020-10-30 21:00:38 +05:30
devansh bawari 9eff166437 Recompiled 2020-10-30 20:59:31 +05:30
devansh bawari 2daf78ac4e Merge branch 'master' into issue-4178 2020-10-30 20:58:59 +05:30
devansh bawari c6e2fe06dd Merge branch 'master' into issue-4119
Merged With Master
2020-10-30 20:54:25 +05:30
devansh bawari 3b6623c9c9 Recompiled 2020-10-30 20:37:56 +05:30
devansh bawari 2d4e9f0e97 Merge branch 'master' into issue-3929 2020-10-30 20:37:10 +05:30
devansh bawari 0ac032c908 Carousel Product Issue Fixed 2020-10-30 20:34:59 +05:30
Mohan Raj df383e4323 Merge branch 'master' of https://github.com/bagisto/bagisto into ISSUE_4111 2020-10-30 20:08:56 +05:30
Glenn Hermans bcfe391277
Merge pull request #4159 from praem90/ISSUE_4081
add validation for discount amt field in customer group price
2020-10-30 15:12:37 +01:00
devansh bawari a0b984a677 Removed Log 2020-10-30 19:41:10 +05:30
Glenn Hermans 42410fc2b7
Merge pull request #4208 from devansh-webkul/issue-4180
Some Minor Issue Fixed #4180
2020-10-30 15:09:20 +01:00
devansh bawari 865ae6c741 Featured Product Completed 2020-10-30 19:39:10 +05:30
Glenn Hermans 5aaa80e100
Merge pull request #4177 from prateek-webkul/master
issue #4079 fixed
2020-10-30 14:42:47 +01:00
devansh bawari 024799ad9f Merge branch 'master' into issue-3929 2020-10-30 18:38:41 +05:30
rahulshukla-home ce90a569f3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-10-30 18:22:39 +05:30
rahulshukla-home 30f9179439 removed unnecessary code in export controller 2020-10-30 18:21:39 +05:30
devansh bawari fa1932e333 Modal Issue Fixed 2020-10-30 17:36:31 +05:30
devansh bawari 43457b225e Merge remote-tracking branch 'dummy/patch-1' into dummy-1
Merged
2020-10-30 17:04:18 +05:30
devansh bawari 538f5b71fa Little Change And Recompiled 2020-10-30 16:44:56 +05:30
devansh bawari 6ee60ad355 Merge branch 'master' into issue-4178 2020-10-30 16:34:20 +05:30
Glenn Hermans 6be2c6e22d
Merge pull request #4202 from devansh-webkul/issue-4105
Fixed issue with total due in cash on delivery #4105
2020-10-30 12:00:01 +01:00
devansh bawari 4035e4f892 Some Changes 2020-10-30 16:29:34 +05:30
rahulshukla-home cd6471d5b9 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-10-30 15:55:14 +05:30
rahulshukla-home e700917341 Issue #4142 fixed 2020-10-30 15:45:01 +05:30
rahulshukla-home 8f67f6cee5 Issue #3142 fixed 2020-10-30 15:43:30 +05:30
Glenn Hermans 139572921e
Merge pull request #3997 from vishal-webkul/issue-3975
Issue #3975 Fixed
2020-10-30 10:36:27 +01:00
Glenn Hermans dd37cf00a9
Merge pull request #4099 from devansh-webkul/velocity_responsive_issue
Velocity Responsive Issue #4195
2020-10-30 10:25:18 +01:00
devansh bawari 331b385183 Overlapping Of Zoom Container Fixed 2020-10-30 10:31:52 +05:30
devansh bawari 3e9d9a396d Overlap Image Fixed 2020-10-29 19:48:47 +05:30
devansh bawari c981b8eb06 Sticky Header Adjusted 2020-10-29 19:02:30 +05:30
devansh bawari 661bd503e3 Fixed Search Bar Issue And Back And Forth Issue 2020-10-29 18:06:28 +05:30
devansh bawari ec7f9a5b33 Class Added 2020-10-29 16:10:47 +05:30
devansh bawari 4b70935f8f Recompiled 2020-10-29 15:38:57 +05:30
devansh bawari 5f6cba9b62 Merge remote-tracking branch 'deepak/fix-responsive-issues' into velocity_responsive_issue 2020-10-29 15:35:41 +05:30