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
0
Merge Requests
0
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
Xavier Thompson
slapos.core
Commits
a14a847e
Commit
a14a847e
authored
Mar 26, 2021
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_accounting: Include reservation prices for larger VMs
Sample values.
parent
65a90221
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
328 additions
and
4 deletions
+328
-4
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/3.xml
..._condition_module/slapos_aggregated_trade_condition/3.xml
+6
-2
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/3/path_2.xml
...ion_module/slapos_aggregated_trade_condition/3/path_2.xml
+140
-0
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/4.xml
..._condition_module/slapos_aggregated_trade_condition/4.xml
+6
-2
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/4/path_2.xml
...ion_module/slapos_aggregated_trade_condition/4/path_2.xml
+140
-0
master/bt5/slapos_accounting/PathTemplateItem/service_module/slapos_reservation_fee/3.xml
...hTemplateItem/service_module/slapos_reservation_fee/3.xml
+36
-0
No files found.
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/3.xml
View file @
a14a847e
...
...
@@ -260,7 +260,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
990.
40476.14802.1677
6
</string>
</value>
<value>
<string>
990.
62787.62832.6169
6
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -278,7 +278,7 @@
</tuple>
<state>
<tuple>
<float>
161
5473764.78
</float>
<float>
161
6783272.42
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
@@ -306,6 +306,10 @@
<key>
<string>
variation/service_module/slapos_reservation_fee/1
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
variation/service_module/slapos_reservation_fee/3
</string>
</key>
<value>
<int>
2
</int>
</value>
</item>
<item>
<key>
<string>
variation/service_module/slapos_reservation_fee/default
</string>
</key>
<value>
<int>
1
</int>
</value>
...
...
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/3/path_2.xml
0 → 100644
View file @
a14a847e
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Sale Supply Cell"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_identity_criterion
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
_local_properties
</string>
</key>
<value>
<tuple>
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
base_id
</string>
</value>
</item>
<item>
<key>
<string>
type
</string>
</key>
<value>
<string>
string
</string>
</value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key>
<string>
_range_criterion
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
base_id
</string>
</key>
<value>
<string>
path
</string>
</value>
</item>
<item>
<key>
<string>
base_price
</string>
</key>
<value>
<float>
488.0
</float>
</value>
</item>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
variation/service_module/slapos_reservation_fee/3
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
criterion_property
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
path_2
</string>
</value>
</item>
<item>
<key>
<string>
mapped_value_property_list
</string>
</key>
<value>
<tuple>
<string>
base_price
</string>
<string>
base_unit_price
</string>
<string>
slice_base_price
</string>
<string>
slice_quantity_range
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
membership_criterion_base_category
</string>
</key>
<value>
<tuple>
<string>
variation
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
membership_criterion_category
</string>
</key>
<value>
<tuple>
<string>
variation/service_module/slapos_reservation_fee/3
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
multimembership_criterion_base_category
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Sale Supply Cell
</string>
</value>
</item>
<item>
<key>
<string>
test_method_id
</string>
</key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/4.xml
View file @
a14a847e
...
...
@@ -260,7 +260,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
990.
39746.40964.56832
</string>
</value>
<value>
<string>
990.
62787.62832.61696
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -278,7 +278,7 @@
</tuple>
<state>
<tuple>
<float>
161
5473747.58
</float>
<float>
161
6781754.41
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
@@ -306,6 +306,10 @@
<key>
<string>
variation/service_module/slapos_reservation_fee/1
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
variation/service_module/slapos_reservation_fee/3
</string>
</key>
<value>
<int>
2
</int>
</value>
</item>
<item>
<key>
<string>
variation/service_module/slapos_reservation_fee/default
</string>
</key>
<value>
<int>
1
</int>
</value>
...
...
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/4/path_2.xml
0 → 100644
View file @
a14a847e
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Sale Supply Cell"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_identity_criterion
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
_local_properties
</string>
</key>
<value>
<tuple>
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
base_id
</string>
</value>
</item>
<item>
<key>
<string>
type
</string>
</key>
<value>
<string>
string
</string>
</value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key>
<string>
_range_criterion
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
base_id
</string>
</key>
<value>
<string>
path
</string>
</value>
</item>
<item>
<key>
<string>
base_price
</string>
</key>
<value>
<float>
65.0
</float>
</value>
</item>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
variation/service_module/slapos_reservation_fee/3
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
criterion_property
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
path_2
</string>
</value>
</item>
<item>
<key>
<string>
mapped_value_property_list
</string>
</key>
<value>
<tuple>
<string>
base_price
</string>
<string>
base_unit_price
</string>
<string>
slice_base_price
</string>
<string>
slice_quantity_range
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
membership_criterion_base_category
</string>
</key>
<value>
<tuple>
<string>
variation
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
membership_criterion_category
</string>
</key>
<value>
<tuple>
<string>
variation/service_module/slapos_reservation_fee/3
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
multimembership_criterion_base_category
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Sale Supply Cell
</string>
</value>
</item>
<item>
<key>
<string>
test_method_id
</string>
</key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_accounting/PathTemplateItem/service_module/slapos_reservation_fee/3.xml
0 → 100644
View file @
a14a847e
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Service Individual Variation"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
default_reference
</string>
</key>
<value>
<string>
VPVPS
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
3
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Service Individual Variation
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
vpVPS Reservation Fee
</string>
</value>
</item>
<item>
<key>
<string>
variation_base_category_list
</string>
</key>
<value>
<tuple>
<string>
variation
</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
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