Skip to content

Commit 943c71a

Browse files
committed
update
1 parent 599e8ef commit 943c71a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @package Mage_Adminhtml
88
*/
99

10-
use Varien_Date as Date;
10+
use Carbon\Carbon;
1111

1212
/**
1313
* Custom import CSV file field for shipping table rates
@@ -32,7 +32,7 @@ public function getElementHtml()
3232
{
3333
$html = '';
3434

35-
$html .= '<input id="time_condition" type="hidden" name="' . $this->getName() . '" value="' . Date::toTimestamp(true) . '" />';
35+
$html .= '<input id="time_condition" type="hidden" name="' . $this->getName() . '" value="' . Carbon::now()->getTimestamp() . '" />';
3636

3737
$html .= <<<EndHTML
3838
<script type="text/javascript">

app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @package Mage_Adminhtml
88
*/
99

10-
use Varien_Date as Date;
10+
use Carbon\Carbon;
1111

1212
/**
1313
* Adminhtml sales order shipment controller
@@ -717,7 +717,7 @@ protected function _createPdfPageFromImageString($imageString)
717717

718718
imageinterlace($image, 0);
719719
$tmpFileName = sys_get_temp_dir() . DS . 'shipping_labels_'
720-
. uniqid(random_int(0, mt_getrandmax()) . Date::toTimestamp(true) . '.png');
720+
. uniqid(random_int(0, mt_getrandmax()) . Carbon::now()->getTimestamp() . '.png');
721721
imagepng($image, $tmpFileName);
722722
$pdfImage = Zend_Pdf_Image::imageWithPath($tmpFileName);
723723
$page->drawImage($pdfImage, 0, 0, $xSize, $ySize);

0 commit comments

Comments
 (0)