Show shop unspecific price, if no price is available for selected shop and database

has pricingCategories set for shop

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog  
 All notable changes to this project will be documented in this file. 
 
+## [0.10.5]
+
+### Fixed
+- Show shop unspecific price, if no price is available for selected shop and database 
+has pricingCategories set for shop
+
 ## [0.10.4]
 
 ### Fixed

build.gradle

@@ -24,7 +24,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.10.4'
+        sdkVersion='0.10.5'
         versionCode=1
 
         compileSdkVersion=28

core/src/main/java/io/snabble/sdk/ProductDatabase.java

@@ -755,6 +755,14 @@ public Product productAtCursor(Cursor cursor) {
 
         Shop shop = project.getCheckedInShop();
 
+        if(!queryPrice(builder, sku, shop)) {
+            queryPrice(builder, sku, null);
+        }
+
+        return builder.build();
+    }
+
+    private boolean queryPrice(Product.Builder builder, String sku, Shop shop) {
         String id = shop != null ? shop.getId() : "";
         String priceQuery = "SELECT listPrice, discountedPrice, basePrice FROM prices ";
         String[] args;
@@ -775,9 +783,10 @@ public Product productAtCursor(Cursor cursor) {
             builder.setDiscountedPrice(priceCursor.getInt(1));
             builder.setBasePrice(priceCursor.getString(2));
             priceCursor.close();
+            return true;
         }
 
-        return builder.build();
+        return false;
     }
 
     private Product.SaleRestriction decodeSaleRestriction(long encodedValue) {