Merge pull request #3 from magmodules/development

1.0.5
magmodules · Jun 1, 2017 · 80c493b · 80c493b
2 parents 7b8af3f + ac84eac
commit 80c493b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/app/code/community/Magmodules/Fadello/Model/Api.php b/app/code/community/Magmodules/Fadello/Model/Api.php
@@ -270,10 +270,13 @@ public function shipOrder($orderId)
             $track = Mage::getModel('sales/order_shipment_track')->addData($arrTracking);
             $shipment->addTrack($track);
             $shipment->register();
-            $shipment->sendEmail(true);
-            $shipment->setEmailSent(true);
             $shipment->getOrder()->setIsInProcess(true);
             Mage::getModel('core/resource_transaction')->addObject($shipment)->addObject($shipment->getOrder())->save();
+
+            $shipment->sendEmail(true);
+            $shipment->setEmailSent(true);
+            $shipment->save();
+
             unset($shipment);
         } catch (Exception $e) {
             $result['status'] = 'Error';

diff --git a/app/code/community/Magmodules/Fadello/controllers/Adminhtml/FadelloController.php b/app/code/community/Magmodules/Fadello/controllers/Adminhtml/FadelloController.php
@@ -114,23 +114,32 @@ public function getPdfAction()
                         $labelLinks[] = '<a href="' . $url . '">Label ' . $colli . '</a>';
                         if ($download == $colli) {
                             $filename = 'Fadello-' . $result['increment_id'] . '-L' . $colli . '.pdf';
-                            header('Content-Type: application/pdf');
-                            header('Content-Disposition: attachment; filename=' . $filename);
-                            header('Pragma: no-cache');
+                            $this->getResponse()
+                                ->setHttpResponseCode(200)
+                                ->setHeader('Pragma', 'public', true)
+                                ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0', true)
+                                ->setHeader('Content-type', 'application/force-download')
+                                ->setHeader('Content-Length', filesize($label))
+                                ->setHeader('Content-Disposition', 'inline' . '; filename=' . $filename);
+                            $this->getResponse()->clearBody();
+                            $this->getResponse()->sendHeaders();
                             readfile($label);
-                            exit;
                         }
-
                         $colli++;
                     }
 
                     Mage::getSingleton('core/session')->addSuccess('Download: ' . implode(', ', $labelLinks));
                 } else {
-                    header('Content-Type: application/pdf');
-                    header('Content-Disposition: attachment; filename=' . $result['file_name']);
-                    header('Pragma: no-cache');
+                    $this->getResponse()
+                        ->setHttpResponseCode(200)
+                        ->setHeader('Pragma', 'public', true)
+                        ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0', true)
+                        ->setHeader('Content-type', 'application/force-download')
+                        ->setHeader('Content-Length', filesize($result['label_url']))
+                        ->setHeader('Content-Disposition', 'inline' . '; filename=' . $result['file_name']);
+                    $this->getResponse()->clearBody();
+                    $this->getResponse()->sendHeaders();
                     readfile($result['label_url']);
-                    exit;
                 }
             } else {
                 if (!empty($result['error_msg'])) {

diff --git a/app/code/community/Magmodules/Fadello/etc/config.xml b/app/code/community/Magmodules/Fadello/etc/config.xml
@@ -20,7 +20,7 @@
 <config>
     <modules>
         <Magmodules_Fadello>
-            <version>1.0.4</version>
+            <version>1.0.5</version>
         </Magmodules_Fadello>
     </modules>
     <global>