diff --git a/app/Product.php b/app/Product.php
index b85d0e3..2e05749 100644
--- a/app/Product.php
+++ b/app/Product.php
@@ -10,8 +10,7 @@ class Product extends Model
 
     public function getPrice($type = 'cash')
     {
-        // TODO: if there is no credit_price then return cash_price
-        if ($type == 'credit') {
+        if ($type == 'credit' && $this->credit_price) {
             return $this->credit_price;
         }
 
diff --git a/resources/views/cart/partials/product-search-box.blade.php b/resources/views/cart/partials/product-search-box.blade.php
index 912bd7e..9d6c39e 100644
--- a/resources/views/cart/partials/product-search-box.blade.php
+++ b/resources/views/cart/partials/product-search-box.blade.php
@@ -4,7 +4,7 @@
             <label for="query">{{ trans('cart.product_search') }}</label>
             <input type="text" id="query" name="query" value="{{ request('query') }}">
             <input type="submit" value="{{ trans('cart.product_search') }}" class="btn btn-sm">
-            <a href="{{ route('cart.show', $draft->draftKey) }}" class="btn btn-sm">Refresh</a>
+            {{ link_to_route('cart.show', 'Bersihkan Pencarian', [$draft->draftKey], ['class' => 'btn btn-sm']) }}
         </form>
     </div>
     @includeWhen ($queriedProducts, 'cart.partials.product-search-result-box')
diff --git a/resources/views/cart/partials/product-search-result-box.blade.php b/resources/views/cart/partials/product-search-result-box.blade.php
index e0754b0..6041773 100644
--- a/resources/views/cart/partials/product-search-result-box.blade.php
+++ b/resources/views/cart/partials/product-search-result-box.blade.php
@@ -13,7 +13,7 @@
             <tr>
                 <td>{{ $product->name }}</td>
                 <td>{{ $product->unit->name }}</td>
-                <td>{{ formatRp($draft->type == 'cash' ? $product->cash_price : $product->credit_price) }}</td>
+                <td>{{ formatRp($product->getPrice($draft->type)) }}</td>
                 <td>
                     <form action="{{ route('cart.add-draft-item', [$draft->draftKey, $product->id]) }}" method="post" style="display:inline">
                         {{ csrf_field() }}
diff --git a/tests/Unit/Integration/ProductTest.php b/tests/Unit/Integration/ProductTest.php
index 0571930..6e0c06f 100644
--- a/tests/Unit/Integration/ProductTest.php
+++ b/tests/Unit/Integration/ProductTest.php
@@ -31,4 +31,14 @@ class ProductTest extends TestCase
         $this->assertEquals($product->credit_price, $product->getPrice('credit'));
         $this->assertEquals(3000, $product->getPrice('credit'));
     }
+
+    /** @test */
+    public function product_get_price_returns_cash_price_if_credit_price_is_0_or_null()
+    {
+        $product = new Product(['cash_price' => 2000, 'credit_price' => 0]);
+        $this->assertEquals(2000, $product->getPrice('credit'));
+
+        $product = new Product(['cash_price' => 2000, 'credit_price' => null]);
+        $this->assertEquals(2000, $product->getPrice('credit'));
+    }
 }