Skip to content

Fix calculation for logged in customer without an active quote #5

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

Open
avstudnitz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix calculation for logged in customer without an active quote #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5b3431
Retrieve country data from logged in customer who has no valid quote yet
avstudnitz Feb 5, 2014
c6c1ec0
Adjust to Magento coding standards
avstudnitz Feb 5, 2014
9b09137
Added composer.json and modman files
avstudnitz Feb 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
325 changes: 165 additions & 160 deletions app/code/community/Xonu/FGP/Model/Calculation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,186 +7,191 @@ class Xonu_FGP_Model_Calculation extends Mage_Tax_Model_Calculation
{
protected $adminSession = false;

private function log($msg) {
$log = file_get_contents('/log.txt');
file_put_contents( '/log.txt', $log . "\n" . $msg);
}

// set origin to destination
public function getRateOriginRequest($store = null)
{
public function getRateOriginRequest($store = null)
{
if (Mage::app()->getStore()->isAdmin() || Mage::getDesign()->getArea() == 'adminhtml') {
$this->adminSession = true; // creating order in the backend
}

$session = $this->getSession();
if($session->hasQuote() || $this->adminSession) // getQuote() would lead to infinite loop here when switching currency
{
$quote = $session->getQuote();
if($quote->getIsActive() || $this->adminSession)
{
if ($session->hasQuote() || $this->adminSession) { // getQuote() would lead to infinite loop here when switching currency

$quote = $session->getQuote();

if ($quote->getIsActive() || $this->adminSession) {
// use destination of the existing quote as origin if quote exists
$request = $this->getRateRequest(
$quote->getShippingAddress(),
$quote->getBillingAddress(),
$quote->getCustomerTaxClassId(),
$store
);

return $request;
}
else{
return $this->getDefaultDestination();
}
}
else // quote is not available when switching the currency
{
return $this->getDefaultDestination();
}
}

public function getSession()
$request = $this->getRateRequest(
$quote->getShippingAddress(),
$quote->getBillingAddress(),
$quote->getCustomerTaxClassId(),
$store
);

return $request;
}

if (Mage::getSingleton('customer/session')->isLoggedIn()) {

$customer = Mage::getSingleton('customer/session')->getCustomer();
if (($billingAddress = $customer->getDefaultBillingAddress())
&& ($shippingAddress = $customer->getDefaultShippingAddress())) {

// use customer addresses as origin if customer is logged in
$request = $this->getRateRequest(
$shippingAddress,
$billingAddress,
$customer->getTaxClassId(),
$store
);

return $request;
}
}

return $this->getDefaultDestination();
}

// quote is not available when switching the currency

return $this->getDefaultDestination();

}

public function getSession()
{
if ($this->adminSession) {
return Mage::getSingleton('adminhtml/session_quote'); // order creation in the backend
} else {
return Mage::getSingleton('checkout/session'); // default order creation in the frontend
}
return Mage::getSingleton('checkout/session'); // default order creation in the frontend
}
}

// sometimes it is required to use shipping address from the quote instead of the default address
public function getRateRequest(
$shippingAddress = null,
$billingAddress = null,
$customerTaxClass = null,
$store = null)
{
if ($shippingAddress === false && $billingAddress === false && $customerTaxClass === false) {
return $this->getRateOriginRequest($store);
}
$address = new Varien_Object();
$customer = $this->getCustomer();
$basedOn = Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_BASED_ON, $store);

if (($shippingAddress === false && $basedOn == 'shipping')
|| ($billingAddress === false && $basedOn == 'billing')) {
$basedOn = 'default';
} else {
if ((($billingAddress === false || is_null($billingAddress) || !$billingAddress->getCountryId())
&& $basedOn == 'billing')
|| (($shippingAddress === false || is_null($shippingAddress) || !$shippingAddress->getCountryId())
&& $basedOn == 'shipping')
){
$session = Mage::getSingleton('checkout/session');
if ($customer) {
$defBilling = $customer->getDefaultBillingAddress();
$defShipping = $customer->getDefaultShippingAddress();

if ($basedOn == 'billing' && $defBilling && $defBilling->getCountryId()) {
$billingAddress = $defBilling;
} else if ($basedOn == 'shipping' && $defShipping && $defShipping->getCountryId()) {
$shippingAddress = $defShipping;
}
}

// if still got no address, try to get it from quote
if (($basedOn == 'billing' && !$billingAddress) || ($basedOn == 'shipping' && !$shippingAddress)) {
if ($session->hasQuote() || $this->adminSession) {
$quote = $session->getQuote();
$isActive = $quote->getIsActive();

if ($isActive) {
$quoteBillingAddress = $quote->getBillingAddress();
$quoteShippingAddress = $quote->getShippingAddress();

// check if the addresses have a country
if ($basedOn == 'billing' && $quoteBillingAddress && $quoteBillingAddress->getCountryId()) {
$billingAddress = $quoteBillingAddress;
} else if ($basedOn == 'shipping' && $quoteShippingAddress && $quoteShippingAddress->getCountryId()) {
$shippingAddress = $quoteShippingAddress;
} else {
$basedOn = 'default';
}
} else {
$basedOn = 'default';
}
} else {
$basedOn = 'default';
}
}

// if we got an address, but it has no country, calculate tax based on default
if (($basedOn == 'billing' && $billingAddress && !$billingAddress->getCountryId())
|| ($basedOn == 'shipping' && $shippingAddress && !$shippingAddress->getCountryId())
) {
$basedOn = 'default';
}
}
}
switch ($basedOn) {
case 'billing':
$address = $billingAddress;
break;
case 'shipping':
$address = $shippingAddress;
break;
case 'origin':
$address = $this->getRateOriginRequest($store);
break;
case 'default':
$address
->setCountryId(Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_COUNTRY, $store))
->setRegionId(Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_REGION, $store))
->setPostcode(Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_POSTCODE, $store));
break;
}

if (is_null($customerTaxClass) && $customer) {
$customerTaxClass = $customer->getTaxClassId();
} elseif (($customerTaxClass === false) || !$customer) {
$customerTaxClass = $this->getDefaultCustomerTaxClass($store);
}

$request = new Varien_Object();
$request
->setCountryId($address->getCountryId())
->setRegionId($address->getRegionId())
->setPostcode($address->getPostcode())
->setStore($store)
->setCustomerClassId($customerTaxClass);
return $request;
}


private function getDefaultDestination($store = null)
{
$this->log('default dest');
public function getRateRequest(
$shippingAddress = null,
$billingAddress = null,
$customerTaxClass = null,
$store = null)
{
if ($shippingAddress === false && $billingAddress === false && $customerTaxClass === false) {
return $this->getRateOriginRequest($store);
}
$address = new Varien_Object();
$customer = $this->getCustomer();
$basedOn = Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_BASED_ON, $store);

if (($shippingAddress === false && $basedOn == 'shipping')
|| ($billingAddress === false && $basedOn == 'billing')) {
$basedOn = 'default';
} else {
if ((($billingAddress === false || is_null($billingAddress) || !$billingAddress->getCountryId())
&& $basedOn == 'billing')
|| (($shippingAddress === false || is_null($shippingAddress) || !$shippingAddress->getCountryId())
&& $basedOn == 'shipping')
) {
$session = Mage::getSingleton('checkout/session');
if ($customer) {
$defBilling = $customer->getDefaultBillingAddress();
$defShipping = $customer->getDefaultShippingAddress();

if ($basedOn == 'billing' && $defBilling && $defBilling->getCountryId()) {
$billingAddress = $defBilling;
} else if ($basedOn == 'shipping' && $defShipping && $defShipping->getCountryId()) {
$shippingAddress = $defShipping;
} else {
if($session->hasQuote() || $this->adminSession) {
$quote = $session->getQuote();
$isActive = $quote->getIsActive();
if($isActive) {
$shippingAddress = $quote->getShippingAddress();
$billingAddress = $quote->getBillingAddress();
} else {
$basedOn = 'default';
}
} else {
$basedOn = 'default';
}
}
} else {

if($session->hasQuote() || $this->adminSession) {
$quote = $session->getQuote();
$isActive = $quote->getIsActive();
if ($isActive) {
$shippingAddress = $quote->getShippingAddress();
$billingAddress = $quote->getBillingAddress();
} else {
$basedOn = 'default';
}
} else {
$basedOn = 'default';
}
}
}
}
switch ($basedOn) {
case 'billing':
$address = $billingAddress;
break;
case 'shipping':
$address = $shippingAddress;
break;
case 'origin':
$address = $this->getRateOriginRequest($store);
break;
case 'default':
$address
->setCountryId(Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_COUNTRY, $store))
->setRegionId(Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_REGION, $store))
->setPostcode(Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_POSTCODE, $store));
break;
}

if (is_null($customerTaxClass) && $customer) {
$customerTaxClass = $customer->getTaxClassId();
} elseif (($customerTaxClass === false) || !$customer) {
$customerTaxClass = $this->getDefaultCustomerTaxClass($store);
}

$request = new Varien_Object();
$request
->setCountryId($address->getCountryId())
->setRegionId($address->getRegionId())
->setPostcode($address->getPostcode())
->setStore($store)
->setCustomerClassId($customerTaxClass);
return $request;
}


protected function getDefaultDestination($store = null)
{
$address = new Varien_Object();
$request = new Varien_Object();
$request = new Varien_Object();

$address
->setCountryId(Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_COUNTRY, $store))
->setRegionId(Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_REGION, $store))
->setPostcode(Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_POSTCODE, $store));
$address
->setCountryId(Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_COUNTRY, $store))
->setRegionId(Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_REGION, $store))
->setPostcode(Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_POSTCODE, $store));

$customerTaxClass = null;
$customer = $this->getCustomer();
$customerTaxClass = null;
$customer = $this->getCustomer();

if (is_null($customerTaxClass) && $customer) {
$customerTaxClass = $customer->getTaxClassId();
} elseif (($customerTaxClass === false) || !$customer) {
$customerTaxClass = $this->getDefaultCustomerTaxClass($store);
}
if (is_null($customerTaxClass) && $customer) {
$customerTaxClass = $customer->getTaxClassId();
} elseif (($customerTaxClass === false) || !$customer) {
$customerTaxClass = $this->getDefaultCustomerTaxClass($store);
}

$request
->setCountryId($address->getCountryId())
->setRegionId($address->getRegionId())
->setPostcode($address->getPostcode())
->setStore($store)
->setCustomerClassId($customerTaxClass);
$request
->setCountryId($address->getCountryId())
->setRegionId($address->getRegionId())
->setPostcode($address->getPostcode())
->setStore($store)
->setCustomerClassId($customerTaxClass);


return $request;
}
return $request;
}
}
16 changes: 16 additions & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name":"xonu/fgp",
"type":"magento-module",
"license":"http://xonu.de/license/",
"homepage":"https://github.com/xonu/FGP",
"description":"This extension will fix the gross price such that all customers pay the same while calculating country-specific tax rate.",
"authors":[
{
"name":"Pawel Kazakow",
"email":"support@xonu.de"
}
],
"require":{
"magento-hackathon/magento-composer-installer":"*"
}
}
3 changes: 3 additions & 0 deletions modman
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
app/etc/modules/Xonu_FGP.xml app/etc/modules/Xonu_FGP.xml

app/code/community/Xonu/FGP app/code/community/Xonu/FGP