Merge branch 'money-sign-in-word-option'

app/Http/Controllers/References/SiteOptionsController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\References;
 
+use Option;
 use Illuminate\Http\Request;
-use App\Entities\Options\Option;
 use App\Http\Controllers\Controller;
 
 /**
@@ -20,15 +20,15 @@ class SiteOptionsController extends Controller
 
     public function save1(Request $request)
     {
-        $request->validate([
+        $optionData = $request->validate([
             'money_sign'         => 'required|max:3',
+            'money_sign_in_word' => 'required|max:15',
         ]);
 
-        $option = Option::firstorNew(['key' => 'money_sign']);
-        $option->value = $request->get('money_sign');
-        $option->save();
+        Option::set('money_sign', $optionData['money_sign']);
+        Option::set('money_sign_in_word', $optionData['money_sign_in_word']);
 
-        flash(trans('option.updated'), 'success');
+        flash(__('option.updated'), 'success');
 
         return redirect()->route('site-options.page-1');
     }

resources/lang/de/option.php

@@ -14,4 +14,5 @@ return [
 
     // Keys
     'money_sign'         => 'Geldsignatur',
+    'money_sign_in_word' => 'Money Sign in Word',
 ];

resources/lang/en/option.php

@@ -14,4 +14,5 @@ return [
 
     // Keys
     'money_sign'         => 'Money Sign',
+    'money_sign_in_word' => 'Money Sign in Word',
 ];

resources/lang/id/option.php

@@ -14,4 +14,5 @@ return [
 
     // Keys
     'money_sign'         => 'Tanda Mata Uang',
+    'money_sign_in_word' => 'Tanda Mata Uang Terbilang',
 ];

resources/views/invoices/pdf.blade.php

@@ -142,7 +142,7 @@
             <tr style="vertical-align: top;">
                 <td style="padding-top: 20px;">{{ trans('payment.words_amount') }} : </td>
                 <td colspan="2" style="font-weight: bold; padding-top: 20px">
-                    {{ ucwords(Terbilang::make($invoice->amount)) }} Rupiah
+                    {{ ucwords(Terbilang::make($invoice->amount)) }} {{ Option::get('money_sign_in_word', 'Rupiah') }}
                 </td>
             </tr>
             @if ($invoice->notes)

resources/views/options/page-1.blade.php

@@ -22,6 +22,19 @@
                     </td>
                 </tr>
                 <tr>
+                    <td class="col-xs-5" style="vertical-align: top">{{ trans('option.money_sign_in_word') }}</td>
+                    <td class="col-xs-7">
+                        {{ Form::text(
+                            'money_sign_in_word',
+                            Option::get('money_sign_in_word', 'Rupiah'),
+                            ['class' => 'form-control', 'maxlength' => 15]
+                        ) }}
+                        <span class="text-info small">
+                            Money sign in word like :<br>One Hundred <strong>{{ Option::get('money_sign_in_word', 'Rupiah') }}</strong>.
+                        </span>
+                    </td>
+                </tr>
+                <tr>
                     <td>
                         {{ Form::submit(trans('app.update'), ['class' => 'btn btn-warning']) }}
                     </td>

tests/Feature/References/SiteOptionsTest.php

@@ -27,6 +27,7 @@ class SiteOptionsTest extends TestCase
 
         $this->submitForm(trans('app.update'), [
             'money_sign'         => '$',
+            'money_sign_in_word' => 'Dollars',
         ]);
 
         $this->see(trans('option.updated'));
@@ -36,5 +37,10 @@ class SiteOptionsTest extends TestCase
             'key'   => 'money_sign',
             'value' => '$',
         ]);
+
+        $this->seeInDatabase('site_options', [
+            'key'   => 'money_sign_in_word',
+            'value' => 'Dollars',
+        ]);
     }
 }