Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SAAS-973: Airtime Billing page - Add support for August promotion plans 

Front-end changes to price grid, and plan title
This commit is contained in:
drigato 2015-07-30 12:53:37 -04:00
parent d9e2ba0ed3
commit bccba2f9d5
3 changed files with 62 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
airtime_mvc/application/common/Billing.php
View File

@ -423,8 +423,9 @@ class Billing
return true;
}
// if client is currently on monthly or old plan AND (upgrading OR upgrading/downgrading to annual plan), YES
if ($currentPlanBillingCycle == "monthly" || $currentPlanBillingCycle == "free account") {
// if client is currently on monthly or annually or old plan AND (upgrading OR upgrading/downgrading to annual plan), YES
if ($currentPlanBillingCycle == "monthly" || $currentPlanBillingCycle == "free account"
|| $currentPlanBillingCycle == "annually") {
// is the client changing billing cycle to annual?
if ($newProductBillingCycle == "annually") {
return true;

49
airtime_mvc/application/views/scripts/billing/upgrade.phtml
View File

@ -138,6 +138,8 @@ function promoEligibilityCheck()
.success(function(data) {
if (data.result == true) {
$("#promo-plan-eligible").show();
} else if ($("#promo-plan-eligible").is(":visible")) {
$("#promo-plan-eligible").hide();
}
});
}
@ -197,10 +199,10 @@ $(document).ready(function() {
<div class="pricing-grid">
<table>
<tr>
<th>Hobbyist</th>
<th>Starter</th>
<th>Plus</th>
<th>Premium</th>
<th>Awesome Hobbyist</th>
<th>Awesome Starter</th>
<th>Awesome Plus</th>
<th>Awesome Premium</th>
</tr>
<tr>
<td>1 Stream
@ -222,24 +224,40 @@ $(document).ready(function() {
<td>64kbps, 128kbps, and 196kbps Stream Quality
</td>
</tr>
<tr>
<td>5 Listeners
<tr class="august-promo">
<td>
<span>5 Listeners</span><br>
<div>10 Listeners</div>
</td>
<td>40 Listeners per stream
<td>
<span>40 Listeners per stream</span><br>
<div>80 Listeners per stream</div>
</td>
<td>100 Listeners per stream
<td>
<span>100 Listeners per stream</span><br>
<div>200 Listeners per stream</div>
</td>
<td>500 Listeners per stream
<td>
<span>500 Listeners per stream</span><br>
<div>1000 Listeners per stream</div>
</td>
</tr>
<tr>
<td>2GB Storage
<tr class="august-promo">
<td>
<span>2GB Storage</span><br>
<div>4GB Storage</div>
</td>
<td>5GB Storage
<td>
<span>5GB Storage</span><br>
<div>10GB Storage</div>
</td>
<td>30GB Storage
<td>
<span>30GB Storage</span><br>
<div>60GB Storage</div>
</td>
<td>150GB Storage
<td>
<span>150GB Storage</span><br>
<div>300GB Storage</div>
</td>
</tr>
<tr>
@ -298,8 +316,9 @@ echo($currentProduct["name"]);
<div id="billingcycle_disclaimer">
Save 15% on annual plans (Hobbyist plan excluded).
</div>
<div class="clearfix"></div>
<div id="promo-plan-eligible" style="display:none;">
Congratulations, you are eligible for our Awesome Promotional Plan!
Congratulations, you are eligible for an Awesome Promotional Plan!
</div>
<div class="clearfix"></div>
<div id="subtotal_box">

28
airtime_mvc/public/css/billing.css
View File

@ -56,8 +56,8 @@
border-spacing: 0px;
border-collapse: separate;
border: 1px solid #777;
width: 600px;
margin-left: -100px;
width: 680px;
margin-left: -140px;
/*background-color: #555;*/
table-layout: fixed;
margin-top: 20px;
@ -65,6 +65,19 @@
box-shadow: 0px 5px 5px rgba(0,0,0,0.5);
}
.pricing-grid .august-promo div {
display: inline-block;
background-color: #ff611f;
padding: 3px 5px;
border-radius: 5px;
margin-left: -5px;
color: #ffffff;
}
.pricing-grid .august-promo span {
text-decoration: line-through;
}
.pricing-grid td, .pricing-grid th
{
border-bottom: 1px solid #999;
@ -223,4 +236,13 @@
{
/*text-align: right;*/
width: 100%;
}
}
#promo-plan-eligible {
margin-top: 10px;
font-size: 13px;
background-color: #ff611f;
padding: 3px 5px;
border-radius: 5px;
color: #ffffff;
}