Changeset 2198571
- Timestamp:
- 11/22/2019 04:15:14 AM (6 years ago)
- Location:
- fastdee/trunk
- Files:
-
- 4 edited
-
assets/js/dev/src/coupons-page.js (modified) (1 diff)
-
includes/core/class-fd-pages.php (modified) (5 diffs)
-
includes/libraries/alv2/alv2.php (modified) (2 diffs)
-
includes/pages/class-fd-coupons-page.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
fastdee/trunk/assets/js/dev/src/coupons-page.js
r1973321 r2198571 92 92 if ( 93 93 !dataReturn || !dataReturn.requestInfo || !dataReturn.requestInfo.message || 94 dataReturn.requestInfo.message.toLowerCase() !== 'success'94 (dataReturn.requestInfo.message.toLowerCase() !== 'success' || dataReturn.requestInfo.message.indexOf('DEPRECATED')===-1) 95 95 ) { 96 96 showNotify('Ops... Houve um erro ao buscar na Lomadee!<br><br>Tente Novamente!<br><br>Caso o erro ainda continue após alguns minutos, contate nosso suporte. <br> contato@fastdee.com', 10000, 'center', 'error'); -
fastdee/trunk/includes/core/class-fd-pages.php
r2198554 r2198571 10 10 parent::__construct(); 11 11 12 12 add_action('in_admin_footer', array($this, 'add_btn_doar')); 13 13 } 14 14 15 15 public function add_btn_doar(){ 16 16 global $fd_doe_footer_printed,$hook_suffix; 17 17 18 19 20 21 22 23 18 if (!$fd_doe_footer_printed&&in_array( $hook_suffix, array( 19 'toplevel_page_fastdee', 20 'fastdee_page_fd_atualizar', 21 'fastdee_page_fd_opcoes', 22 'fastdee_page_fd_aprenda', 23 'fastdee_page_importar', 24 24 // 'fastdee_page_fastdee_cupons' 25 26 27 28 25 ) ) ) { 26 $fd_doe_footer_printed=true; 27 //TODO arrumar estilo 28 ?> 29 29 <!-- INICIO FORMULARIO BOTAO PAGSEGURO --> 30 30 <div class="btn-doar-container"> … … 45 45 </div> 46 46 <!-- FINAL FORMULARIO BOTAO PAGSEGURO --> 47 48 49 47 <?php 48 } 49 } 50 50 51 51 public function fd_getCategorias() { 52 52 //'hasProduct' => true 53 53 54 $strRetorno = $this->getLomadeAccess()->findCategories( alv2::_ALL, array( 'size' => 1000, ));55 $arrRetorno = json_decode( $strRetorno);56 if ( ! $arrRetorno) {57 $arrRetorno = json_decode( utf8_decode( $strRetorno ));54 $strRetorno = $this->getLomadeAccess()->findCategories(alv2::_ALL, array('size' => 1000,)); 55 $arrRetorno = json_decode($strRetorno); 56 if (!$arrRetorno) { 57 $arrRetorno = json_decode(utf8_decode($strRetorno)); 58 58 } 59 59 60 if ( ! $arrRetorno || ! property_exists( $arrRetorno, 'requestInfo' ) || $arrRetorno->requestInfo->message !== 'SUCCESS' || ! property_exists( $arrRetorno, 'categories' ) ) { 61 $strRetorno = $this->getLomadeAccess()->findCategories( alv2::_BESTSELLERS, array( 'size' => 1000, ) ); 62 $arrRetorno = json_decode( $strRetorno ); 63 if ( ! $arrRetorno ) { 64 $arrRetorno = json_decode( utf8_decode( $strRetorno ) ); 60 if (!$arrRetorno || !property_exists($arrRetorno, 'requestInfo') || ($arrRetorno->requestInfo->message !== 'SUCCESS' || 61 strpos('DEPRECATED', $arrRetorno->requestInfo->message) === FALSE) || !property_exists($arrRetorno, 'categories')) { 62 $strRetorno = $this->getLomadeAccess()->findCategories(alv2::_BESTSELLERS, array('size' => 1000,)); 63 $arrRetorno = json_decode($strRetorno); 64 if (!$arrRetorno) { 65 $arrRetorno = json_decode(utf8_decode($strRetorno)); 65 66 } 66 67 } 67 68 68 if ( $arrRetorno && property_exists( $arrRetorno, 'requestInfo' ) && $arrRetorno->requestInfo->message === 'SUCCESS' && property_exists( $arrRetorno, 'categories' ) ) { 69 try { 70 if ($arrRetorno && property_exists($arrRetorno, 'requestInfo') && ($arrRetorno->requestInfo->message === 'SUCCESS' || 71 strpos('DEPRECATED', $arrRetorno->requestInfo->message) !== FALSE) 72 && property_exists($arrRetorno, 'categories')) { 69 73 70 $arrCategories = $arrRetorno->categories;74 $arrCategories = $arrRetorno->categories; 71 75 72 if ( is_array( $arrCategories )) {76 if (is_array($arrCategories)) { 73 77 74 function _fd_compair_cat( $a, $b ) { 75 return strcmp( $a->name, $b->name ); 78 function _fd_compair_cat($a, $b) { 79 return strcmp($a->name, $b->name); 80 } 81 82 usort($arrCategories, '_fd_compair_cat'); 83 84 return $arrCategories; 76 85 } 77 78 usort( $arrCategories, '_fd_compair_cat' );79 80 return $arrCategories;81 86 } 87 } catch (Exception $e) { 88 //todo 82 89 } 83 90 84 return array( (object) array( 'id' => '0', 'name' => 'Erro ao buscar categorias. Sistema Lomadee indisponível. Tente novamente em alguns minutos.' ));91 return array((object)array('id' => '0', 'name' => 'Erro ao buscar categorias. Sistema Lomadee indisponível. Tente novamente em alguns minutos.')); 85 92 } 86 93 … … 95 102 } 96 103 97 if ( $arrRetorno && property_exists( $arrRetorno, 'requestInfo' ) && $arrRetorno->requestInfo->message === 'SUCCESS' && property_exists( $arrRetorno, 'stores' ) ) { 104 if ($arrRetorno && property_exists($arrRetorno, 'requestInfo') && ($arrRetorno->requestInfo->message === 'SUCCESS' || 105 strpos('DEPRECATED', $arrRetorno->requestInfo->message) !== FALSE) 106 && property_exists($arrRetorno, 'stores')) { 98 107 99 108 $arrStores = $arrRetorno->stores; … … 151 160 <?php endif; ?> 152 161 </div> 153 <!-- TEMP disabled -->154 <!-- --><?php162 <!-- TEMP disabled --> 163 <?php 155 164 // if ( ! FdOptions::bool_has_email() ): 156 165 // $text = 'Insira aqui seu email para aproveitar todos os recursos que o Fastdee tem a te oferecer!'; … … 158 167 // endif; 159 168 // $nonce = wp_create_nonce( '_nonce_fd_get_email_ldk154' ); 160 // ?> 161 <!-- <input type="hidden" id="fd_get_email_nonce" value="--><?php //echo esc_attr( $nonce ) ?><!--">--> 162 <!-- --><?php 169 // 170 ?> 171 <!-- <input type="hidden" id="fd_get_email_nonce" value="--><?php //echo esc_attr( $nonce ) 172 ?><!--">--> 173 <?php 163 174 } 164 175 -
fastdee/trunk/includes/libraries/alv2/alv2.php
r1781472 r2198571 40 40 41 41 $queryArgs = http_build_query( $args ); 42 $url = "https://{$this->getEnvironment()}.lomadee.com/v 2/1510930263100ac55cf1f/{$resourceName}/{$serviceName}/{$objectId}?{$queryArgs}";42 $url = "https://{$this->getEnvironment()}.lomadee.com/v3/1510930263100ac55cf1f/{$resourceName}/{$serviceName}/{$objectId}?{$queryArgs}"; 43 43 //echo $url;die; 44 44 $curl = curl_init(); … … 221 221 return 222 222 ! empty( $response ) && 223 property_exists( $response, 'requestInfo' ) && property_exists( $response->requestInfo, 'message' ) && $response->requestInfo->message === 'SUCCESS' && 223 property_exists( $response, 'requestInfo' ) && property_exists( $response->requestInfo, 'message' ) && ($response->requestInfo->message === 'SUCCESS' || 224 strpos('DEPRECATED', $response->requestInfo->message) !== FALSE) && //TODO fix 224 225 property_exists( $response, 'requestInfo' ) && property_exists( $response->requestInfo, 'status' ) && $response->requestInfo->status === 'OK'; 225 226 } -
fastdee/trunk/includes/pages/class-fd-coupons-page.php
r1913613 r2198571 35 35 $arrRetorno = json_decode( $strRetorno ); 36 36 37 if ( $arrRetorno && property_exists( $arrRetorno, 'requestInfo' ) && $arrRetorno->requestInfo->message === 'SUCCESS' ) { 37 if ( $arrRetorno && property_exists( $arrRetorno, 'requestInfo' ) && ($arrRetorno->requestInfo->message === 'SUCCESS' || 38 strpos('DEPRECATED', $arrRetorno->requestInfo->message) !== FALSE) ) { 38 39 $arrCategories = $arrRetorno->categories; 39 40 … … 57 58 $arrRetorno = json_decode( $strRetorno ); 58 59 59 if ( $arrRetorno && property_exists( $arrRetorno, 'requestInfo' ) && $arrRetorno->requestInfo->message === 'SUCCESS' ) { 60 if ( $arrRetorno && property_exists( $arrRetorno, 'requestInfo' ) && ($arrRetorno->requestInfo->message === 'SUCCESS' || 61 strpos('DEPRECATED', $arrRetorno->requestInfo->message) !== FALSE) ) { 60 62 $arrCategories = $arrRetorno->stores; 61 63
Note: See TracChangeset
for help on using the changeset viewer.