Expand views to allow editing of currency decimals #506

resources/lang/en_US/firefly.php

@@ -826,6 +826,7 @@ return [
     'transaction_journal_information'      => 'Transaction information',
     'transaction_journal_meta'             => 'Meta information',
     'total_amount'                         => 'Total amount',
+    'number_of_decimals'                   => 'Number of decimals',
 
     // administration
     'administration'                       => 'Administration',

resources/lang/en_US/form.php

@@ -63,6 +63,7 @@ return [
     'description'                    => 'Description',
     'expense_account'                => 'Expense account',
     'revenue_account'                => 'Revenue account',
+    'decimal_places'                 => 'Decimal places',
 
     'revenue_account_source'      => 'Revenue account (source)',
     'source_account_asset'        => 'Source account (asset account)',
@@ -150,30 +151,30 @@ return [
     'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
     'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
 
-    'email'                   => 'Email address',
-    'password'                => 'Password',
-    'password_confirmation'   => 'Password (again)',
-    'blocked'                 => 'Is blocked?',
-    'blocked_code'            => 'Reason for block',
+    'email'                 => 'Email address',
+    'password'              => 'Password',
+    'password_confirmation' => 'Password (again)',
+    'blocked'               => 'Is blocked?',
+    'blocked_code'          => 'Reason for block',
 
 
     // admin
-    'domain'                  => 'Domain',
-    'single_user_mode'        => 'Single user mode',
-    'must_confirm_account'    => 'New users must activate account',
-    'is_demo_site'            => 'Is demo site',
+    'domain'                => 'Domain',
+    'single_user_mode'      => 'Single user mode',
+    'must_confirm_account'  => 'New users must activate account',
+    'is_demo_site'          => 'Is demo site',
 
 
     // import
-    'import_file'             => 'Import file',
-    'configuration_file'      => 'Configuration file',
-    'import_file_type'        => 'Import file type',
-    'csv_comma'               => 'A comma (,)',
-    'csv_semicolon'           => 'A semicolon (;)',
-    'csv_tab'                 => 'A tab (invisible)',
-    'csv_delimiter'           => 'CSV field delimiter',
-    'csv_import_account'      => 'Default import account',
-    'csv_config'              => 'CSV import configuration',
+    'import_file'           => 'Import file',
+    'configuration_file'    => 'Configuration file',
+    'import_file_type'      => 'Import file type',
+    'csv_comma'             => 'A comma (,)',
+    'csv_semicolon'         => 'A semicolon (;)',
+    'csv_tab'               => 'A tab (invisible)',
+    'csv_delimiter'         => 'CSV field delimiter',
+    'csv_import_account'    => 'Default import account',
+    'csv_config'            => 'CSV import configuration',
 
 
     'due_date'           => 'Due date',

resources/views/currencies/create.twig

@@ -17,6 +17,7 @@
                         {{ ExpandedForm.text('name',null,{'maxlength' : 48}) }}
                         {{ ExpandedForm.text('symbol',null,{'maxlength': 8}) }}
                         {{ ExpandedForm.text('code',null,{'maxlength' : 3}) }}
+                        {{ ExpandedForm.integer('decimal_places',3,{'maxlength' : 2,'min': 0,'max': 12}) }}
                     </div>
                 </div>
 

resources/views/currencies/edit.twig

@@ -18,6 +18,7 @@
                     {{ ExpandedForm.text('name',null,{'maxlength' : 48}) }}
                     {{ ExpandedForm.text('symbol',null,{'maxlength' : 8}) }}
                     {{ ExpandedForm.text('code',null,{'maxlength' : 3}) }}
+                    {{ ExpandedForm.integer('decimal_places',null,{'maxlength' : 2,'min': 0,'max': 12}) }}
                 </div>
             </div>
         </div>

resources/views/currencies/index.twig

@@ -20,7 +20,9 @@
                             <thead>
                             <tr>
                                 <th>&nbsp;</th>
-                                <th colspan="2">{{ 'currency'|_ }}</th>
+                                <th>{{ 'currency'|_ }}</th>
+                                <th>{{ 'number_of_decimals'|_ }}</th>
+                                <th>&nbsp;</th>
                             </tr>
                             </thead>
                             <tbody>
@@ -33,6 +35,7 @@
                                         </div>
                                     </td>
                                     <td>{{ currency.name }} ({{ currency.code }}) ({{ currency.symbol|raw }})</td>
+                                    <td>{{ currency.decimal_places }}</td>
                                     <td>
                                         {% if currency.id == defaultCurrency.id %}
                                             <span class="label label-success">{{ 'default_currency'|_ }}</span>

resources/views/form/integer.twig

@@ -2,9 +2,8 @@
     <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
 
     <div class="col-sm-8">
-        <div class="input-group">
-            {{ Form.input('number', name, value, options) }}
-            {% include 'form/feedback' %}
-        </div>
+        {{ Form.input('number', name, value, options) }}
+        {% include 'form/help' %}
+        {% include 'form/feedback' %}
     </div>
 </div>