Skip to content

Master > Develop #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 13 commits into from
Sep 23, 2020
Merged

Master > Develop #176

merged 13 commits into from
Sep 23, 2020

Conversation

rsbowers
Copy link
Contributor

Merging down to develop after Release 3.0.0

rsbowers and others added 12 commits September 10, 2020 18:48
@rsbowers rsbowers requested a review from agrohs September 23, 2020 22:19
@todo
Copy link

todo bot commented Sep 23, 2020

should this be customerId or entity id??

magento_extension/src/app/code/community/Zendesk/Zendesk/Helper/Data.php

Lines 459 to 464 in b6aa80b

$id = $order->getCustomerId(); // TODO: should this be customerId or entity id??
$email = $order->getCustomerEmail();
$customer = array();
if ($isGuest){
$customer['type'] = 'guest';

This comment was generated by todo based on a TODO comment in b6aa80b in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

can we get customer URL or timestamps??

magento_extension/src/app/code/community/Zendesk/Zendesk/Helper/Data.php

Lines 475 to 480 in b6aa80b

// TODO: can we get customer URL or timestamps??
return $customer;
}
protected function formatAddress($address)

This comment was generated by todo based on a TODO comment in b6aa80b in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

get without tax

magento_extension/src/app/code/community/Zendesk/Zendesk/Helper/Data.php

Lines 575 to 580 in b6aa80b

'without_tax' => $this->formatPrice($order->getGrandTotal() - $order->getTaxAmount(), $currency), // TODO: get without tax
'tax' => $this->formatPrice($order->getTaxAmount(), $currency) // TODO: get tax
),
'timestamps' => array(
'created_at' => $order->getCreatedAt(),
'updated_at' => $order->getUpdatedAt(),

This comment was generated by todo based on a TODO comment in b6aa80b in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

get tax

magento_extension/src/app/code/community/Zendesk/Zendesk/Helper/Data.php

Lines 576 to 581 in b6aa80b

'tax' => $this->formatPrice($order->getTaxAmount(), $currency) // TODO: get tax
),
'timestamps' => array(
'created_at' => $order->getCreatedAt(),
'updated_at' => $order->getUpdatedAt(),
)

This comment was generated by todo based on a TODO comment in b6aa80b in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

grab authorization as well

magento_extension/src/app/code/community/Zendesk/Zendesk/Helper/Data.php

Lines 686 to 691 in b6aa80b

$transaction = $payment->lookupTransaction($lastTransId, 'capture'); // TODO grab authorization as well
}
if (!empty($transaction)) {
$transactionData = $transaction->getData();
}

This comment was generated by todo based on a TODO comment in b6aa80b in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

validate this is the correct value

magento_extension/src/app/code/community/Zendesk/Zendesk/Helper/Data.php

Lines 696 to 701 in b6aa80b

'id' => $transactionData['transaction_id'], //TODO validate this is the correct value
'type' => $transactionData['txn_type'], //TODO is this only always payment? or can this be refund?
'reference' => $transactionData['txn_id'], //TODO validate this is the correct value
'gateway' => $gateway, //TODO validate this is the correct value
'status' => $payment->getCcCidStatus(), //TODO validate this is the correct value
'meta' => array(

This comment was generated by todo based on a TODO comment in b6aa80b in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

is this only always payment? or can this be refund?

magento_extension/src/app/code/community/Zendesk/Zendesk/Helper/Data.php

Lines 697 to 702 in b6aa80b

'type' => $transactionData['txn_type'], //TODO is this only always payment? or can this be refund?
'reference' => $transactionData['txn_id'], //TODO validate this is the correct value
'gateway' => $gateway, //TODO validate this is the correct value
'status' => $payment->getCcCidStatus(), //TODO validate this is the correct value
'meta' => array(
'display_price' => $this->formatPrice($transactionAmount, $currency),

This comment was generated by todo based on a TODO comment in b6aa80b in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

validate this is the correct value

magento_extension/src/app/code/community/Zendesk/Zendesk/Helper/Data.php

Lines 698 to 703 in b6aa80b

'reference' => $transactionData['txn_id'], //TODO validate this is the correct value
'gateway' => $gateway, //TODO validate this is the correct value
'status' => $payment->getCcCidStatus(), //TODO validate this is the correct value
'meta' => array(
'display_price' => $this->formatPrice($transactionAmount, $currency),
'timestamps' => array(

This comment was generated by todo based on a TODO comment in b6aa80b in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

validate this is the correct value

magento_extension/src/app/code/community/Zendesk/Zendesk/Helper/Data.php

Lines 699 to 704 in b6aa80b

'gateway' => $gateway, //TODO validate this is the correct value
'status' => $payment->getCcCidStatus(), //TODO validate this is the correct value
'meta' => array(
'display_price' => $this->formatPrice($transactionAmount, $currency),
'timestamps' => array(
'created_at' => $order->getCreatedAt(),

This comment was generated by todo based on a TODO comment in b6aa80b in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

validate this is the correct value

magento_extension/src/app/code/community/Zendesk/Zendesk/Helper/Data.php

Lines 700 to 705 in b6aa80b

'status' => $payment->getCcCidStatus(), //TODO validate this is the correct value
'meta' => array(
'display_price' => $this->formatPrice($transactionAmount, $currency),
'timestamps' => array(
'created_at' => $order->getCreatedAt(),
'updated_at' => $order->getUpdatedAt(),

This comment was generated by todo based on a TODO comment in b6aa80b in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

!!!!!!!: read version from config.xml

magento_extension/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php

Lines 23 to 28 in b6aa80b

// TODO!!!!!!!: read version from config.xml
// $configSettings = Mage::getSingleton('Zendesk_Zendesk/config');
// Mage::log(json_encode($configSettings), null, 'zendesk.log');
$this->getResponse()->setHeader('X-Extension-Version', '3.0.0');
return $this;
}

This comment was generated by todo based on a TODO comment in b6aa80b in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

does this bring back guest cutsomers

magento_extension/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php

Lines 465 to 470 in b6aa80b

// TODO does this bring back guest cutsomers
foreach($customerFilters as $customerKey => $customerValue) {
$customerCollection->addFieldToFilter($customerKey, $customerValue);
}
foreach($genericFilters as $genericKey => $genericValue) {

This comment was generated by todo based on a TODO comment in b6aa80b in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

!!: implement this method

magento_extension/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php

Lines 557 to 562 in b6aa80b

// TODO!!: implement this method
$info = Mage::helper('zendesk')->getOrderDetailExtended($order);
$this->getResponse()
->setBody(json_encode($info))
->setHttpResponseCode(200)

This comment was generated by todo based on a TODO comment in b6aa80b in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

display config version here in UI -->

magento_extension/src/app/code/community/Zendesk/Zendesk/etc/system.xml

Lines 27 to 30 in b6aa80b

<!-- TODO: display config version here in UI -->
<zendesk translate="label" module="zendesk">
<label>Zendesk</label>
<class>zendesk-section</class>

This comment was generated by todo based on a TODO comment in b6aa80b in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

is this only always payment? or can this be refund?

magento_extension/src/app/code/community/Zendesk/Zendesk/Helper/Data.php

Lines 697 to 702 in 43bf3a2

'type' => $transactionData['txn_type'], //TODO is this only always payment? or can this be refund?
'reference' => $transactionData['txn_id'], //TODO validate this is the correct value
'gateway' => $gateway, //TODO validate this is the correct value
'status' => $payment->getCcCidStatus(), //TODO validate this is the correct value
'meta' => array(
'display_price' => $this->formatPrice($transactionAmount, $currency),

This comment was generated by todo based on a TODO comment in 43bf3a2 in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

!!!!!!!: read version from config.xml

magento_extension/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php

Lines 23 to 28 in 43bf3a2

// TODO!!!!!!!: read version from config.xml
// $configSettings = Mage::getSingleton('Zendesk_Zendesk/config');
// Mage::log(json_encode($configSettings), null, 'zendesk.log');
$this->getResponse()->setHeader('X-Extension-Version', '3.0.0');
return $this;
}

This comment was generated by todo based on a TODO comment in 43bf3a2 in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

does this bring back guest cutsomers

magento_extension/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php

Lines 465 to 470 in 43bf3a2

// TODO does this bring back guest cutsomers
foreach($customerFilters as $customerKey => $customerValue) {
$customerCollection->addFieldToFilter($customerKey, $customerValue);
}
foreach($genericFilters as $genericKey => $genericValue) {

This comment was generated by todo based on a TODO comment in 43bf3a2 in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

!!: implement this method

magento_extension/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php

Lines 557 to 562 in 43bf3a2

// TODO!!: implement this method
$info = Mage::helper('zendesk')->getOrderDetailExtended($order);
$this->getResponse()
->setBody(json_encode($info))
->setHttpResponseCode(200)

This comment was generated by todo based on a TODO comment in 43bf3a2 in #176. cc @agnostack.

@todo
Copy link

todo bot commented Sep 23, 2020

display config version here in UI -->

magento_extension/src/app/code/community/Zendesk/Zendesk/etc/system.xml

Lines 27 to 30 in 43bf3a2

<!-- TODO: display config version here in UI -->
<zendesk translate="label" module="zendesk">
<label>Zendesk</label>
<class>zendesk-section</class>

This comment was generated by todo based on a TODO comment in 43bf3a2 in #176. cc @agnostack.

@agrohs agrohs merged commit df8a56f into develop Sep 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@agrohs agrohs agrohs approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rsbowers @agrohs