close #1384 Fixed: Recurring count always set as 0

akaunting · Apr 18, 2020 · ec07675 · ec07675
1 parent 2d3b44d
commit ec07675
Showing 1 changed file with 43 additions and 27 deletions.
diff --git a/resources/assets/js/components/AkauntingRecurring.vue b/resources/assets/js/components/AkauntingRecurring.vue
@@ -21,22 +21,23 @@
         </base-input>
 
         <base-input :label="''"
-                name="recurring_interval"
-                type="number"
-                :value="0"
-                class="recurring-single"
-                :class="invertalClasses"
-                :error="intervalError"
-                v-model="recurring_interval"
-                >
+            name="recurring_interval"
+            type="number"
+            :value="0"
+            class="recurring-single"
+            :class="invertalClasses"
+            :error="intervalError"
+            v-model="recurring_interval"
+            @input="change"
+        >
         </base-input>
 
         <base-input :label="''"
-                name="recurring_custom_frequency"
-                class="recurring-single"
-                :class="customFrequencyClasses"
-                :error="customFrequencyError"
-                >
+            name="recurring_custom_frequency"
+            class="recurring-single"
+            :class="customFrequencyClasses"
+            :error="customFrequencyError"
+        >
             <el-select v-model="recurring_custom_frequency" @input="change" filterable
                 :placeholder="placeholder">
                 <el-option v-for="(label, value) in customFrequencyOptions"
@@ -48,14 +49,14 @@
         </base-input>
 
         <base-input :label="''"
-                name="recurring_count"
-                type="number"
-                :value="0"
-                class="recurring-single"
-                :class="countClasses"
-                :error="countError"
-                v-model="recurring_count"
-                >
+            name="recurring_count"
+            type="number"
+            class="recurring-single"
+            :class="countClasses"
+            :error="countError"
+            v-model="recurring_count"
+            @input="change"
+        >
         </base-input>
     </div>
 </template>
@@ -89,14 +90,22 @@ export default {
         frequencyValue: null,
         frequencyError: null,
 
-        intervalValue: null,
+        intervalValue: {
+            type: [Number, String],
+            default: 0,
+            description: "Default interval value"
+        },
         intervalError: null,
 
         customFrequencyOptions: null,
         customFrequencyValue: null,
         customFrequencyError: null,
 
-        countValue: null,
+        countValue: {
+            type: [Number, String],
+            default: 0,
+            description: "Default count value"
+        },
         countError: null,
 
         icon: {
@@ -107,17 +116,24 @@ export default {
 
     data() {
         return {
-            recurring_frequency: this.frequencyValue,
-            recurring_interval: this.intervalValue,
-            recurring_custom_frequency: this.customFrequencyValue,
-            recurring_count: this.countValue,
+            recurring_frequency: null,
+            recurring_interval: null,
+            recurring_custom_frequency: null,
+            recurring_count: null,
             frequencyClasses: 'col-md-12',
             invertalClasses: 'col-md-2 d-none',
             customFrequencyClasses: 'col-md-4 d-none',
             countClasses: 'col-md-2 d-none'
         }
     },
 
+    created() {
+        this.recurring_frequency = this.frequencyValue;
+        this.recurring_interval = this.intervalValue;
+        this.recurring_custom_frequency = this.customFrequencyValue;
+        this.recurring_count = this.countValue;
+    },
+
     mounted() {
         this.recurring_frequency = this.frequencyValue;