From b79e30ce732a8a4379353e40b56f793211b232ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gast=C3=B3n=20Di=20Sacco?= Date: Wed, 23 Nov 2016 16:29:18 -0300 Subject: [PATCH 1/6] Added "Add / update" comment. Update was missing. Should have the same description as in CartItemRepositoryInterface.php. Currently only says add, but the API works for add and update too. --- app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php b/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php index 6f06d3a144254..ebd3eeacc7bba 100644 --- a/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php +++ b/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php @@ -21,7 +21,7 @@ interface GuestCartItemRepositoryInterface public function getList($cartId); /** - * Add the specified item to the specified cart. + * Add/update the specified cart item. * * @param \Magento\Quote\Api\Data\CartItemInterface $cartItem The item. * @return \Magento\Quote\Api\Data\CartItemInterface Item. From 5d5d9d9596d6a93f533041c24698360d6016f018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gast=C3=B3n=20Di=20Sacco?= Date: Thu, 24 Nov 2016 12:03:18 -0300 Subject: [PATCH 2/6] Update GuestCartItemRepositoryInterface.php --- app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php b/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php index ebd3eeacc7bba..737f6bc538072 100644 --- a/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php +++ b/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php @@ -21,7 +21,7 @@ interface GuestCartItemRepositoryInterface public function getList($cartId); /** - * Add/update the specified cart item. + * Add/update the specified cart item. * * @param \Magento\Quote\Api\Data\CartItemInterface $cartItem The item. * @return \Magento\Quote\Api\Data\CartItemInterface Item. From ea943dcb717f96c1e5bfa66fa37ec622f5b85d5f Mon Sep 17 00:00:00 2001 From: Oleksandr Turiak Date: Mon, 6 Mar 2017 19:20:05 +0100 Subject: [PATCH 3/6] Change link text from "Report a Bug" to "Report an Issue" --- app/code/Magento/Backend/i18n/en_US.csv | 2 +- .../Magento/Backend/view/adminhtml/templates/page/report.phtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv index 9144df6c8f7d9..17df68ab5eb9f 100644 --- a/app/code/Magento/Backend/i18n/en_US.csv +++ b/app/code/Magento/Backend/i18n/en_US.csv @@ -250,7 +250,7 @@ Minute,Minute "JavaScript may be disabled in your browser.","JavaScript may be disabled in your browser." "To use this website you must first enable JavaScript in your browser.","To use this website you must first enable JavaScript in your browser." "This is only a demo store. You can browse and place orders, but nothing will be processed.","This is only a demo store. You can browse and place orders, but nothing will be processed." -"Report a Bug","Report a Bug" +"Report an Issue","Report an Issue" "Store View:","Store View:" "Stores Configuration","Stores Configuration" "Please confirm scope switching. All data that hasn\'t been saved will be lost.","Please confirm scope switching. All data that hasn\'t been saved will be lost." diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml index ef96cb1f87b60..76b8534c670ff 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml @@ -8,5 +8,5 @@ ?> getBugreportUrl()): ?> - + From 708287dd3c586ff1269f8e86581e5c1ec6c2678e Mon Sep 17 00:00:00 2001 From: Ivan Krsnik Date: Thu, 16 Mar 2017 15:51:38 +0100 Subject: [PATCH 4/6] Removed unused dependencys - Magento\Sales\Model\ResourceModel\Order as Resource; -Magento\Framework\Api\SortOrder; --- app/code/Magento/Sales/Model/OrderRepository.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/code/Magento/Sales/Model/OrderRepository.php b/app/code/Magento/Sales/Model/OrderRepository.php index 0dfcd2100e2e8..ae8930276ea30 100644 --- a/app/code/Magento/Sales/Model/OrderRepository.php +++ b/app/code/Magento/Sales/Model/OrderRepository.php @@ -6,7 +6,6 @@ namespace Magento\Sales\Model; use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface; -use Magento\Sales\Model\ResourceModel\Order as Resource; use Magento\Sales\Model\ResourceModel\Metadata; use Magento\Sales\Model\Order\ShippingAssignmentBuilder; use Magento\Sales\Api\Data\OrderSearchResultInterfaceFactory as SearchResultFactory; @@ -16,7 +15,6 @@ use Magento\Sales\Api\Data\ShippingAssignmentInterface; use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\Exception\InputException; -use Magento\Framework\Api\SortOrder; /** * Repository class for @see OrderInterface From aa30a327a8727a7ac5b37fe081345cabf009bbfe Mon Sep 17 00:00:00 2001 From: Bartek Igielski Date: Thu, 16 Mar 2017 16:27:46 +0100 Subject: [PATCH 5/6] Rename config file to be sample and add previous one to gitignore --- .gitignore | 1 + dev/tools/grunt/configs/{themes.js => themes.js.sample} | 0 2 files changed, 1 insertion(+) rename dev/tools/grunt/configs/{themes.js => themes.js.sample} (100%) diff --git a/.gitignore b/.gitignore index b7f681b292e4d..21ba71c81d6b2 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ atlassian* /.grunt /Gruntfile.js /package.json +/dev/tools/grunt/configs/themes.js /pub/media/*.* !/pub/media/.htaccess diff --git a/dev/tools/grunt/configs/themes.js b/dev/tools/grunt/configs/themes.js.sample similarity index 100% rename from dev/tools/grunt/configs/themes.js rename to dev/tools/grunt/configs/themes.js.sample From a0067192a79220860d0bd0a945ea73b13c60e983 Mon Sep 17 00:00:00 2001 From: Bartek Igielski Date: Thu, 16 Mar 2017 18:53:05 +0100 Subject: [PATCH 6/6] Revert of previous changes. Added proper config files to gitignore. --- .gitignore | 3 ++- dev/tools/grunt/configs/{themes.js.sample => themes.js} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename dev/tools/grunt/configs/{themes.js.sample => themes.js} (100%) diff --git a/.gitignore b/.gitignore index 21ba71c81d6b2..d4e35bd33d65e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,8 @@ atlassian* /.grunt /Gruntfile.js /package.json -/dev/tools/grunt/configs/themes.js +/grunt-config.json +/dev/tools/grunt/configs/local-themes.js /pub/media/*.* !/pub/media/.htaccess diff --git a/dev/tools/grunt/configs/themes.js.sample b/dev/tools/grunt/configs/themes.js similarity index 100% rename from dev/tools/grunt/configs/themes.js.sample rename to dev/tools/grunt/configs/themes.js