Skip to content

Paymeter billing #248

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

Merged
web3rover merged 2 commits into from
Dec 18, 2018
Merged

Paymeter billing #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9662af1
Fixed billing bugs
web3rover Dec 18, 2018
f56195b
Merge branch 'master' into paymeter_billing
web3rover Dec 18, 2018
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
52 changes: 30 additions & 22 deletions imports/api/paymeter/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,11 +656,12 @@ function isUserSubscribedToPaymeter(userId) {
function paymeter_getAndResetUserBill(userId) {
if(userId) {

let paymeter_userData = Paymeter.find({userId: userId})
let paymeter_userData = PaymeterCollection.findOne({userId: userId})

if(paymeter_userData) {
if(paymeter_userData.subscribed) {
let bill = paymeter_userData.bill || '0';
let nextMonthMin = '299.00'

if(paymeter_userData.unsubscribeNextMonth) {
let UserWallets = Wallets.find({
Expand Down Expand Up @@ -689,6 +690,8 @@ function paymeter_getAndResetUserBill(userId) {
unsubscribeNextMonth: false,
}
})

nextMonthMin = '0.00'
}

if((new BigNumber(bill)).lt(paymeter_userData.minimumFeeThisMonth)) {
Expand All @@ -700,7 +703,7 @@ function paymeter_getAndResetUserBill(userId) {
}, {
$set: {
bill: '0',
minimumFeeThisMonth: '299'
minimumFeeThisMonth: nextMonthMin
}
})

Expand Down Expand Up @@ -746,22 +749,36 @@ Meteor.methods({

if(isPaymentMethodVerified) {

let paymeter_userData = Paymeter.find({userId: Meteor.userId()})
let paymeter_userData = PaymeterCollection.findOne({userId: Meteor.userId()})

if(paymeter_userData.unsubscribeNextMonth) {
PaymeterCollection.upsert({
userId: Meteor.userId()
}, {
$set: {
subscribed: true,
unsubscribeNextMonth: false
}
})
if(paymeter_userData) {
if(paymeter_userData.unsubscribeNextMonth) {
PaymeterCollection.upsert({
userId: Meteor.userId()
}, {
$set: {
subscribed: true,
unsubscribeNextMonth: false
}
})
} else {
let totalDaysThisMonth = helpers.daysInThisMonth()
let perDayCost = (new BigNumber(299)).dividedBy(totalDaysThisMonth)
let minimumFeeThisMonth = (new BigNumber(perDayCost)).times(helpers.getRemanningDays() + 1) //including today
PaymeterCollection.upsert({
userId: Meteor.userId()
}, {
$set: {
subscribed: true,
unsubscribeNextMonth: false,
minimumFeeThisMonth: minimumFeeThisMonth.toString()
}
})
}
} else {
let totalDaysThisMonth = helpers.daysInThisMonth()
let perDayCost = (new BigNumber(299)).dividedBy(totalDaysThisMonth)
let minimumFeeThisMonth = (new BigNumber(perDayCost)).times(helpers.getRemanningDays() + 1) //including today

PaymeterCollection.upsert({
userId: Meteor.userId()
}, {
Expand All @@ -772,15 +789,6 @@ Meteor.methods({
}
})
}

PaymeterCollection.upsert({
userId: Meteor.userId()
}, {
$set: {
subscribed: true,
unsubscribeNextMonth: false
}
})
} else {
throw new Meteor.Error('Please add card', 'Please add card');
}
Expand Down
1 change: 1 addition & 0 deletions imports/modules/helpers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,5 +219,6 @@ export default {
time.setMonth(date.getMonth() + 1);
time.setDate(0);
var days =time.getDate() > date.getDate() ? time.getDate() - date.getDate() : 0;
return days;
}
}
12 changes: 8 additions & 4 deletions imports/ui/pages/paymeter/Paymeter.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,15 +583,19 @@ class PaymeterComponent extends Component {

</h3>
</div>*/}
<div className="col-md-7 clearfix sm-p-b-15 d-flex flex-column justify-content-center">
<div className="col-md-6 clearfix sm-p-b-15 d-flex flex-column justify-content-center">
<h5 className="font-montserrat all-caps small no-margin hint-text bold">Minimum Fee This Month</h5>
<h3 className="no-margin">
{this.props.paymeterUserData &&
<span>{'$' + (this.props.paymeterUserData.minimumFeeThisMonth || '0.00')}</span>
<span>${helpers.getFlooredFixed(parseFloat((this.props.paymeterUserData.minimumFeeThisMonth || '0.00')), 2)}</span>
}

{!this.props.paymeterUserData &&
<span>$0.00</span>
}
</h3>
</div>
<div className="col-md-5 text-right bg-master-darker col-sm-height padding-15 d-flex flex-column justify-content-center align-items-end">
<div className="col-md-6 text-right bg-master-darker col-sm-height padding-15 d-flex flex-column justify-content-center align-items-end">
<h5 className="font-montserrat all-caps small no-margin hint-text text-white bold">Total Deposit Fee This Month</h5>
<h1 className="no-margin text-white">
<span>$</span>
Expand All @@ -600,7 +604,7 @@ class PaymeterComponent extends Component {
<span>
<span>
{this.props.paymeterUserData.bill &&
<span>{this.props.paymeterUserData.bill}</span>
<span>{helpers.getFlooredFixed(parseFloat(this.props.paymeterUserData.bill), 2)}</span>
}
</span>
<span>
Expand Down
8 changes: 4 additions & 4 deletions imports/ui/pages/paymeter/Paymeter.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
}
}

h5 {
word-break: break-all;
}

.create-wallet-btn {
margin-right: 0px !important;
margin-left: 0px !important;
Expand All @@ -36,4 +32,8 @@
.no-hidden-text {
white-space: normal !important
}

.paymeter h5 {
word-break: break-word;
}
}