diff --git a/app/Libraries/MultiDB.php b/app/Libraries/MultiDB.php index affa13c55453..0aa88669f976 100644 --- a/app/Libraries/MultiDB.php +++ b/app/Libraries/MultiDB.php @@ -143,15 +143,14 @@ class MultiDB public static function findAndSetDbByDomain($domain) :bool { -\Log::error("searching for {$domain}"); +//\Log::error("searching for {$domain}"); foreach (self::$dbs as $db) { -$company = Company::on($db)->whereDomain($domain)->first(); -\Log::error($company); + if($company = Company::on($db)->whereDomain($domain)->first()) { -\Log::error("setting db"); + self::setDb($company->db); return true; diff --git a/app/Transformers/ProductTransformer.php b/app/Transformers/ProductTransformer.php index 600119227aba..a41147c6d21b 100644 --- a/app/Transformers/ProductTransformer.php +++ b/app/Transformers/ProductTransformer.php @@ -63,6 +63,7 @@ class ProductTransformer extends EntityTransformer 'product_key' => $product->product_key, 'notes' => $product->notes, 'cost' => (float) $product->cost, + 'price' => (float) $product->price, 'quantity' => (float) ($product->quantity ?: 0.0), 'tax_name1' => $product->tax_name1 ?: '', 'tax_rate1' => (float) $product->tax_rate1, @@ -72,8 +73,8 @@ class ProductTransformer extends EntityTransformer 'archived_at' => $product->deleted_at, 'custom_value1' => $product->custom_value1 ?: '', 'custom_value2' => $product->custom_value2 ?: '', - 'custom_value3' => $product->custom_value2 ?: '', - 'custom_value4' => $product->custom_value2 ?: '', + 'custom_value3' => $product->custom_value3 ?: '', + 'custom_value4' => $product->custom_value4 ?: '', 'is_deleted' => (bool) $product->is_deleted, ]; }