Skip to content

Commit

Permalink
Fixed shipment email
Browse files Browse the repository at this point in the history
  • Loading branch information
David Scott Kirby committed May 23, 2014
1 parent 5f2a4ce commit 3e4b5c8
Showing 1 changed file with 3 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,8 @@ protected function _createShipment()

$transactionSave = Mage::getModel('core/resource_transaction')->addObject($shipment)->addObject($shipment->getOrder())->save();

$this->sendEmail($shipment, $packageToShip, $packageShipped);
$shipment->sendEmail();

} else {
$shipment->addTrack($track);
}
Expand Down Expand Up @@ -556,14 +557,7 @@ protected function _createShipment()
}
return $retval;
}

public function sendEmail($shipment, $packageToShip, $packageShipped)
{
if ($packageToShip->getData('confirmation')) {
$shipment->sendEmail();
}
return $shipment;
}


public function jsonPackageItems($packageToShip)
{
Expand Down

0 comments on commit 3e4b5c8

Please sign in to comment.