Skip to content

Some small fixes #9

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
bentideswell wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Some small fixes #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 24 additions & 14 deletions app/code/local/Shiptheory/Shippinglabels/Model/Observer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,34 @@
<?php

/**
* @category Shiptheory
* @package Shiptheory_Shippinglabels
*/
class Shiptheory_Shippinglabels_Model_Observer {

public function addShippingAction($observer) {
class Shiptheory_Shippinglabels_Model_Observer
{
public function addShippingAction($observer)
{
if (!Mage::getStoreConfig('shippinglabels/misc/enabled')) {
return;
}

if (!Mage::getStoreConfig('shippinglabels/misc/enabled')) {
return;
}
$block = $observer->getEvent()->getBlock();

$block = $observer->getEvent()->getBlock();
if ($block instanceof Mage_Adminhtml_Block_Widget_Grid_Massaction_Abstract && $block->getRequest()->getControllerName() == 'sales_order') {
$block->addItem('shippinglabels', array(
'label' => 'Ship Orders',
'url' => Mage::app()->getStore()->getUrl('adminhtml/shippinglabels_shippinglabels/ship')
));
}
if ($block instanceof Mage_Adminhtml_Block_Widget_Grid_Massaction_Abstract && $block->getRequest()->getControllerName() == 'sales_order') {
$block->addItem('shippinglabels', array(
'label' => $this->_getActionLabel(),
'url' => Mage::app()->getStore()->getUrl('adminhtml/shippinglabels_shippinglabels/ship')
));
}
}

/*
* This allows the action label to be easiy modified by other modules
*
* @todo move this to the config
* @return string
*/
protected function _getActionLabel()
{
return Mage::helper('shippinglabels')->__('Ship Orders');
}
}
2 changes: 1 addition & 1 deletion ...iptheory/Shippinglabels/controllers/Adminhtml/Shippinglabels/ShippinglabelsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public function shipAction() {
if ($order->canShip()) {

$item_qty = $order->getItemsCollection()->getSize();
$shipment = Mage::getModel('sales/service_order', $order)->prepareShipment($item_qty);
$shipment = Mage::getModel('sales/service_order', $order)->prepareShipment(array($item_qty));
$shipment = new Mage_Sales_Model_Order_Shipment_Api();

$success = false;
Expand Down