From fce6116d604626ba1bbe4347acc543b50b4c10ee Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Wed, 25 Jun 2014 20:01:14 -0400 Subject: [PATCH 1/2] 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 @@ -
-

Account Details

+
+

Billing Account Details

errorMessage)) {?>
errorMessage ?>
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 @@ -
+
+

Invoices

+

and look for the \"Checkout\" button.")?>

+ + + + + + + invoices as $invoice) {?> - + + + + + + - + +
Date IssuedDue DateLinkStatus
">View Invoice">
\ 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 From b36967a6905b3a99042ff617cbc7bc10120e0ac6 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Wed, 25 Jun 2014 20:32:41 -0400 Subject: [PATCH 2/2] Nicer auto-styling for the Billing Details form --- .../application/forms/BillingClient.php | 1 + .../views/scripts/billing/client.phtml | 5 +++++ airtime_mvc/public/css/billing.css | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/airtime_mvc/application/forms/BillingClient.php b/airtime_mvc/application/forms/BillingClient.php index 716bc36fd..5e6a2c252 100644 --- a/airtime_mvc/application/forms/BillingClient.php +++ b/airtime_mvc/application/forms/BillingClient.php @@ -8,6 +8,7 @@ class Application_Form_BillingClient extends Zend_Form /*$this->setDecorators(array( array('ViewScript', array('viewScript' => 'form/billing-purchase.phtml'))));*/ $client = BillingController::getClientDetails(); + $this->setAttrib("id", "clientdetails_form"); $notEmptyValidator = Application_Form_Helper_ValidationTypes::overrideNotEmptyValidator(); $emailValidator = Application_Form_Helper_ValidationTypes::overrideEmailAddressValidator(); diff --git a/airtime_mvc/application/views/scripts/billing/client.phtml b/airtime_mvc/application/views/scripts/billing/client.phtml index 5b89d280b..e57fb140b 100644 --- a/airtime_mvc/application/views/scripts/billing/client.phtml +++ b/airtime_mvc/application/views/scripts/billing/client.phtml @@ -1,3 +1,8 @@ +form->getElement("submit")->setAttrib("class", "right-align"); +$this->form->getElement("country")->setAttrib("class", "right-align"); +$this->form->getElement("securityqid")->setAttrib("class", "right-align"); +?>

Billing Account Details

errorMessage)) {?> diff --git a/airtime_mvc/public/css/billing.css b/airtime_mvc/public/css/billing.css index 9aaada3e3..88498a88f 100644 --- a/airtime_mvc/public/css/billing.css +++ b/airtime_mvc/public/css/billing.css @@ -168,4 +168,22 @@ #invoices_table .unpaid { color: #ff0000; +} + +/** This form is the separate one on the Billing Account Details page (BillingClient.php) */ +#clientdetails_form dt { + float: left; + clear: both; + width: 50%; + margin-bottom: 10px; +} +#clientdetails_form dd { + float: left; + margin-left: 0px; + margin-bottom: 10px; +} +#clientdetails_form .right-align +{ + /*text-align: right;*/ + width: 100%; } \ No newline at end of file