Show number attribute (#9)

* Show number attribute * Apply fixes from StyleCI (#10)
getcandy · Dec 12, 2018 · 8a666a5 · 8a666a5
1 parent b02fb83
commit 8a666a5
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 10 deletions.
diff --git a/resources/assets/js/components.js b/resources/assets/js/components.js
@@ -47,6 +47,7 @@ var includes = [
       'checkbox' : 'Checkbox',
       'date-picker': 'DatePicker',
       'input' : 'Input',
+      'number' : 'Number',
       'radio' : 'Radio',
       'select' : 'Select',
       'taggable' : 'Taggable',

diff --git a/resources/assets/js/components/elements/forms/AttributeTranslatable.vue b/resources/assets/js/components/elements/forms/AttributeTranslatable.vue
@@ -159,6 +159,13 @@
                                         :required="attribute.required">
                             </candy-input>
 
+                            <candy-number v-if="attribute.type == 'number'"
+                                        :handle="'default-'+ attribute.id"
+                                        :value="get(attribute.handle, 'default')"
+                                        @input="set(attribute.handle, $event, 'default')"
+                                        :required="attribute.required">
+                            </candy-number>
+
                             <candy-date-picker
                                 v-if="attribute.type == 'date'"
                                 :value="get(attribute.handle, 'default')"

diff --git a/resources/assets/js/components/elements/forms/inputs/Number.vue b/resources/assets/js/components/elements/forms/inputs/Number.vue
@@ -0,0 +1,40 @@
+<template>
+    <div>
+        <input type="number"
+               :value="value"
+               @input="updateValue($event.target.value)"
+               class="form-control"
+               :required="required"
+               :placeholder="placeholder"
+               :disabled="disabled">
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            value: {
+                type: String
+            },
+            translate: {
+                type: String,
+                default: null
+            },
+            required: {
+                type: Boolean
+            },
+            placeholder: {
+                type: String
+            },
+            disabled: {
+                type: Boolean,
+                default: false
+            }
+        },
+        methods: {
+            updateValue: function (value) {
+                this.$emit('input', value);
+            }
+        }
+    }
+</script>
diff --git a/resources/build/js/hub.js b/resources/build/js/hub.js
diff --git a/src/Http/Controllers/Auth/ResetPasswordController.php b/src/Http/Controllers/Auth/ResetPasswordController.php
@@ -2,9 +2,9 @@
 
 namespace GetCandy\Hub\Http\Controllers\Auth;
 
-use Illuminate\Http\Request;
 use GetCandy\Hub\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
+use Illuminate\Http\Request;
 
 class ResetPasswordController extends Controller
 {
@@ -43,8 +43,9 @@ public function __construct()
      *
      * If no token is present, display the link request form.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string|null  $token
+     * @param \Illuminate\Http\Request $request
+     * @param string|null              $token
+     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function showResetForm(Request $request, $token = null)

diff --git a/src/Http/Controllers/DashboardController.php b/src/Http/Controllers/DashboardController.php
@@ -20,7 +20,6 @@ public function getIndex()
         $lastWeeksSales = $this->getSalesLastWeek();
         $thisWeeksSales = $this->getSalesThisWeek();
 
-
         $lastMonthSales = $this->ordersForDateRange(
             Carbon::now()->startOfMonth()->subMonth(),
             Carbon::now()->endOfMonth()->subMonth()
@@ -98,7 +97,7 @@ protected function salesData()
             $prevStart = Carbon::now()->startOfWeek()->subWeeks($i + 1);
             $prevEnd = Carbon::now()->endOfWeek()->subWeeks($i + 1);
 
-            $label = $start->format('dS') . ' to ' . $end->format('dS') . ' ' . $end->format('F Y');
+            $label = $start->format('dS').' to '.$end->format('dS').' '.$end->format('F Y');
 
             $total = $this->ordersForDateRange(
                 $start,
@@ -115,9 +114,9 @@ protected function salesData()
             )->first()->grand_total;
 
             $data[$label] = [
-                'total' => $total,
+                'total'    => $total,
                 'previous' => $previous,
-                'diff' => $total - $previous
+                'diff'     => $total - $previous,
             ];
         }
 
@@ -152,7 +151,6 @@ public function getOrderMonthsGraph()
             $data[] = $total;
         }
 
-
         $dataset = [
             'label'           => 'Order Totals',
             'backgroundColor' => '#E7028C',
@@ -249,7 +247,6 @@ protected function ordersLastWeek()
 
     protected function getSalesThisWeek()
     {
-
         return $this->ordersThisWeek()->select(
             \DB::RAW('SUM(((sub_total + tax_total - discount_total / conversion) / 100)) as grand_total')
         )->first()->grand_total;