From 39146d578ae006449d1a72c08fb2e539c5e2954b Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Tue, 14 Jan 2020 17:11:06 +0300
Subject: [PATCH] feat(admin-plugin): update for API's #349

---
 .../admin/app/Controllers/ApiController.php   |  4 ++--
 .../templates/system/api/delivery/add.html    | 18 ------------------
 .../templates/system/api/delivery/edit.html   | 19 +------------------
 .../templates/system/api/delivery/index.html  |  2 +-
 4 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/site/plugins/admin/app/Controllers/ApiController.php b/site/plugins/admin/app/Controllers/ApiController.php
index ad30310f..1cd0521f 100644
--- a/site/plugins/admin/app/Controllers/ApiController.php
+++ b/site/plugins/admin/app/Controllers/ApiController.php
@@ -153,7 +153,7 @@ class ApiController extends Controller
                     'title' => $post_data['title'],
                     'icon' => $post_data['icon'],
                     'limit_calls' => (int) $post_data['limit_calls'],
-                    'limit_rate' => $post_data['limit_rate'],
+                    'calls' => (int) 0,
                     'state' => $post_data['state'],
                     'uuid' => $uuid,
                     'created_by' => Session::get('uuid'),
@@ -236,7 +236,7 @@ class ApiController extends Controller
                     'title' => $post_data['title'],
                     'icon' => $post_data['icon'],
                     'limit_calls' => (int) $post_data['limit_calls'],
-                    'limit_rate' => $post_data['limit_rate'],
+                    'calls' => (int) $post_data['calls'],
                     'state' => $post_data['state'],
                     'uuid' => $post_data['uuid'],
                     'created_by' => $post_data['created_by'],
diff --git a/site/plugins/admin/templates/system/api/delivery/add.html b/site/plugins/admin/templates/system/api/delivery/add.html
index 04bd7842..9e2af3b1 100644
--- a/site/plugins/admin/templates/system/api/delivery/add.html
+++ b/site/plugins/admin/templates/system/api/delivery/add.html
@@ -16,24 +16,6 @@
                 <input type="text" id="limit" name="limit_calls" value="0" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_api_calls_empty_input') }}">
                 <small class="form-text text-muted">{{ tr('admin_help_text_for_api_calls_limit_label') }}</small>
             </div>
-            <div class="form-group">
-                <div class="custom-control custom-radio custom-control-inline">
-                    <input type="radio" id="customRadioInline1" value="total" name="limit_rate" class="custom-control-input" checked>
-                    <label class="custom-control-label" for="customRadioInline1">Total</label>
-                </div>
-                <div class="custom-control custom-radio custom-control-inline">
-                    <input type="radio" id="customRadioInline2" value="year" name="limit_rate" class="custom-control-input">
-                    <label class="custom-control-label" for="customRadioInline2">Year</label>
-                </div>
-                <div class="custom-control custom-radio custom-control-inline">
-                    <input type="radio" id="customRadioInline3" value="month" name="limit_rate" class="custom-control-input">
-                    <label class="custom-control-label" for="customRadioInline3">Month</label>
-                </div>
-                <div class="custom-control custom-radio custom-control-inline">
-                    <input type="radio" id="customRadioInline4" value="day" name="limit_rate" class="custom-control-input">
-                    <label class="custom-control-label" for="customRadioInline4">Day</label>
-                </div>
-            </div>
             <div class="form-group">
                 <label for="icon">{{ tr('admin_icon') }}</label>
                 <input type="text" id="fieldsetIcon" name="icon" value="fas fa-truck" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_icon_empty_input') }}">
diff --git a/site/plugins/admin/templates/system/api/delivery/edit.html b/site/plugins/admin/templates/system/api/delivery/edit.html
index 78635e63..6923cb82 100644
--- a/site/plugins/admin/templates/system/api/delivery/edit.html
+++ b/site/plugins/admin/templates/system/api/delivery/edit.html
@@ -8,6 +8,7 @@
     <input type="hidden" name="created_by" value="{{ api_token_data.created_by }}">
     <input type="hidden" name="created_at" value="{{ api_token_data.created_at }}">
     <input type="hidden" name="uuid" value="{{ api_token_data.uuid }}">
+    <input type="hidden" name="calls" value="{{ api_token_data.calls }}">
     <div class="row">
         <div class="col-md-6">
             <div class="form-group">
@@ -20,24 +21,6 @@
                 <input type="text" id="limit" name="limit_calls" value="{{ api_token_data.limit_calls }}" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_api_calls_empty_input') }}">
                 <small class="form-text text-muted">{{ tr('admin_help_text_for_api_calls_limit_label') }}</small>
             </div>
-            <div class="form-group">
-                <div class="custom-control custom-radio custom-control-inline">
-                    <input type="radio" id="customRadioInline1" value="total" name="limit_rate" class="custom-control-input" {% if api_token_data.limit_rate == 'total' %}checked{% endif %}>
-                    <label class="custom-control-label" for="customRadioInline1">Total</label>
-                </div>
-                <div class="custom-control custom-radio custom-control-inline">
-                    <input type="radio" id="customRadioInline2" value="year" name="limit_rate" class="custom-control-input" {% if api_token_data.limit_rate == 'year' %}checked{% endif %}>
-                    <label class="custom-control-label" for="customRadioInline2">Year</label>
-                </div>
-                <div class="custom-control custom-radio custom-control-inline">
-                    <input type="radio" id="customRadioInline3" value="month" name="limit_rate" class="custom-control-input" {% if api_token_data.limit_rate == 'month' %}checked{% endif %}>
-                    <label class="custom-control-label" for="customRadioInline3">Month</label>
-                </div>
-                <div class="custom-control custom-radio custom-control-inline">
-                    <input type="radio" id="customRadioInline4" value="day" name="limit_rate" class="custom-control-input" {% if api_token_data.limit_rate == 'day' %}checked{% endif %}>
-                    <label class="custom-control-label" for="customRadioInline4">Day</label>
-                </div>
-            </div>
             <div class="form-group">
                 <label for="icon">{{ tr('admin_icon') }}</label>
                 <input type="text" id="fieldsetIcon" name="icon" value="{{ api_token_data.icon }}" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_icon_empty_input') }}">
diff --git a/site/plugins/admin/templates/system/api/delivery/index.html b/site/plugins/admin/templates/system/api/delivery/index.html
index 26c6f98c..8d6de98b 100644
--- a/site/plugins/admin/templates/system/api/delivery/index.html
+++ b/site/plugins/admin/templates/system/api/delivery/index.html
@@ -15,7 +15,7 @@
           </td>
           <td style="padding-left:0px;"><a href="{{ path_for('admin.api_tokens.edit') }}?api={{ api }}&api_token={{ delivery_token.dirname }}">{{ token_data.title }}</a></td>
           <td style="padding-left:0px;">{{ delivery_token.dirname }}</td>
-          <td style="padding-left:0px;">0 / {% if(token_data.limit_calls > 0) %}{{ token_data.limit_calls }}{% else %}<span style="font-size: 20px;">&infin;</span>{% endif %}</td>
+          <td style="padding-left:0px;">{{ token_data.calls }} / {% if(token_data.limit_calls > 0) %}{{ token_data.limit_calls }}{% else %}<span style="font-size: 20px;">&infin;</span>{% endif %}</td>
           <td class="text-right">
               <div class="btn-group">
                 <button type="button" class="btn dot dropdown-toggle" data-toggle="dropdown" data-display="static" aria-haspopup="true" aria-expanded="false">