@@ 169-193 (lines=25) @@ | ||
166 | } |
|
167 | ||
168 | $transcationList = $this->_network->getTransactionList($arrMerchantID, $dateFrom, $dateTo); |
|
169 | foreach($transcationList as $transaction) { |
|
170 | $Transaction = Transaction::createInstance(); |
|
171 | array_key_exists_safe( $transaction, |
|
172 | 'currency' ) ? $Transaction->currency = $transaction['currency'] : $Transaction->currency = ''; |
|
173 | array_key_exists_safe( $transaction, |
|
174 | 'status' ) ? $Transaction->status = $transaction['status'] : $Transaction->status = ''; |
|
175 | array_key_exists_safe( $transaction, |
|
176 | 'amount' ) ? $Transaction->amount = $transaction['amount'] : $Transaction->amount = ''; |
|
177 | array_key_exists_safe( $transaction, |
|
178 | 'custom_id' ) ? $Transaction->custom_ID = $transaction['custom_id'] : $Transaction->custom_ID = ''; |
|
179 | array_key_exists_safe( $transaction, |
|
180 | 'title' ) ? $Transaction->title = $transaction['title'] : $Transaction->title = ''; |
|
181 | array_key_exists_safe( $transaction, |
|
182 | 'unique_id' ) ? $Transaction->unique_ID = $transaction['unique_id'] : $Transaction->unique_ID = ''; |
|
183 | array_key_exists_safe( $transaction, |
|
184 | 'commission' ) ? $Transaction->commission = $transaction['commission'] : $Transaction->commission = 0; |
|
185 | $date = new \DateTime( $transaction['date'] ); |
|
186 | $Transaction->date = $date; // $date->format('Y-m-d H:i:s'); |
|
187 | array_key_exists_safe( $transaction, |
|
188 | 'merchantId' ) ? $Transaction->merchant_ID = $transaction['merchantId'] : $Transaction->merchant_ID = ''; |
|
189 | array_key_exists_safe( $transaction, |
|
190 | 'approved' ) ? $Transaction->approved = $transaction['approved'] : $Transaction->approved = ''; |
|
191 | $arrResult[] = $Transaction; |
|
192 | ||
193 | } |
|
194 | ||
195 | return $arrResult; |
|
196 | } |
@@ 206-229 (lines=24) @@ | ||
203 | } |
|
204 | } |
|
205 | $transcationList = $this->_network->getTransactionList( $arrMerchantID, $dateFrom2, $dateTo ); |
|
206 | foreach ($transcationList as $transaction) { |
|
207 | $Transaction = Transaction::createInstance(); |
|
208 | array_key_exists_safe( $transaction, |
|
209 | 'currency' ) ? $Transaction->currency = $transaction['currency'] : $Transaction->currency = ''; |
|
210 | array_key_exists_safe( $transaction, |
|
211 | 'status' ) ? $Transaction->status = $transaction['status'] : $Transaction->status = ''; |
|
212 | array_key_exists_safe( $transaction, |
|
213 | 'amount' ) ? $Transaction->amount = $transaction['amount'] : $Transaction->amount = ''; |
|
214 | array_key_exists_safe( $transaction, |
|
215 | 'custom_id' ) ? $Transaction->custom_ID = $transaction['custom_id'] : $Transaction->custom_ID = ''; |
|
216 | array_key_exists_safe( $transaction, |
|
217 | 'title' ) ? $Transaction->title = $transaction['title'] : $Transaction->title = ''; |
|
218 | array_key_exists_safe( $transaction, |
|
219 | 'unique_id' ) ? $Transaction->unique_ID = $transaction['unique_id'] : $Transaction->unique_ID = ''; |
|
220 | array_key_exists_safe( $transaction, |
|
221 | 'commission' ) ? $Transaction->commission = $transaction['commission'] : $Transaction->commission = ''; |
|
222 | $date = new \DateTime( $transaction['date'] ); |
|
223 | $Transaction->date = $date; // $date->format('Y-m-d H:i:s'); |
|
224 | array_key_exists_safe( $transaction, |
|
225 | 'merchantId' ) ? $Transaction->merchant_ID = $transaction['merchantId'] : $Transaction->merchant_ID = ''; |
|
226 | array_key_exists_safe( $transaction, |
|
227 | 'approved' ) ? $Transaction->approved = $transaction['approved'] : $Transaction->approved = ''; |
|
228 | $arrResult[] = $Transaction; |
|
229 | } |
|
230 | ||
231 | return $arrResult; |
|
232 | } |