Changed account search to user search, show connection charges on invoice for pending services

2020-02-07 07:11:02 +09:00
parent ebd4367975
commit b61e00d80f
17 changed files with 314 additions and 145 deletions
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -186,12 +186,12 @@ class Product extends Model
 	 * @param int $period
 	 * @return mixed
 	 */
-	public function price(int $period)
+	public function price(int $period,string $key='price_base')
 	{
 		return Arr::get(
 			$this->price_array,
-			sprintf('%s.1.price_base',$period),
-			Arr::get($this->price_array,sprintf('%s.0.price_base',$period))
+			sprintf('%s.1.%s',$period,$key),
+			Arr::get($this->price_array,sprintf('%s.0.%s',$period,$key))
 		);
 	}