JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,498 Commits 5 Branches 0 Tags 94 MiB
7161506b68
Commit Graph

113 Commits

Author SHA1 Message Date
Kaloyan Raev
49571f1a23 satellite/payments: all invoice commands require period 
To avoid including multiple months in a single invoice, we need all
inspector's invoice commands to run in for specific period.

See https://storjlabs.atlassian.net/browse/USR-725

Change-Id: I3637dc189234f02350daca8d897c21765762ea55
 2020-05-14 11:50:19 +00:00
Kaloyan Raev
073f9ed499 satellite/payments: deduct stripe discount first 
We have 3 types of discounts:
1) Promotional credits/coupons
2) Bonus from depositing STORJ tokens
3) Stripe discounts (e.g. 100% off for Storjlings, 30% off for Early
Adopters, etc.)

So far the discounts were applied in the above order. But because the
Stripe discount is applied on all of the project usage fees, this could
sometimes lead to negative total in the invoice. Especially, if the
Stripe discount is 100% or all of the project fees are covered by
coupons and bonus.

To resolve this issue, before applying promotional coupons and deposit
bonuses, the Stripe discount will be applied first to the project fees.

Change-Id: I5dcbec04ec3a04e7f76b11e0a228ccb3195f2db0
 2020-05-12 09:26:27 +00:00
Kaloyan Raev
b397dfc82d satellite/payments: better labels for discounts in invoices 
Before:
- Discount from coupon: Promotional credits (limited time -
2 billing periods)
- Discount from credits

After:
- Promotional credits (limited time - 2 billing periods)
- Credits from STORJ deposit bonus

This way we don't mix the terms coupon and credit. And it is clearer
when the credit comes from a deposit bonus.

Change-Id: I4bba76a5501147f9de399eac41c4f157d6bda032
 2020-05-11 16:12:04 +00:00
Kaloyan Raev
12fa505692 satellite/payments: fix invoice amount in billing history 
The billing history currently shows the Total amount from the Stripe
invoice. In fact, this value is just the amount deducted from the Stripe
balance. It does not reflect any deduction from promotional coupon or
bonus credits.

This patch adds the deducted amount form the promotional coupons and
bonus credits to the displayed amount in billing history. This way
customers have better understading of the total amount deducted from
their account balance on the satellite.

Change-Id: Ibd7f611a6cea0143a3059f39dd1d9ef21c264d8c
 2020-05-08 11:43:41 +00:00
Egon Elbre
70fe974a95 satellite/payments/stripecoinpayments: fix test flakyness 
CustomerRepositoryList relied on created at time for the output sorting,
however the granularity of the timer may cause multiple customers
having the same "created at" time.

Add a sleep so that every customer does get a unique time.

Change-Id: If2923174f304fa5f41260d500f6139e3fa7c3ba5
 2020-04-29 12:06:35 +00:00
Egon Elbre
6492b13d81 all: remove old uuid 
Change-Id: I3a137f73456f010c37d3933dbe12cbbb840b809f
 2020-04-02 19:30:36 +03:00
Egon Elbre
0a69da4ff1 all: switch to storj.io/common/uuid 
Change-Id: I178a0a8dac691e57bce317b91411292fb3c40c9f
 2020-03-31 19:16:41 +03:00
Stefan Benten
52590197c2
satellite/payments: More Cleanup and Satellite command to ensure we have stripe customers (#3805) 2020-03-16 20:34:15 +01:00
Stefan Benten
bd603c0751
satellite/payments: Improve Invoice Generation (#3800) 2020-03-13 17:07:39 +01:00
Bill Thorp
94c11c5212 satellite: remove some unnecessary UTC() calls 
Fixes some easy cases of extraneous UTC() calls

Change-Id: I3f4c287ae622a455b9a492a8892a699e0710ca9a
 2020-03-13 13:49:44 +00:00
VitaliiShpital
56c33f5193 satellite/payments: project charges api extended to show usage and period 
Change-Id: I471def779d8b2a896fc43a692029233a2cd839b0
 2020-03-10 18:39:05 +02:00
Qweder93
dca6fcbe28 satellite/payments/stripecoinpayments: credits added to invoice calculations 
Change-Id: I6d3f5244a46f8945d2703af39ced333940db34e9
 2020-02-24 16:48:27 +00:00
Yaroslav Vorobiov
ea970e45ce satellite/payments: remove unused code 
Change-Id: I2daaf5089bec000a6e995b8396d55528256aca6c
 2020-02-20 16:04:19 +02:00
Yaroslav Vorobiov
827da1ae2b satellite/payments: fail when trying to consume consumed transactions 
Change-Id: Ibb2528079ec917b7611b87a02972fb771937a025
 2020-02-13 19:52:55 +00:00
Yaroslav Vorobiov
da58dc4a7a satellite/payments: increase batch size for transactions and account balance loops 
Change-Id: I44712d26abde6c405ced35f103d1581423092737
 2020-02-13 19:37:22 +00:00
Yaroslav Vorobiov
6c6e2eb8b3 satellite/peyments: fix potential infinite loop in update account balance cycle 
Change-Id: Ia4f9abe50b771ff6406e3a1ae76166e046bf63e5
 2020-02-13 19:20:32 +00:00
Qweder93
eeaaa8aa98 satellite/payments/stripecoinpayments: added ApplyInvoiceCredits 
Change-Id: I7ed9d8397c0aa59d4ce0d40d1e50d13929e0fe5f
 2020-02-12 20:06:08 +02:00
Yaroslav Vorobiov
bd9cebda5b satellite/payments: fix transaction list pagination 
Change-Id: I533f637e5cb12b47d7f7248f8bf7de93bd8be000
 2020-02-11 16:22:53 +02:00
Yaroslav Vorobiov
984ed26737 satellite/payments: fix invoice project records pagination 
Change-Id: I68de69de78256280a6bbf0b744963b9c8c813007
 2020-02-11 14:31:55 +02:00
Qweder93
dc075eaa96 satellite/payments : deposit bonuses (credits) added 
Change-Id: Ib151bbb9b02d655fa619c53bfbc04ed6f3bb39e0
 2020-02-11 11:11:42 +00:00
Jeff Wendling
7999d24f81 all: use monkit v3 
this commit updates our monkit dependency to the v3 version where
it outputs in an influx style. this makes discovery much easier
as many tools are built to look at it this way.

graphite and rothko will suffer some due to no longer being a tree
based on dots. hopefully time will exist to update rothko to
index based on the new metric format.

it adds an influx output for the statreceiver so that we can
write to influxdb v1 or v2 directly.

Change-Id: Iae9f9494a6d29cfbd1f932a5e71a891b490415ff
 2020-02-05 23:53:17 +00:00
Egon Elbre
8dea4f52db satellite: add control panel 
Change-Id: Id48246e9bcd4c6ec643277fe740937b2e42ad85b
 2020-01-30 08:06:43 -05:00
crawter
9bb7ceb651 satellite\payments: amount for coupons increased 
Change-Id: I1f357b76361e6e3e50bbe4ee66a8edb6ff033f36
 2020-01-29 22:08:54 +02:00
crawter
f4667426b5 satellite\payments: project limits for coupons increased 
Change-Id: I51eb47eb635fd096348befd39b7efbe3ce8982d6
 2020-01-29 19:34:50 +02:00
crawter
e549e32976 satellite/payments: fix promotional coupons 
Change-Id: Ib8b7e38f2cb07085655448264f281fd7fc7867dd
 2020-01-29 16:40:43 +02:00
Yaroslav Vorobiov
6b72bf92ce satellite/payments: convert egress price to per byte basis 
Change-Id: Ia3a07d0afa5d9d55871996a1d2117b4ec290ce8f
 2020-01-29 00:06:01 -05:00
Yaroslav Vorobiov
083b396c16 satellite/payments: allow floating point numbers for pricing 
Change-Id: I78b60134cf043746efef5371b761939a10f75aaf
 2020-01-28 22:52:13 -05:00
Egon Elbre
f3b4bf2b7c satellite/satellitedb/satellitedbtest: pass ctx as an argument 
ctx is created in most tests, instead pass in as argument
to reduce code duplication.

Change-Id: I466c51c008392001129c8b007c9d6b3619935ac4
 2020-01-20 16:35:42 +02:00
Egon Elbre
ba2fce814c satellite/satellitedb: better coupons query 
Change-Id: Iaf180b99c57443550418b46dfd8300f921e93bec
 2020-01-20 15:05:10 +02:00
crawter
c4cbc6ff2f satellite/payments: promotional coupons generation functional added 
Change-Id: Ie0df256503114ca377d81bf7c8b26cc90a1f5b26
 2020-01-20 11:01:55 +00:00
Yaroslav
d8368d0b30 satellite/payments: coinpayments add completed status, treat received status as pending, add balance for completed transactions only 
Change-Id: I20494bdddfda6d4f37ba2c5b6f7955cd29a6d798
 2020-01-17 17:26:34 +00:00
Bill Thorp
0c660f5490 satellite/payments: fixed test so that it passes on non-UTC systems, simplified date comparison 
Change-Id: I5e1b31efc148701b9d4918bf9870fb72fbca75ac
 2020-01-17 14:14:13 +00:00
crawter
41d5e86306 satellite/payments: coupon addition removed 
Change-Id: I92781d9133603fdefd58b19a6f0ac6b1c6df3ac6
 2020-01-14 16:24:48 +00:00
crawter
a57ce18f58 satellite/payments: coupons, coupons usage, invoice generation with pricing model applied 
Change-Id: Ic5d5a2fc116388647efe46896cfccc2038c77537
 2020-01-14 12:45:00 +00:00
VitaliiShpital
a4e5c18877 satellite/payments: mock methods added to endpoint to match pb PaymentsServer 
Change-Id: Ic8ff44cbe0b2368021a5d83cf86ce0dd2b670fd7
 2020-01-09 14:30:21 +02:00
Yaroslav
389567fc9e satellite/console: add credit card charges to billing history 
Change-Id: I82a08c42c01086dc7fb9508da5c6c0baa2438124
 2020-01-03 17:34:59 +02:00
Egon Elbre
6615ecc9b6 common: separate repository 
Change-Id: Ibb89c42060450e3839481a7e495bbe3ad940610a
 2019-12-27 14:11:15 +02:00
Yaroslav Vorobiov
f659d98a4d
satellite/payments/tokens: return checkout url on new deposit (#3696) 2019-12-12 15:09:19 +02:00
Yehor Butko
756b9b9e2b
satellite/payments: coupons and coupon usage (#3648) 2019-11-26 19:58:51 +02:00
Yaroslav Vorobiov
87c7a2ff42
satellite/payments: token deposit accept cents (#3628) 2019-11-21 16:25:37 +02:00
Yaroslav Vorobiov
c72c443564
satellite/payments: add cents values to transaction info (#3614) 2019-11-21 15:23:16 +02:00
Yehor Butko
9ca547acb1
web/satellite: project charges (#3611) 2019-11-20 15:46:22 +02:00
Yaroslav Vorobiov
3d94c3fc99
satellite/payments: stripe client use satellite logger, give credits when applying transaction to balance (#3603) 2019-11-19 19:56:18 +02:00
Nikolai Siedov
3fe518d547
satellite: added ability to inject stripe public key post build (#3560) 2019-11-18 13:38:43 +02:00
Yaroslav Vorobiov
a36e9b504e satellite/payments: switch to using STORJ tokens (#3582) 2019-11-15 17:27:13 +02:00
Yaroslav Vorobiov
53c6741ba6
satellite/payments: add API for retrieving conversion ratio, convert tokens to USD before applying to balance (#3530) 2019-11-15 16:59:39 +02:00
Yehor Butko
a8e4e9cb03
satellite/payments: project usage charges (#3512) 2019-11-15 16:27:44 +02:00
Egon Elbre
ee6c1cac8a
private: rename internal to private (#3573) 2019-11-14 21:46:15 +02:00
Yaroslav Vorobiov
36311a3a05
satellite/console: add token deposit API, populate billing history with transactions (#3500) 2019-11-12 13:14:34 +02:00
Yaroslav Vorobiov
35edc2bcc3 satellite/payments: invoice creation (#3468) 2019-11-05 15:16:02 +02:00
Yehor Butko
761cec5ea3
satellite/payments: archview comments updated (#3464) 2019-11-04 14:30:07 +02:00
Yehor Butko
5cb46d2ce3
satellite/payments: mock payment service created, api calls from frontend returned (#3448) 2019-11-04 12:54:25 +02:00
Yehor Butko
ecde507e4e
satellite/payments: list invoices (#3389) 2019-10-31 18:56:54 +02:00
Yaroslav Vorobiov
30a3205745
satellite/payments: update account balance (#3379) 2019-10-29 18:04:34 +02:00
Yehor Butko
e82245e10e
satellite/payments: credit card selection (#3304) 2019-10-23 20:33:24 +03:00
Yaroslav Vorobiov
1a304f5ef9
satellite/payments: add payments loop, update pending transactions (#3318) 2019-10-23 15:04:54 +03:00
Yehor Butko
26cc625dc6
satellite/console: payments api (#3297) 2019-10-17 17:42:18 +03:00
Yaroslav Vorobiov
24e72f35d3
satellite/payments: token deposit (#3283) 2019-10-17 17:04:50 +03:00
Yehor Butko
a5f4bbee22
satellite/payments: dbx scheme renamed, userID placed on Account level (#3281) 2019-10-15 21:05:45 +03:00
Yehor Butko
4d43b67ff9
add credit card to payment account (#3279) 2019-10-15 17:50:28 +03:00
Yehor Butko
501816770b
satellite/payments: receive credit cards (#3249) 2019-10-15 14:23:54 +03:00
Yehor Butko
451909b3ec
satellite/payments: account balance (#3242) 2019-10-11 18:00:35 +03:00
Yehor Butko
0cc23add5b
satellite/payments - payment account setup (#3187) 2019-10-10 20:12:23 +03:00