merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,189 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

6201 Commits

Author SHA1 Message Date
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
devansh bawari 1840b804db Wishlist And Some Code Enhanced 2021-02-12 17:37:53 +05:30
rahul shukla 70bfa2d6f1 Enhncement #4264, multilocale for admin revrted 2021-02-12 16:34:34 +05:30
devansh bawari 38b7283633 Merge remote-tracking branch 'upstream/master' into issue-4592 2021-02-12 15:30:49 +05:30
devansh bawari b2695f69cb Slightly Top CSS Added 2021-02-12 15:30:27 +05:30
devansh bawari 423debb25b Merge remote-tracking branch 'upstream/master' into optimization 2021-02-12 11:50:01 +05:30
devansh bawari 0346ff74fb Merge remote-tracking branch 'upstream/master' into duplicate_order_issue 2021-02-12 11:35:17 +05:30
devansh bawari 81e5824dcd Recompiled 2021-02-12 11:32:32 +05:30
devansh bawari 67c1c91f71 Merge branch 'master' into web-vital-v2 2021-02-12 11:31:06 +05:30
devansh bawari 84c9e73a81 Fixed Duplicate Buttons Issue -> https://github.com/bagisto/bagisto/issues/4609 2021-02-12 11:22:22 +05:30
devansh bawari 7302bdc08e Search Issue Fixed 2021-02-12 10:29:48 +05:30
devansh bawari 61812ab4e5 Merge remote-tracking branch 'upstream/master' into issue-4588 2021-02-12 09:49:06 +05:30
devansh bawari 39ef3606c6 Reverted One File And One Colon Removed 2021-02-12 09:45:39 +05:30
Glenn Hermans 1efb44c947
Merge pull request #4599 from devansh-webkul/issue-4592 
Fixed layout issues on front end #4592 and Datagrid issue #4596
 2021-02-11 17:15:36 +01:00
devansh bawari 9f7555244f Fallback From Config Added 2021-02-11 20:16:14 +05:30
devansh bawari 70af72965d Configuration Issue Fixed 2021-02-11 19:34:05 +05:30
devansh bawari a4d477bc65 Exception Fixed 2021-02-11 19:09:55 +05:30
devansh bawari 7ab0946841 Channel Exception Fixed 2021-02-11 18:48:19 +05:30
devansh bawari be505282de Merge remote-tracking branch 'upstream/master' into issue-4588 2021-02-11 18:45:11 +05:30
devansh bawari 265f4eafc2 Fallback Added 2021-02-11 18:42:50 +05:30
devansh bawari df6e890dfe Method Added For Fetching Channel Name 2021-02-11 18:04:45 +05:30
Glenn Hermans 50e60bc675
Merge pull request #4608 from rahulshukla-webkul/4583 
Issue #4583 fixed
 2021-02-11 13:31:12 +01:00
Glenn Hermans 18a4ece78e
Merge pull request #4586 from devansh-webkul/some-enhancement 
Two properties moved to abstract class
 2021-02-11 13:30:56 +01:00
devansh bawari f8f432058e Merge remote-tracking branch 'upstream/master' into issue-4588 2021-02-11 17:04:56 +05:30
devansh bawari 589425f2a1 Streteched Issue Fixed 2021-02-11 17:00:01 +05:30
devansh bawari 1132247409 Merge remote-tracking branch 'upstream/master' into issue-4592 2021-02-11 16:59:40 +05:30
rahul shukla f4c647fdff conditions added 2021-02-11 16:51:50 +05:30
devansh bawari f4ef06af6e Checked For The Requested Locale In Channel 2021-02-11 16:43:47 +05:30
Glenn Hermans 4d005d9041
Merge pull request #4601 from rahulshukla-webkul/4590 
Issue #4590 fixed
 2021-02-11 11:57:38 +01:00
rahul shukla 398fbdc7eb Issue #4583 fixed 2021-02-11 15:59:45 +05:30
rahul shukla c35fe27888 Issue #4590 fixed as per comment 2021-02-11 15:36:52 +05:30
devansh bawari 68ab2d8779 Completed: Channel multiselect option also gets blank https://prnt.sc/z2f9ek 2021-02-11 14:55:41 +05:30
devansh bawari 2efb321b1c Completed: No filteration should be done in channel grid when admin filter new locale https://prnt.sc/z23l9a 2021-02-11 14:47:52 +05:30
devansh bawari 8979bad283 Fixed -> When you filter admin locale (add new locale and filter from top right corner) and go to product grid https://prnt.sc/z239b3 2021-02-11 14:40:34 +05:30
devansh bawari a9b803c7f3 Reverted One File 2021-02-11 14:09:25 +05:30
devansh bawari 3e049e0e91 Merge branch 'master' into paypal-refund-feature 2021-02-11 12:27:49 +05:30
devansh bawari 6242ef9060 Merge remote-tracking branch 'upstream/master' into issue-4592 2021-02-11 10:45:39 +05:30
devansh bawari 15369d7a86 Datagrid Issue Fixed In Shops 2021-02-11 10:45:10 +05:30
Glenn Hermans 8e2083204b
Merge pull request #4602 from rahulshukla-webkul/development 
Issue #4598 fixed
 2021-02-10 16:29:12 +01:00
rahul shukla f1e8e4fc5a Issue #4598 fixed 2021-02-10 19:56:08 +05:30
Glenn Hermans 7e09297db1
Merge pull request #4581 from rahulshukla-webkul/development 
Issue #4571 fixed.
 2021-02-10 15:00:27 +01:00
devansh bawari 2dea0a79e3 Merge remote-tracking branch 'upstream/master' into paypal-refund-feature 2021-02-10 19:16:24 +05:30
rahul shukla 14f7a11fbe Issue #4590 fixed 2021-02-10 19:13:00 +05:30
devansh bawari 7a2e43a2da Case Checked With Request Only Rather Then Fallback 2021-02-10 19:08:10 +05:30
devansh bawari 0ee4cfec08 Fallback Added 2021-02-10 18:57:50 +05:30