rebase from live enviornment
This commit is contained in:
@@ -48,14 +48,16 @@ class Wincher_Account_Action {
|
||||
try {
|
||||
$results = $this->client->get( self::ACCOUNT_URL );
|
||||
|
||||
$usage = $results['limits']['keywords']['usage'];
|
||||
$limit = $results['limits']['keywords']['limit'];
|
||||
$usage = $results['limits']['keywords']['usage'];
|
||||
$limit = $results['limits']['keywords']['limit'];
|
||||
$history = $results['limits']['history_days'];
|
||||
|
||||
return (object) [
|
||||
'canTrack' => \is_null( $limit ) || $usage < $limit,
|
||||
'limit' => $limit,
|
||||
'usage' => $usage,
|
||||
'status' => 200,
|
||||
'canTrack' => \is_null( $limit ) || $usage < $limit,
|
||||
'limit' => $limit,
|
||||
'usage' => $usage,
|
||||
'historyDays' => $history,
|
||||
'status' => 200,
|
||||
];
|
||||
} catch ( \Exception $e ) {
|
||||
return (object) [
|
||||
@@ -72,13 +74,13 @@ class Wincher_Account_Action {
|
||||
*/
|
||||
public function get_upgrade_campaign() {
|
||||
try {
|
||||
$result = $this->client->get( self::UPGRADE_CAMPAIGN_URL );
|
||||
$type = $result['type'];
|
||||
$months = $result['months'];
|
||||
$result = $this->client->get( self::UPGRADE_CAMPAIGN_URL );
|
||||
$type = isset( $result['type'] ) ? $result['type'] : null;
|
||||
$months = isset( $result['months'] ) ? $result['months'] : null;
|
||||
$discount = isset( $result['value'] ) ? $result['value'] : null;
|
||||
|
||||
// We display upgrade discount only if it's a rate discount and positive months.
|
||||
if ( $type === 'RATE' && $months && $months > 0 ) {
|
||||
$discount = $result['value'];
|
||||
// We display upgrade discount only if it's a rate discount and positive months/discount.
|
||||
if ( $type === 'RATE' && $months && $discount ) {
|
||||
|
||||
return (object) [
|
||||
'discount' => $discount,
|
||||
|
||||
@@ -182,10 +182,11 @@ class Wincher_Keyphrases_Action {
|
||||
*
|
||||
* @param array|null $used_keyphrases The currently used keyphrases. Optional.
|
||||
* @param string|null $permalink The current permalink. Optional.
|
||||
* @param string|null $start_at The position start date. Optional.
|
||||
*
|
||||
* @return object The keyphrase chart data.
|
||||
*/
|
||||
public function get_tracked_keyphrases( $used_keyphrases = null, $permalink = null ) {
|
||||
public function get_tracked_keyphrases( $used_keyphrases = null, $permalink = null, $start_at = null ) {
|
||||
try {
|
||||
if ( $used_keyphrases === null ) {
|
||||
$used_keyphrases = $this->collect_all_keyphrases();
|
||||
@@ -213,6 +214,7 @@ class Wincher_Keyphrases_Action {
|
||||
[
|
||||
'keywords' => $used_keyphrases,
|
||||
'url' => $permalink,
|
||||
'start_at' => $start_at,
|
||||
]
|
||||
),
|
||||
[
|
||||
|
||||
Reference in New Issue
Block a user