@@ -49,7 +49,7 @@ |
||
49 | 49 | } |
50 | 50 | } |
51 | 51 | $count = count($pays); |
52 | - return 'Оплачено <b>' . $count . '</b> ' . \Tools::getNumEnding($pays, ['счет', 'счета', 'счетов']); |
|
52 | + return 'Оплачено <b>'.$count.'</b> '.\Tools::getNumEnding($pays, ['счет', 'счета', 'счетов']); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | } |
@@ -43,7 +43,7 @@ |
||
43 | 43 | $transfer->cancel(); |
44 | 44 | } |
45 | 45 | $count = count($transfers); |
46 | - return 'Отменено <b>' . $count . '</b> ' . \Tools::getNumEnding($count, ['перевод', 'перевода', 'переводов']); |
|
46 | + return 'Отменено <b>'.$count.'</b> '.\Tools::getNumEnding($count, ['перевод', 'перевода', 'переводов']); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | } |
@@ -21,7 +21,7 @@ |
||
21 | 21 | public static function goToMerchant($payId, $amount, $currency, $description = '', $success = '/', $false = '/') |
22 | 22 | { |
23 | 23 | $wallets = \App::$cur->money->getUserWallets(); |
24 | - \Tools::redirect('/money/walletPay/' . $payId . '/' . $wallets[$currency->id]->id); |
|
24 | + \Tools::redirect('/money/walletPay/'.$payId.'/'.$wallets[$currency->id]->id); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | } |
@@ -20,14 +20,14 @@ |
||
20 | 20 | |
21 | 21 | public static function goToMerchant($payId, $amount, $currency, $description = '', $success = '/', $false = '/') |
22 | 22 | { |
23 | - \Tools::redirect('/money/primaryPay/' . $payId . '/' . $currency->id); |
|
23 | + \Tools::redirect('/money/primaryPay/'.$payId.'/'.$currency->id); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public static function getFinalSum($pay, $method) |
27 | 27 | { |
28 | 28 | $sum = parent::getFinalSum($pay, $method); |
29 | 29 | if ($pay->data && $cart = \Ecommerce\Cart::get($pay->data)) { |
30 | - $extra = '0.' . (strlen((string) $cart->id) > 1 ? substr((string) $cart->id, -2) : $cart->id); |
|
30 | + $extra = '0.'.(strlen((string) $cart->id) > 1 ? substr((string) $cart->id, -2) : $cart->id); |
|
31 | 31 | } else { |
32 | 32 | $extra = 0; |
33 | 33 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | $data['m_key'] |
35 | 35 | ); |
36 | 36 | $data['m_sign'] = strtoupper(hash('sha256', implode(':', $arHash))); |
37 | - \Tools::redirect('http://payeer.com/merchant/?' . http_build_query($data)); |
|
37 | + \Tools::redirect('http://payeer.com/merchant/?'.http_build_query($data)); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | public static function reciver($data, $status) |
@@ -57,11 +57,11 @@ discard block |
||
57 | 57 | $m_key); |
58 | 58 | $sign_hash = strtoupper(hash('sha256', implode(':', $arHash))); |
59 | 59 | if ($_POST['m_sign'] == $sign_hash && $_POST['m_status'] == 'success') { |
60 | - $result['callback'] = $_POST['m_orderid'] . '|success'; |
|
60 | + $result['callback'] = $_POST['m_orderid'].'|success'; |
|
61 | 61 | $result['payId'] = $data["m_orderid"]; |
62 | 62 | $result['status'] = 'success'; |
63 | 63 | } else { |
64 | - $result['callback'] = $_POST['m_orderid'] . '|error'; |
|
64 | + $result['callback'] = $_POST['m_orderid'].'|error'; |
|
65 | 65 | } |
66 | 66 | } |
67 | 67 |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $request['PAYMENT_AMOUNT'] = $amount; |
26 | 26 | $request['PAYMENT_UNITS'] = $merchantCurrency->code; |
27 | 27 | $request['SUGGESTED_MEMO'] = $description; |
28 | - $request['STATUS_URL'] = 'http://' . INJI_DOMAIN_NAME . '/money/merchants/reciver/PerfectMoney'; |
|
28 | + $request['STATUS_URL'] = 'http://'.INJI_DOMAIN_NAME.'/money/merchants/reciver/PerfectMoney'; |
|
29 | 29 | $request['PAYMENT_URL'] = $success; |
30 | 30 | $request['NOPAYMENT_URL'] = $false; |
31 | 31 | $request['PAYMENT_METHOD'] = 'PerfectMoney account'; |
@@ -50,10 +50,10 @@ discard block |
||
50 | 50 | |
51 | 51 | $config = static::getConfig(); |
52 | 52 | |
53 | - $string = $_POST['PAYMENT_ID'] . ':' . $_POST['PAYEE_ACCOUNT'] . ':' . |
|
54 | - $_POST['PAYMENT_AMOUNT'] . ':' . $_POST['PAYMENT_UNITS'] . ':' . |
|
55 | - $_POST['PAYMENT_BATCH_NUM'] . ':' . |
|
56 | - $_POST['PAYER_ACCOUNT'] . ':' . strtoupper(md5($config['secret'])) . ':' . |
|
53 | + $string = $_POST['PAYMENT_ID'].':'.$_POST['PAYEE_ACCOUNT'].':'. |
|
54 | + $_POST['PAYMENT_AMOUNT'].':'.$_POST['PAYMENT_UNITS'].':'. |
|
55 | + $_POST['PAYMENT_BATCH_NUM'].':'. |
|
56 | + $_POST['PAYER_ACCOUNT'].':'.strtoupper(md5($config['secret'])).':'. |
|
57 | 57 | $_POST['TIMESTAMPGMT']; |
58 | 58 | |
59 | 59 | $hash = strtoupper(md5($string)); |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | default: |
46 | 46 | $sum = $pay->sum; |
47 | 47 | } |
48 | - $className = 'Money\MerchantHelper\\' . $objectName; |
|
48 | + $className = 'Money\MerchantHelper\\'.$objectName; |
|
49 | 49 | return $className::goToMerchant($pay->id, $sum, $method['currency'], $merchantOptions['description'], $merchantOptions['success'], $merchantOptions['false']); |
50 | 50 | } |
51 | 51 | |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | if ($merchant) { |
60 | 60 | $this->currentMerchant = $system; |
61 | 61 | } |
62 | - $className = 'Money\MerchantHelper\\' . $this->currentMerchant; |
|
62 | + $className = 'Money\MerchantHelper\\'.$this->currentMerchant; |
|
63 | 63 | $result = $className::reciver($data, $status); |
64 | 64 | $result['pay'] = null; |
65 | 65 | if (!empty($result['payId'])) { |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | if (empty($blocks[$block->wallet->currency_id])) { |
103 | 103 | $blocks[$block->wallet->currency_id] = $block->amount; |
104 | 104 | } else { |
105 | - $blocks[$block->wallet->currency_id]+= $block->amount; |
|
105 | + $blocks[$block->wallet->currency_id] += $block->amount; |
|
106 | 106 | } |
107 | 107 | } |
108 | 108 | return $blocks; |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | return false; |
172 | 172 | } |
173 | 173 | $reward->checkBlocked(); |
174 | - $reward_count = \Money\Reward\Recive::getCount([ 'where' => [ 'reward_id', $reward_id]]); |
|
174 | + $reward_count = \Money\Reward\Recive::getCount(['where' => ['reward_id', $reward_id]]); |
|
175 | 175 | if ($reward_count >= $reward->quantity && $reward->quantity) { |
176 | 176 | return false; |
177 | 177 | } |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | $recives = \Money\Reward\Recive::getList(['where' => [['user_id', $user->id], ['reward_id', $reward->id]]]); |
212 | 212 | $amount = 0; |
213 | 213 | foreach ($recives as $recive) { |
214 | - $amount+=$recive->amount; |
|
214 | + $amount += $recive->amount; |
|
215 | 215 | } |
216 | 216 | if ($amount >= $reward->peruser) { |
217 | 217 | continue; |
@@ -102,10 +102,10 @@ |
||
102 | 102 | if ($treePath) { |
103 | 103 | $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]); |
104 | 104 | foreach ($categorys as $category) { |
105 | - $href .="/{$category->alias}"; |
|
105 | + $href .= "/{$category->alias}"; |
|
106 | 106 | } |
107 | 107 | } |
108 | - return $href . "/" . ($this->alias ? $this->alias : $this->pk()); |
|
108 | + return $href."/".($this->alias ? $this->alias : $this->pk()); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | public static function relations() |
@@ -97,8 +97,8 @@ discard block |
||
97 | 97 | } else { |
98 | 98 | $this->view->setTitle($category->name); |
99 | 99 | |
100 | - $pages = new Ui\Pages($_GET, ['count' => Materials\Material::getCount(['where' => ['tree_path', $category->tree_path . $category->id . '/%', 'LIKE']]), 'limit' => 10]); |
|
101 | - $materials = Materials\Material::getList(['where' => ['tree_path', $category->tree_path . $category->id . '/%', 'LIKE'], 'order' => ['date_create', 'desc'], 'start' => $pages->params['start'], 'limit' => $pages->params['limit']]); |
|
100 | + $pages = new Ui\Pages($_GET, ['count' => Materials\Material::getCount(['where' => ['tree_path', $category->tree_path.$category->id.'/%', 'LIKE']]), 'limit' => 10]); |
|
101 | + $materials = Materials\Material::getList(['where' => ['tree_path', $category->tree_path.$category->id.'/%', 'LIKE'], 'order' => ['date_create', 'desc'], 'start' => $pages->params['start'], 'limit' => $pages->params['limit']]); |
|
102 | 102 | |
103 | 103 | $this->view->page(['page' => $category->resolveTemplate(), 'content' => $category->resolveViewer(), 'data' => compact('materials', 'pages', 'category')]); |
104 | 104 | } |
@@ -132,17 +132,17 @@ discard block |
||
132 | 132 | $this->view->addMetaTag(['name' => 'description', 'content' => $material->description]); |
133 | 133 | } |
134 | 134 | $this->view->addMetaTag(['property' => 'og:title', 'content' => $material->name]); |
135 | - $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/' . $material->alias]); |
|
135 | + $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/'.$material->alias]); |
|
136 | 136 | if ($material->description) { |
137 | - $this->view->addMetaTag(['property' => 'og:description', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/' . $material->description]); |
|
137 | + $this->view->addMetaTag(['property' => 'og:description', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/'.$material->description]); |
|
138 | 138 | } |
139 | 139 | if ($material->image) { |
140 | - $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . $material->image->path]); |
|
140 | + $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).$material->image->path]); |
|
141 | 141 | } elseif ($logo = Files\File::get('site_logo', 'code')) { |
142 | - $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . $logo->path]); |
|
142 | + $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).$logo->path]); |
|
143 | 143 | } |
144 | 144 | $this->view->setTitle($material->name); |
145 | - $bread[] = ['text' => $material->name, 'href' => '/' . $material->alias]; |
|
145 | + $bread[] = ['text' => $material->name, 'href' => '/'.$material->alias]; |
|
146 | 146 | $this->view->page([ |
147 | 147 | 'page' => $material->resolveTemplate(), |
148 | 148 | 'content' => $material->resolveViewer(), |