| @@ 85-97 (lines=13) @@ | ||
| 82 | { |
|
| 83 | $arrResult = array(); |
|
| 84 | $merchantList = $this->_network->getMerchantList(); |
|
| 85 | foreach ($merchantList as $merchant) { |
|
| 86 | $Merchant = Merchant::createInstance(); |
|
| 87 | $Merchant->merchant_ID = $merchant['cid']; |
|
| 88 | $Merchant->name = $merchant['name']; |
|
| 89 | // Added more info - 2018-04-20 <PN> |
|
| 90 | $Merchant->url = $merchant['url']; |
|
| 91 | $Merchant->status = $merchant['status']; |
|
| 92 | if (!empty($merchant['launch_date'])) { |
|
| 93 | $date = new \DateTime($merchant['launch_date']); |
|
| 94 | $Merchant->launch_dates = $date; |
|
| 95 | } |
|
| 96 | $arrResult[] = $Merchant; |
|
| 97 | } |
|
| 98 | ||
| 99 | return $arrResult; |
|
| 100 | } |
|
| @@ 99-112 (lines=14) @@ | ||
| 96 | } |
|
| 97 | $arrResult = array(); |
|
| 98 | $merchantList = $this->_network->getMerchantList(); |
|
| 99 | foreach($merchantList as $merchant) { |
|
| 100 | $Merchant = Merchant::createInstance(); |
|
| 101 | $Merchant->merchant_ID = $merchant['cid']; |
|
| 102 | $Merchant->name = $merchant['name']; |
|
| 103 | // Added more info - 2018-04-23 <PN> |
|
| 104 | $Merchant->status = $merchant['status']; |
|
| 105 | $Merchant->url = $merchant['url']; |
|
| 106 | $Merchant->status = $merchant['status']; |
|
| 107 | if (!empty($merchant['launch_date'])) { |
|
| 108 | $date = new \DateTime($merchant['launch_date']); |
|
| 109 | $Merchant->launch_dates = $date; |
|
| 110 | } |
|
| 111 | $arrResult[] = $Merchant; |
|
| 112 | } |
|
| 113 | ||
| 114 | return $arrResult; |
|
| 115 | } |
|