Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Romain Courteaud
slapos.core
Commits
13e4dcbb
Commit
13e4dcbb
authored
Aug 26, 2024
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_panel: if the payment is done by an organisation, skip the user payment process
parent
978eee87
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/Project_selectRequestInstanceTree.py
...l_skins/slapos_panel/Project_selectRequestInstanceTree.py
+2
-1
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/Project_selectRequestSoftwareRelease.py
...kins/slapos_panel/Project_selectRequestSoftwareRelease.py
+2
-1
No files found.
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/Project_selectRequestInstanceTree.py
View file @
13e4dcbb
...
@@ -75,7 +75,8 @@ subscription_request = request_instance_tree.Item_createSubscriptionRequest(temp
...
@@ -75,7 +75,8 @@ subscription_request = request_instance_tree.Item_createSubscriptionRequest(temp
# Check if we could create the Subscription Request
# Check if we could create the Subscription Request
if
subscription_request
is
not
None
:
if
subscription_request
is
not
None
:
price
=
subscription_request
.
getPrice
(
None
)
price
=
subscription_request
.
getPrice
(
None
)
if
price
is
not
None
and
price
!=
0
:
# If the payment is done by an Organisation, skip user payment process
if
(
price
is
not
None
)
and
(
price
!=
0
)
and
(
subscription_request
.
getDestinationSection
()
==
person
.
getRelativeUrl
()):
balance
=
person
.
Entity_getDepositBalanceAmount
([
subscription_request
])
balance
=
person
.
Entity_getDepositBalanceAmount
([
subscription_request
])
if
balance
<
price
:
if
balance
<
price
:
instance
=
web_site
.
restrictedTraverse
(
request_instance_tree
.
getRelativeUrl
())
instance
=
web_site
.
restrictedTraverse
(
request_instance_tree
.
getRelativeUrl
())
...
...
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/Project_selectRequestSoftwareRelease.py
View file @
13e4dcbb
...
@@ -38,7 +38,8 @@ if aggregate_uid is None:
...
@@ -38,7 +38,8 @@ if aggregate_uid is None:
is_future_balance_negative
=
0
is_future_balance_negative
=
0
price_information
=
None
price_information
=
None
if
price
is
not
None
and
price
!=
0
:
# If the payment is done by an Organisation, skip user payment process
if
(
price
is
not
None
)
and
(
price
!=
0
)
and
(
subscription_request
.
getDestinationSection
()
==
destination_value
.
getRelativeUrl
()):
price_information
=
'%s %s/%s'
%
(
price
,
price_information
=
'%s %s/%s'
%
(
price
,
subscription_request
.
getPriceCurrencyTitle
(),
subscription_request
.
getPriceCurrencyTitle
(),
subscription_request
.
getQuantityUnitTitle
())
subscription_request
.
getQuantityUnitTitle
())
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment