From fce6116d604626ba1bbe4347acc543b50b4c10ee Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Wed, 25 Jun 2014 20:01:14 -0400
Subject: [PATCH] Made the invoices view nice!

---
 .../controllers/BillingController.php         |  8 +++++
 .../views/scripts/billing/client.phtml        |  4 +--
 .../views/scripts/billing/invoices.phtml      | 23 ++++++++++---
 airtime_mvc/public/css/billing.css            | 33 +++++++++++++++++++
 4 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/airtime_mvc/application/controllers/BillingController.php b/airtime_mvc/application/controllers/BillingController.php
index e8aeea0f5..e5049d449 100644
--- a/airtime_mvc/application/controllers/BillingController.php
+++ b/airtime_mvc/application/controllers/BillingController.php
@@ -174,6 +174,10 @@ class BillingController extends Zend_Controller_Action {
 
     public function clientAction()
     {
+        $CC_CONFIG = Config::getConfig();
+        $baseUrl = Application_Common_OsPath::getBaseDir();
+        $this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']);
+        
         $request = $this->getRequest();
         $form = new Application_Form_BillingClient();
         BillingController::ensureClientIdIsValid();
@@ -220,6 +224,10 @@ class BillingController extends Zend_Controller_Action {
 
     public function invoicesAction()
     {
+        $CC_CONFIG = Config::getConfig();
+        $baseUrl = Application_Common_OsPath::getBaseDir();
+        $this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']);
+        
         BillingController::ensureClientIdIsValid();
         $credentials = self::getAPICredentials();
         
diff --git a/airtime_mvc/application/views/scripts/billing/client.phtml b/airtime_mvc/application/views/scripts/billing/client.phtml
index a38b8f685..5b89d280b 100644
--- a/airtime_mvc/application/views/scripts/billing/client.phtml
+++ b/airtime_mvc/application/views/scripts/billing/client.phtml
@@ -1,5 +1,5 @@
-<div class="ui-widget ui-widget-content block-shadow clearfix padded-strong">
-<H2>Account Details</H2>
+<div class="ui-widget ui-widget-content block-shadow clearfix padded-strong billing-panel">
+<H2>Billing Account Details</H2>
 <?php if (isset($this->errorMessage)) {?>
 <div class="errors"><?php echo $this->errorMessage ?></div>
 <?php } else if (isset($this->successMessage)) {?>
diff --git a/airtime_mvc/application/views/scripts/billing/invoices.phtml b/airtime_mvc/application/views/scripts/billing/invoices.phtml
index ed1f13a74..d143441cc 100644
--- a/airtime_mvc/application/views/scripts/billing/invoices.phtml
+++ b/airtime_mvc/application/views/scripts/billing/invoices.phtml
@@ -1,9 +1,22 @@
-<div class="ui-widget ui-widget-content block-shadow clearfix padded-strong">
+<div class="ui-widget ui-widget-content block-shadow clearfix padded-strong billing-panel">
+<H2>Invoices</H2>
+<p style="text-align: center;"><?=_("Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button.")?></p>
+<table id="invoices_table">
+    <tr class="header">
+        <th>Date Issued</th>
+        <th>Due Date</th>
+        <th>Link</th>
+        <th>Status</th>
+    </tr>
 <?php
 foreach ($this->invoices as $invoice) {?>
-    <div>
-        <a href="invoice?invoiceid=<?php echo $invoice["id"]?>">View Invoice</a>
-    </div>
+    <tr>
+        <td><?php echo $invoice["date"]?></td>
+        <td><?php echo $invoice["duedate"]?></td>
+        <td><a href="invoice?invoiceid=<?php echo $invoice["id"]?>">View Invoice</a></td>
+        <td class="<?=$invoice["status"]==="Unpaid" ? "unpaid" : "";?>"><?php echo $invoice["status"]?></td>
+    </tr>
     
-<?php }?>
+<?php };?>
+</table>
 </div>
\ No newline at end of file
diff --git a/airtime_mvc/public/css/billing.css b/airtime_mvc/public/css/billing.css
index c34e8ad49..9aaada3e3 100644
--- a/airtime_mvc/public/css/billing.css
+++ b/airtime_mvc/public/css/billing.css
@@ -135,4 +135,37 @@
 #upgrade-downgrade input[type=submit]
 {
 	float: right;
+}
+
+#invoices_table
+{
+	margin: 0 auto;
+    border-spacing: 0px;
+    border-collapse: separate;
+    border: 1px solid #777;
+    /*background-color: #555;*/
+    table-layout: fixed;
+    margin-top: 20px;
+    margin-bottom: 35px;
+    background: #ccc;
+}
+
+#invoices_table tbody tr th
+{
+	border: 0px;
+}
+
+#invoices_table .header
+{
+    box-shadow: 0px 2px 2px rgba(0,0,0,0.5);
+}
+
+#invoices_table tr
+{
+    border: 1px solid #555;
+}
+
+#invoices_table .unpaid
+{
+	color: #ff0000;
 }
\ No newline at end of file