Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement/commission restructure #2027

Merged
merged 135 commits into from
Nov 14, 2024
Merged

Enhancement/commission restructure #2027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
a392443
Added tailwindcss
Aunshon Sep 14, 2023
86468ee
Added tailwindcss
Aunshon Sep 14, 2023
f247db9
Fix broken design after adding tailwindcss
Aunshon Sep 14, 2023
c7ed80b
Enable autoprefixer
Aunshon Sep 14, 2023
b7e46af
Fix broken style of admin notice
Aunshon Sep 14, 2023
cbeea05
Fix whats new icon style
Aunshon Sep 14, 2023
851ba25
Merge branch 'develop' into chore/tailwind-css-added
Aunshon Sep 27, 2023
937102c
Merge branch 'develop' into chore/tailwind-css-added
Aunshon Oct 2, 2023
c31661f
Redesign combine commission
Aunshon Oct 3, 2023
4d510dd
Build fixed commission component
Aunshon Oct 4, 2023
db6a56d
Fix broken design
Aunshon Oct 19, 2023
14842a6
Responsive dokan menu and earning by commission
Aunshon Oct 20, 2023
77864ae
Earning by commission done
Aunshon Oct 26, 2023
e2438a4
Category commission on going
Aunshon Nov 1, 2023
4f8e6ca
Merge branch 'develop' into chore/tailwind-css-added
Aunshon Nov 8, 2023
00c53ee
Added commission meta-box.
Aunshon Nov 13, 2023
9b0f8c4
Added commission meta-box.
Aunshon Nov 14, 2023
efb39c9
Added commission meta-box.
Aunshon Nov 14, 2023
a99a5fa
Related and suborder done
Aunshon Nov 14, 2023
3bc8e05
Separate commission and sun/related order html codes into templates.
Aunshon Nov 14, 2023
6dac170
Separate commission and sun/related order html codes into templates.
Aunshon Nov 15, 2023
3a3f69c
Fix tailwind broken design
Aunshon Nov 21, 2023
7e5be99
Fix tailwind broken design
Aunshon Nov 21, 2023
25fae4f
Fix tailwind broken design
Aunshon Nov 22, 2023
0b1c9eb
Update tailwind.config.js
shohag121 Dec 29, 2023
be2d6d1
Update: tailwind css configuration.
Aunshon Jan 4, 2024
8fb10fd
Merge remote-tracking branch 'origin/develop' into enhancement/commis…
Aunshon Jan 30, 2024
b4d6dea
Category commission save done
Aunshon Jan 30, 2024
d80a72f
Merge branch 'chore/tailwind-css-added' into enhancement/commission-r…
Aunshon Jan 31, 2024
57855b5
Add vendor single page
Aunshon Feb 6, 2024
14f2bf4
Add vendor payment images
Aunshon Feb 6, 2024
9c6d574
Remove commission from user profile php end
Aunshon Feb 6, 2024
b649653
Moved product commission to lite
Aunshon Feb 7, 2024
a6a940b
Adding category commission in the setup wizard
Aunshon Feb 8, 2024
5049be6
Merge remote-tracking branch 'origin/develop' into enhancement/commis…
Aunshon Feb 8, 2024
92bd319
Fix: style of commission in admin setup wizard
Aunshon Feb 8, 2024
46074b4
Category commission added on setup wizard done
Aunshon Feb 8, 2024
a188627
Add new commission calculation classes
Aunshon Feb 11, 2024
35f6757
Added order item refund support in order item commission, rewrite the…
Aunshon Feb 12, 2024
694d940
Add flat, percentage and combine support to new commission system
Aunshon Feb 13, 2024
697b554
Fix commission calculation.
Aunshon Feb 13, 2024
cf0ede6
Start the new commission system in Commission.php
Aunshon Feb 14, 2024
6deb2da
Integrated the new commission system to Commission.php
Aunshon Feb 15, 2024
501314a
Integrated the new commission system to Commission.php and showed ear…
Aunshon Feb 16, 2024
bed1569
Show commission on product edit page
Aunshon Feb 20, 2024
2ad8e4c
Merge remote-tracking branch 'origin/develop' into enhancement/admin-…
Aunshon Feb 20, 2024
e93773e
Merge branch 'enhancement/admin-order-details-page' into enhancement/…
Aunshon Feb 20, 2024
1233bca
Convert the commission class into structured class
Aunshon Feb 23, 2024
9bf6c08
Fix: commission details text
Aunshon Feb 27, 2024
9ab6d0e
Fix: related orders list after refund.
Aunshon Feb 28, 2024
f620452
Test case for a category commission is done. writing fixed commission.
Aunshon Feb 29, 2024
3e4b2c8
Merge remote-tracking branch 'origin/develop' into enhancement/commis…
Aunshon Feb 29, 2024
fe412fb
Add tesing for dokan commission
Aunshon Mar 1, 2024
c758c52
Fix: global strategy commission
Aunshon Mar 4, 2024
8f5c31b
add strategy tests
Aunshon Mar 5, 2024
b11fa71
Add get_earning_by_product method test case
Aunshon Mar 7, 2024
5177f19
Merge remote-tracking branch 'origin/develop' into enhancement/commis…
Aunshon Mar 7, 2024
3ffcd4c
Dokan commission unit test added.
Aunshon Mar 12, 2024
2395b33
Adding upgrade for a commission
Aunshon Mar 13, 2024
728bce2
Commission upgrader added.
Aunshon Mar 13, 2024
c68daaa
Merge remote-tracking branch 'origin/develop' into enhancement/commis…
Aunshon Mar 13, 2024
0b385be
Upgrader added for commission.
Aunshon Mar 14, 2024
fb89764
Fix: variation product commission data. the variation product commiss…
Aunshon Mar 18, 2024
38eb600
Merge remote-tracking branch 'origin/develop' into enhancement/commis…
Aunshon Mar 19, 2024
98ba9e7
Fix style of CategoryBasedCommission.vue component
Aunshon Mar 19, 2024
7a4714e
Add commenting for combine commission.
Aunshon Mar 20, 2024
734a055
Add commenting for CommissionSettings.php
Aunshon Mar 20, 2024
d988755
Fix save product commission data.
Aunshon Mar 20, 2024
f5e9422
remove useless files
Aunshon Mar 20, 2024
4ad181e
Merge branch 'develop' into enhancement/commission-restructore
Aunshon Apr 4, 2024
05a70a7
Make the calculate_gateway_fee method same as in the commission.php
Aunshon Apr 4, 2024
91adf04
Fix order metadata check
Aunshon Apr 5, 2024
5cd9f05
Merge remote-tracking branch 'origin/develop' into enhancement/commis…
Aunshon Apr 19, 2024
7fc5866
Restructure the commission files.
Aunshon May 8, 2024
f28f6b2
Restructure the commission files.
Aunshon May 9, 2024
3346c49
Restructure the commission files.
Aunshon May 9, 2024
70d83a7
Update variable and function naming
Aunshon May 9, 2024
40a77e8
Refactor codes
Aunshon May 10, 2024
fc493fd
Code refactor.
Aunshon May 10, 2024
00aea41
Add commission api
Aunshon May 10, 2024
9c8d512
Fix commission api permission check
Aunshon May 10, 2024
b345e1b
Fix type of category helper
Aunshon May 10, 2024
8acfe5a
Codes refactor
Aunshon May 13, 2024
1670f37
Refactor codes
Aunshon May 14, 2024
af3f09d
Fix phpstan error to level-5
Aunshon May 14, 2024
e2e6867
Refactor codes
Aunshon May 16, 2024
0ac8418
Fix styles
Aunshon May 17, 2024
8d59dc1
Merge remote-tracking branch 'origin/develop' into enhancement/commis…
Aunshon May 28, 2024
1bafb48
Fix failed tests
shashwatahalder01 May 28, 2024
bbb7c8b
Fix qa issues
Aunshon Jul 1, 2024
19dbf19
Fix category commission component styles
Aunshon Jul 3, 2024
259c372
Merge remote-tracking branch 'origin/develop' into enhancement/commis…
Aunshon Jul 3, 2024
69b2c71
add commission delete functionality in vendor
Aunshon Jul 4, 2024
2fed4d2
Fix the type of commission amount
Aunshon Jul 5, 2024
d1566db
Merge branch 'refs/heads/develop' into enhancement/commission-restruc…
Aunshon Jul 15, 2024
ccfc0d3
Add Commission tests
shashwatahalder01 Jul 24, 2024
17f6e50
Add additional commission tests and Refactor some methods
shashwatahalder01 Jul 25, 2024
c20b5d1
Fix a test and refactor api utility mtehods
shashwatahalder01 Jul 26, 2024
4eed932
Fix invalid page number issue
shashwatahalder01 Jul 26, 2024
199127b
Add time for slow tests and fix enpoint issue
shashwatahalder01 Jul 26, 2024
0e16e9c
Fix qu issues
Aunshon Jul 29, 2024
8cc67bf
Merge remote-tracking branch 'origin/enhancement/commission-restructo…
Aunshon Jul 29, 2024
883eb16
Merge branch 'refs/heads/develop' into enhancement/commission-restruc…
Aunshon Aug 7, 2024
d785a04
Fix qa issues
Aunshon Aug 7, 2024
3ac50cc
Merge branch 'refs/heads/develop' into enhancement/commission-restruc…
Aunshon Aug 9, 2024
08f0503
Fix commission test files directory.
Aunshon Aug 9, 2024
f0c4881
Merge branch 'develop' into enhancement/commission-restructore
shashwatahalder01 Aug 9, 2024
624ac12
Add commission tests
shashwatahalder01 Aug 9, 2024
4548d37
Update commission tests prequisite and sitesetup,plugin setup methods
shashwatahalder01 Aug 9, 2024
2256608
Skip plugin setup on CI
shashwatahalder01 Aug 9, 2024
18d50c5
Merge branch 'develop' into enhancement/commission-restructore
shashwatahalder01 Aug 11, 2024
c3749b3
Fix a test
shashwatahalder01 Aug 12, 2024
9ad121e
Add multivendor commission test
shashwatahalder01 Aug 13, 2024
1639fa5
Merge branch 'develop' into enhancement/commission-restructore
shashwatahalder01 Aug 17, 2024
730d459
update tests & methods
shashwatahalder01 Aug 17, 2024
3005329
Merge branch 'develop' into enhancement/commission-restructore
shashwatahalder01 Aug 21, 2024
0caba9d
Merge branch 'develop' into enhancement/commission-restructore
shashwatahalder01 Aug 27, 2024
f4ed911
Fix combine input debounce timer
Aunshon Aug 27, 2024
885c730
Resolve test file conflicts
shashwatahalder01 Sep 10, 2024
a8445a8
Update tests data & interfaces
shashwatahalder01 Sep 11, 2024
57d2644
Merge branch 'refs/heads/develop' into enhancement/commission-restruc…
Aunshon Sep 12, 2024
3c4190f
Fix category commission behavior.
Aunshon Sep 18, 2024
57bcd29
Merge branch 'develop' into enhancement/commission-restructore
shashwatahalder01 Oct 8, 2024
34e3a31
Fix: lint issues
shashwatahalder01 Oct 8, 2024
89e157f
Fix category based commission style.
Aunshon Oct 14, 2024
b216b54
Tooltip added for commission
Aunshon Oct 22, 2024
03c2e07
Added tooltip in product edit page.
Aunshon Oct 25, 2024
6de068c
Merge branch 'refs/heads/develop' into enhancement/commission-restruc…
Aunshon Nov 11, 2024
c536d23
Add fees class into ServiceProvider.php class.
Aunshon Nov 12, 2024
d708f43
Update test data
shashwatahalder01 Nov 14, 2024
1a9f01d
Merge branch 'develop' into enhancement/commission-restructore
shashwatahalder01 Nov 14, 2024
562f328
Fix test data issue
shashwatahalder01 Nov 14, 2024
30aea87
Fix failed tests
shashwatahalder01 Nov 14, 2024
c9f3821
Update api env setup
shashwatahalder01 Nov 14, 2024
b8343a9
Fix minor test suite issues
shashwatahalder01 Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions assets/images/payments/bank.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions assets/images/payments/d-paypal.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions assets/images/payments/d-stripe.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions assets/images/payments/mangopay.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions assets/images/payments/payment-bag.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading