Changes related to #164

Author: null93

src/app/code/community/JetRails/Cloudflare/Model/Adminhtml/Api/Firewall/FirewallRules.php

@@ -17,6 +17,19 @@ class JetRails_Cloudflare_Model_Adminhtml_Api_Firewall_FirewallRules
 		 */
 		protected $_endpoint = "firewall/rules";
 
+		/**
+		 * This method wraps the PageGetter class and adds the results of the
+		 * usage endpoint.
+		 * @param   integer      page                Current page number to get
+		 * @param   array        previous            Collection of prev results
+		 * @return  stdClass                         CF response to request
+		 */
+		public function getValue ( $page = 1, $previous = array () ) {
+			$result = parent::getValue ( $page, $previous );
+			$result->usage = $this->usage ();
+			return $result;
+		}
+
 		/**
 		 * This method takes in an firewall rule id and asks the Cloudflare API to
 		 * delete the rule that corresponds to that id.
@@ -109,4 +122,27 @@ public function update ( $id, $name, $filterId, $filterExpression, $action, $pri
 			return $filter;
 		}
 
+		/**
+		 * This method asks the Cloudflare API for the usage information as it
+		 * pertains to firewall rules. It then only returns the allocation for
+		 * the zone scope.
+		 * @return  stdClass                         CF response to request
+		 */
+		public function usage () {
+			$endpoint = $this->getEndpoint ("firewall/rules/usage");
+			$api = Mage::getModel ("cloudflare/api_request");
+			$api->setType ( $api::REQUEST_GET );
+			$result = $api->resolve ( $endpoint );
+			if ( isset ( $result->result ) ) {
+				$result = array_filter ( $result->result, function ( $i ) {
+					return $i->scope === "zone";
+				});
+				return $result [ 0 ];
+			}
+			return [
+				"used" => 0,
+				"max" => 0
+			];
+		}
+
 	}

src/app/design/adminhtml/base/default/template/cloudflare/firewall/firewall_rules.phtml

@@ -13,7 +13,7 @@
 		<div class="wrapper_left no_padding_bottom" >
 			<span class="section_title" >Firewall Rules</span>
 			<p>Control incoming traffic to your zone by filtering requests based on location, IP address, user agent, URI, and more.</p>
-			<p>You have used 0 of 1,000 active Firewall rules.</p>
+			<p>You have used <span class="usage-used" >0</span> of <span class="usage-total" >0</span> active Firewall rules.</p>
 		</div>
 		<div class="wrapper_right" >
 			<div>

src/skin/adminhtml/base/default/js/cloudflare/firewall/firewall_rules.js

@@ -141,6 +141,10 @@ function populateResult ( section ) {
 }
 
 $(document).on ( "cloudflare.firewall.firewall_rules.initialize", function ( event, data ) {
+	let used = data.response.usage.used
+	let available = data.response.usage.max
+	$(data.section).find (".usage-used").text ( used )
+	$(data.section).find (".usage-total").text ( available )
 	$(data.section).data ( "result", data.response.result )
 	populateResult ( data.section )
 	$(data.section).removeClass ("loading")