diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel.php b/webht/libraries/PHPExcel/PHPExcel.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel.php rename to webht/libraries/PHPExcel/PHPExcel.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Autoloader.php b/webht/libraries/PHPExcel/PHPExcel/Autoloader.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Autoloader.php rename to webht/libraries/PHPExcel/PHPExcel/Autoloader.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/APC.php b/webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/APC.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/APC.php rename to webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/APC.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/CacheBase.php b/webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/CacheBase.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/CacheBase.php rename to webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/CacheBase.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/DiscISAM.php b/webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/DiscISAM.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/DiscISAM.php rename to webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/DiscISAM.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/ICache.php b/webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/ICache.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/ICache.php rename to webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/ICache.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Igbinary.php b/webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Igbinary.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Igbinary.php rename to webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Igbinary.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php b/webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php rename to webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php b/webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php rename to webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php b/webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php rename to webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php b/webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php rename to webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/PHPTemp.php b/webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/PHPTemp.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/PHPTemp.php rename to webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/PHPTemp.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/SQLite.php b/webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/SQLite.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/SQLite.php rename to webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/SQLite.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/SQLite3.php b/webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/SQLite3.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/SQLite3.php rename to webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/SQLite3.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php b/webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php rename to webht/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorageFactory.php b/webht/libraries/PHPExcel/PHPExcel/CachedObjectStorageFactory.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CachedObjectStorageFactory.php rename to webht/libraries/PHPExcel/PHPExcel/CachedObjectStorageFactory.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CalcEngine/CyclicReferenceStack.php b/webht/libraries/PHPExcel/PHPExcel/CalcEngine/CyclicReferenceStack.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CalcEngine/CyclicReferenceStack.php rename to webht/libraries/PHPExcel/PHPExcel/CalcEngine/CyclicReferenceStack.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/CalcEngine/Logger.php b/webht/libraries/PHPExcel/PHPExcel/CalcEngine/Logger.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/CalcEngine/Logger.php rename to webht/libraries/PHPExcel/PHPExcel/CalcEngine/Logger.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation.php b/webht/libraries/PHPExcel/PHPExcel/Calculation.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Database.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/Database.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Database.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/Database.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/DateTime.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/DateTime.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/DateTime.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/DateTime.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Engineering.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/Engineering.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Engineering.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/Engineering.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Exception.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/Exception.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Exception.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/Exception.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Financial.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/Financial.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Financial.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/Financial.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Function.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/Function.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Function.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/Function.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Functions.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/Functions.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Functions.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/Functions.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Logical.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/Logical.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Logical.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/Logical.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/LookupRef.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/LookupRef.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/LookupRef.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/LookupRef.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/MathTrig.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/MathTrig.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/MathTrig.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/MathTrig.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Statistical.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/Statistical.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Statistical.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/Statistical.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/TextData.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/TextData.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/TextData.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/TextData.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Token/Stack.php b/webht/libraries/PHPExcel/PHPExcel/Calculation/Token/Stack.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/Token/Stack.php rename to webht/libraries/PHPExcel/PHPExcel/Calculation/Token/Stack.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/functionlist.txt b/webht/libraries/PHPExcel/PHPExcel/Calculation/functionlist.txt similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Calculation/functionlist.txt rename to webht/libraries/PHPExcel/PHPExcel/Calculation/functionlist.txt diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Cell.php b/webht/libraries/PHPExcel/PHPExcel/Cell.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Cell.php rename to webht/libraries/PHPExcel/PHPExcel/Cell.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php b/webht/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php rename to webht/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Cell/DataType.php b/webht/libraries/PHPExcel/PHPExcel/Cell/DataType.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Cell/DataType.php rename to webht/libraries/PHPExcel/PHPExcel/Cell/DataType.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php b/webht/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php rename to webht/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php b/webht/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php rename to webht/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php b/webht/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php rename to webht/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php b/webht/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php rename to webht/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart.php b/webht/libraries/PHPExcel/PHPExcel/Chart.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart.php rename to webht/libraries/PHPExcel/PHPExcel/Chart.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/DataSeries.php b/webht/libraries/PHPExcel/PHPExcel/Chart/DataSeries.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/DataSeries.php rename to webht/libraries/PHPExcel/PHPExcel/Chart/DataSeries.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/DataSeriesValues.php b/webht/libraries/PHPExcel/PHPExcel/Chart/DataSeriesValues.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/DataSeriesValues.php rename to webht/libraries/PHPExcel/PHPExcel/Chart/DataSeriesValues.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/Exception.php b/webht/libraries/PHPExcel/PHPExcel/Chart/Exception.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/Exception.php rename to webht/libraries/PHPExcel/PHPExcel/Chart/Exception.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/Layout.php b/webht/libraries/PHPExcel/PHPExcel/Chart/Layout.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/Layout.php rename to webht/libraries/PHPExcel/PHPExcel/Chart/Layout.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/Legend.php b/webht/libraries/PHPExcel/PHPExcel/Chart/Legend.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/Legend.php rename to webht/libraries/PHPExcel/PHPExcel/Chart/Legend.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/PlotArea.php b/webht/libraries/PHPExcel/PHPExcel/Chart/PlotArea.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/PlotArea.php rename to webht/libraries/PHPExcel/PHPExcel/Chart/PlotArea.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt b/webht/libraries/PHPExcel/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt rename to webht/libraries/PHPExcel/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/Renderer/jpgraph.php b/webht/libraries/PHPExcel/PHPExcel/Chart/Renderer/jpgraph.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/Renderer/jpgraph.php rename to webht/libraries/PHPExcel/PHPExcel/Chart/Renderer/jpgraph.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/Title.php b/webht/libraries/PHPExcel/PHPExcel/Chart/Title.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Chart/Title.php rename to webht/libraries/PHPExcel/PHPExcel/Chart/Title.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Comment.php b/webht/libraries/PHPExcel/PHPExcel/Comment.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Comment.php rename to webht/libraries/PHPExcel/PHPExcel/Comment.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/DocumentProperties.php b/webht/libraries/PHPExcel/PHPExcel/DocumentProperties.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/DocumentProperties.php rename to webht/libraries/PHPExcel/PHPExcel/DocumentProperties.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/DocumentSecurity.php b/webht/libraries/PHPExcel/PHPExcel/DocumentSecurity.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/DocumentSecurity.php rename to webht/libraries/PHPExcel/PHPExcel/DocumentSecurity.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Exception.php b/webht/libraries/PHPExcel/PHPExcel/Exception.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Exception.php rename to webht/libraries/PHPExcel/PHPExcel/Exception.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/HashTable.php b/webht/libraries/PHPExcel/PHPExcel/HashTable.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/HashTable.php rename to webht/libraries/PHPExcel/PHPExcel/HashTable.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/IComparable.php b/webht/libraries/PHPExcel/PHPExcel/IComparable.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/IComparable.php rename to webht/libraries/PHPExcel/PHPExcel/IComparable.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/IOFactory.php b/webht/libraries/PHPExcel/PHPExcel/IOFactory.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/IOFactory.php rename to webht/libraries/PHPExcel/PHPExcel/IOFactory.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/NamedRange.php b/webht/libraries/PHPExcel/PHPExcel/NamedRange.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/NamedRange.php rename to webht/libraries/PHPExcel/PHPExcel/NamedRange.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Abstract.php b/webht/libraries/PHPExcel/PHPExcel/Reader/Abstract.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Abstract.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/Abstract.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/CSV.php b/webht/libraries/PHPExcel/PHPExcel/Reader/CSV.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/CSV.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/CSV.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php b/webht/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel2003XML.php b/webht/libraries/PHPExcel/PHPExcel/Reader/Excel2003XML.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel2003XML.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/Excel2003XML.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php b/webht/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel2007/Chart.php b/webht/libraries/PHPExcel/PHPExcel/Reader/Excel2007/Chart.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel2007/Chart.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/Excel2007/Chart.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel2007/Theme.php b/webht/libraries/PHPExcel/PHPExcel/Reader/Excel2007/Theme.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel2007/Theme.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/Excel2007/Theme.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel5.php b/webht/libraries/PHPExcel/PHPExcel/Reader/Excel5.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel5.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/Excel5.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php b/webht/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel5/MD5.php b/webht/libraries/PHPExcel/PHPExcel/Reader/Excel5/MD5.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel5/MD5.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/Excel5/MD5.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel5/RC4.php b/webht/libraries/PHPExcel/PHPExcel/Reader/Excel5/RC4.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Excel5/RC4.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/Excel5/RC4.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Exception.php b/webht/libraries/PHPExcel/PHPExcel/Reader/Exception.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Exception.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/Exception.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Gnumeric.php b/webht/libraries/PHPExcel/PHPExcel/Reader/Gnumeric.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/Gnumeric.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/Gnumeric.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/HTML.php b/webht/libraries/PHPExcel/PHPExcel/Reader/HTML.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/HTML.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/HTML.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php b/webht/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/IReader.php b/webht/libraries/PHPExcel/PHPExcel/Reader/IReader.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/IReader.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/IReader.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/OOCalc.php b/webht/libraries/PHPExcel/PHPExcel/Reader/OOCalc.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/OOCalc.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/OOCalc.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/SYLK.php b/webht/libraries/PHPExcel/PHPExcel/Reader/SYLK.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Reader/SYLK.php rename to webht/libraries/PHPExcel/PHPExcel/Reader/SYLK.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/ReferenceHelper.php b/webht/libraries/PHPExcel/PHPExcel/ReferenceHelper.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/ReferenceHelper.php rename to webht/libraries/PHPExcel/PHPExcel/ReferenceHelper.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/RichText.php b/webht/libraries/PHPExcel/PHPExcel/RichText.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/RichText.php rename to webht/libraries/PHPExcel/PHPExcel/RichText.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php b/webht/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php rename to webht/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/RichText/Run.php b/webht/libraries/PHPExcel/PHPExcel/RichText/Run.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/RichText/Run.php rename to webht/libraries/PHPExcel/PHPExcel/RichText/Run.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/RichText/TextElement.php b/webht/libraries/PHPExcel/PHPExcel/RichText/TextElement.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/RichText/TextElement.php rename to webht/libraries/PHPExcel/PHPExcel/RichText/TextElement.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Settings.php b/webht/libraries/PHPExcel/PHPExcel/Settings.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Settings.php rename to webht/libraries/PHPExcel/PHPExcel/Settings.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/CodePage.php b/webht/libraries/PHPExcel/PHPExcel/Shared/CodePage.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/CodePage.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/CodePage.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Date.php b/webht/libraries/PHPExcel/PHPExcel/Shared/Date.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Date.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/Date.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Drawing.php b/webht/libraries/PHPExcel/PHPExcel/Shared/Drawing.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Drawing.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/Drawing.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher.php b/webht/libraries/PHPExcel/PHPExcel/Shared/Escher.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/Escher.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php b/webht/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php b/webht/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/webht/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php b/webht/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php b/webht/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/webht/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/webht/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Excel5.php b/webht/libraries/PHPExcel/PHPExcel/Shared/Excel5.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Excel5.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/Excel5.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/File.php b/webht/libraries/PHPExcel/PHPExcel/Shared/File.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/File.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/File.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Font.php b/webht/libraries/PHPExcel/PHPExcel/Shared/Font.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/Font.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/Font.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/CHANGELOG.TXT b/webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/CHANGELOG.TXT similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/CHANGELOG.TXT rename to webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/CHANGELOG.TXT diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php b/webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php b/webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/LUDecomposition.php b/webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/LUDecomposition.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/LUDecomposition.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/LUDecomposition.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/Matrix.php b/webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/Matrix.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/Matrix.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/Matrix.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/QRDecomposition.php b/webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/QRDecomposition.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/QRDecomposition.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/QRDecomposition.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php b/webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Error.php b/webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Error.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Error.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Error.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Maths.php b/webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Maths.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Maths.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Maths.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/OLE.php b/webht/libraries/PHPExcel/PHPExcel/Shared/OLE.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/OLE.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/OLE.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php b/webht/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS.php b/webht/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/File.php b/webht/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/File.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/File.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/File.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php b/webht/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/OLERead.php b/webht/libraries/PHPExcel/PHPExcel/Shared/OLERead.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/OLERead.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/OLERead.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/PCLZip/gnu-lgpl.txt b/webht/libraries/PHPExcel/PHPExcel/Shared/PCLZip/gnu-lgpl.txt similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/PCLZip/gnu-lgpl.txt rename to webht/libraries/PHPExcel/PHPExcel/Shared/PCLZip/gnu-lgpl.txt diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/PCLZip/pclzip.lib.php b/webht/libraries/PHPExcel/PHPExcel/Shared/PCLZip/pclzip.lib.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/PCLZip/pclzip.lib.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/PCLZip/pclzip.lib.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/PCLZip/readme.txt b/webht/libraries/PHPExcel/PHPExcel/Shared/PCLZip/readme.txt similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/PCLZip/readme.txt rename to webht/libraries/PHPExcel/PHPExcel/Shared/PCLZip/readme.txt diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php b/webht/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/String.php b/webht/libraries/PHPExcel/PHPExcel/Shared/String.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/String.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/String.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/TimeZone.php b/webht/libraries/PHPExcel/PHPExcel/Shared/TimeZone.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/TimeZone.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/TimeZone.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php b/webht/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/ZipArchive.php b/webht/libraries/PHPExcel/PHPExcel/Shared/ZipArchive.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/ZipArchive.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/ZipArchive.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php b/webht/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php b/webht/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php b/webht/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php b/webht/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php b/webht/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php b/webht/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php b/webht/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/trend/trendClass.php b/webht/libraries/PHPExcel/PHPExcel/Shared/trend/trendClass.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Shared/trend/trendClass.php rename to webht/libraries/PHPExcel/PHPExcel/Shared/trend/trendClass.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style.php b/webht/libraries/PHPExcel/PHPExcel/Style.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style.php rename to webht/libraries/PHPExcel/PHPExcel/Style.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Alignment.php b/webht/libraries/PHPExcel/PHPExcel/Style/Alignment.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Alignment.php rename to webht/libraries/PHPExcel/PHPExcel/Style/Alignment.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Border.php b/webht/libraries/PHPExcel/PHPExcel/Style/Border.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Border.php rename to webht/libraries/PHPExcel/PHPExcel/Style/Border.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Borders.php b/webht/libraries/PHPExcel/PHPExcel/Style/Borders.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Borders.php rename to webht/libraries/PHPExcel/PHPExcel/Style/Borders.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Color.php b/webht/libraries/PHPExcel/PHPExcel/Style/Color.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Color.php rename to webht/libraries/PHPExcel/PHPExcel/Style/Color.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Conditional.php b/webht/libraries/PHPExcel/PHPExcel/Style/Conditional.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Conditional.php rename to webht/libraries/PHPExcel/PHPExcel/Style/Conditional.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Fill.php b/webht/libraries/PHPExcel/PHPExcel/Style/Fill.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Fill.php rename to webht/libraries/PHPExcel/PHPExcel/Style/Fill.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Font.php b/webht/libraries/PHPExcel/PHPExcel/Style/Font.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Font.php rename to webht/libraries/PHPExcel/PHPExcel/Style/Font.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php b/webht/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php rename to webht/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Protection.php b/webht/libraries/PHPExcel/PHPExcel/Style/Protection.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Protection.php rename to webht/libraries/PHPExcel/PHPExcel/Style/Protection.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Supervisor.php b/webht/libraries/PHPExcel/PHPExcel/Style/Supervisor.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Style/Supervisor.php rename to webht/libraries/PHPExcel/PHPExcel/Style/Supervisor.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/AutoFilter.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/AutoFilter.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/AutoFilter.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/AutoFilter.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/AutoFilter/Column.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/AutoFilter/Column.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/AutoFilter/Column.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/AutoFilter/Column.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/AutoFilter/Column/Rule.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/AutoFilter/Column/Rule.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/AutoFilter/Column/Rule.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/AutoFilter/Column/Rule.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/Row.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/Row.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/Row.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/Row.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php b/webht/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php rename to webht/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/WorksheetIterator.php b/webht/libraries/PHPExcel/PHPExcel/WorksheetIterator.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/WorksheetIterator.php rename to webht/libraries/PHPExcel/PHPExcel/WorksheetIterator.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Abstract.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Abstract.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Abstract.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Abstract.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/CSV.php b/webht/libraries/PHPExcel/PHPExcel/Writer/CSV.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/CSV.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/CSV.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Chart.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Chart.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Chart.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Chart.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/RelsRibbon.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/RelsRibbon.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/RelsRibbon.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/RelsRibbon.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/RelsVBA.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/RelsVBA.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/RelsVBA.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/RelsVBA.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel5.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel5.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Exception.php b/webht/libraries/PHPExcel/PHPExcel/Writer/Exception.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/Exception.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/Exception.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/HTML.php b/webht/libraries/PHPExcel/PHPExcel/Writer/HTML.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/HTML.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/HTML.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/IWriter.php b/webht/libraries/PHPExcel/PHPExcel/Writer/IWriter.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/IWriter.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/IWriter.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/PDF.php b/webht/libraries/PHPExcel/PHPExcel/Writer/PDF.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/PDF.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/PDF.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/PDF/Core.php b/webht/libraries/PHPExcel/PHPExcel/Writer/PDF/Core.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/PDF/Core.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/PDF/Core.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/PDF/DomPDF.php b/webht/libraries/PHPExcel/PHPExcel/Writer/PDF/DomPDF.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/PDF/DomPDF.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/PDF/DomPDF.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/PDF/mPDF.php b/webht/libraries/PHPExcel/PHPExcel/Writer/PDF/mPDF.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/PDF/mPDF.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/PDF/mPDF.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/PDF/tcPDF.php b/webht/libraries/PHPExcel/PHPExcel/Writer/PDF/tcPDF.php similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/Writer/PDF/tcPDF.php rename to webht/libraries/PHPExcel/PHPExcel/Writer/PDF/tcPDF.php diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/bg/config b/webht/libraries/PHPExcel/PHPExcel/locale/bg/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/bg/config rename to webht/libraries/PHPExcel/PHPExcel/locale/bg/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/cs/config b/webht/libraries/PHPExcel/PHPExcel/locale/cs/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/cs/config rename to webht/libraries/PHPExcel/PHPExcel/locale/cs/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/cs/functions b/webht/libraries/PHPExcel/PHPExcel/locale/cs/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/cs/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/cs/functions diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/da/config b/webht/libraries/PHPExcel/PHPExcel/locale/da/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/da/config rename to webht/libraries/PHPExcel/PHPExcel/locale/da/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/da/functions b/webht/libraries/PHPExcel/PHPExcel/locale/da/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/da/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/da/functions diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/de/config b/webht/libraries/PHPExcel/PHPExcel/locale/de/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/de/config rename to webht/libraries/PHPExcel/PHPExcel/locale/de/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/de/functions b/webht/libraries/PHPExcel/PHPExcel/locale/de/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/de/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/de/functions diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/en/uk/config b/webht/libraries/PHPExcel/PHPExcel/locale/en/uk/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/en/uk/config rename to webht/libraries/PHPExcel/PHPExcel/locale/en/uk/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/es/config b/webht/libraries/PHPExcel/PHPExcel/locale/es/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/es/config rename to webht/libraries/PHPExcel/PHPExcel/locale/es/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/es/functions b/webht/libraries/PHPExcel/PHPExcel/locale/es/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/es/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/es/functions diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/fi/config b/webht/libraries/PHPExcel/PHPExcel/locale/fi/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/fi/config rename to webht/libraries/PHPExcel/PHPExcel/locale/fi/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/fi/functions b/webht/libraries/PHPExcel/PHPExcel/locale/fi/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/fi/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/fi/functions diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/fr/config b/webht/libraries/PHPExcel/PHPExcel/locale/fr/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/fr/config rename to webht/libraries/PHPExcel/PHPExcel/locale/fr/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/fr/functions b/webht/libraries/PHPExcel/PHPExcel/locale/fr/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/fr/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/fr/functions diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/hu/config b/webht/libraries/PHPExcel/PHPExcel/locale/hu/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/hu/config rename to webht/libraries/PHPExcel/PHPExcel/locale/hu/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/hu/functions b/webht/libraries/PHPExcel/PHPExcel/locale/hu/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/hu/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/hu/functions diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/it/config b/webht/libraries/PHPExcel/PHPExcel/locale/it/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/it/config rename to webht/libraries/PHPExcel/PHPExcel/locale/it/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/it/functions b/webht/libraries/PHPExcel/PHPExcel/locale/it/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/it/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/it/functions diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/nl/config b/webht/libraries/PHPExcel/PHPExcel/locale/nl/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/nl/config rename to webht/libraries/PHPExcel/PHPExcel/locale/nl/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/nl/functions b/webht/libraries/PHPExcel/PHPExcel/locale/nl/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/nl/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/nl/functions diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/no/config b/webht/libraries/PHPExcel/PHPExcel/locale/no/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/no/config rename to webht/libraries/PHPExcel/PHPExcel/locale/no/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/no/functions b/webht/libraries/PHPExcel/PHPExcel/locale/no/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/no/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/no/functions diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/pl/config b/webht/libraries/PHPExcel/PHPExcel/locale/pl/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/pl/config rename to webht/libraries/PHPExcel/PHPExcel/locale/pl/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/pl/functions b/webht/libraries/PHPExcel/PHPExcel/locale/pl/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/pl/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/pl/functions diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/pt/br/config b/webht/libraries/PHPExcel/PHPExcel/locale/pt/br/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/pt/br/config rename to webht/libraries/PHPExcel/PHPExcel/locale/pt/br/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/pt/br/functions b/webht/libraries/PHPExcel/PHPExcel/locale/pt/br/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/pt/br/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/pt/br/functions diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/pt/config b/webht/libraries/PHPExcel/PHPExcel/locale/pt/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/pt/config rename to webht/libraries/PHPExcel/PHPExcel/locale/pt/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/pt/functions b/webht/libraries/PHPExcel/PHPExcel/locale/pt/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/pt/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/pt/functions diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/ru/config b/webht/libraries/PHPExcel/PHPExcel/locale/ru/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/ru/config rename to webht/libraries/PHPExcel/PHPExcel/locale/ru/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/ru/functions b/webht/libraries/PHPExcel/PHPExcel/locale/ru/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/ru/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/ru/functions diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/sv/config b/webht/libraries/PHPExcel/PHPExcel/locale/sv/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/sv/config rename to webht/libraries/PHPExcel/PHPExcel/locale/sv/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/sv/functions b/webht/libraries/PHPExcel/PHPExcel/locale/sv/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/sv/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/sv/functions diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/tr/config b/webht/libraries/PHPExcel/PHPExcel/locale/tr/config similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/tr/config rename to webht/libraries/PHPExcel/PHPExcel/locale/tr/config diff --git a/webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/tr/functions b/webht/libraries/PHPExcel/PHPExcel/locale/tr/functions similarity index 100% rename from webht/third_party/pay/libraries/PHPExcel/PHPExcel/locale/tr/functions rename to webht/libraries/PHPExcel/PHPExcel/locale/tr/functions diff --git a/webht/third_party/pay/controllers/iPayLinksService.php b/webht/third_party/pay/controllers/iPayLinksService.php index 12938264..16855b9f 100644 --- a/webht/third_party/pay/controllers/iPayLinksService.php +++ b/webht/third_party/pay/controllers/iPayLinksService.php @@ -1236,7 +1236,7 @@ class IPayLinksService extends CI_Controller $rowCount = 2; foreach ($export_list as $key => $row) { if( trim($row->IPL_currencyCode) != "") { - $currency_sum[trim($row->IPL_currencyCode)] = bcadd($currency_sum[trim($row->IPL_currencyCode)], $row->IPL_orderAmount); + $currency_sum[trim($row->IPL_currencyCode)] = @ bcadd($currency_sum[trim($row->IPL_currencyCode)], $row->IPL_orderAmount); } $payer = $row->IPL_payerName ? ($row->IPL_payerName . "<" . $row->IPL_payerEmail . ">") : "退款"; $objPHPExcel->getActiveSheet() diff --git a/webht/third_party/pay/views/iPayLinks_list.php b/webht/third_party/pay/views/iPayLinks_list.php index 9551b14a..9ffe7de7 100644 --- a/webht/third_party/pay/views/iPayLinks_list.php +++ b/webht/third_party/pay/views/iPayLinks_list.php @@ -224,7 +224,6 @@ var dateFormat = "yy-mm-dd", from = $( "#from_date" ) .datepicker({ - // defaultDate: "+1w", dateFormat: dateFormat, changeMonth: true, changeYear: true, @@ -234,7 +233,6 @@ to.datepicker( "option", "minDate", getDate( this ) ); }), to = $( "#to_date" ).datepicker({ - // defaultDate: "+1w", dateFormat: dateFormat, changeMonth: true, changeYear: true, diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index 9ca58990..72aaa8ec 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -924,4 +924,72 @@ class Index extends CI_Controller { echo json_encode('没找到数据！'); } + public function export_list() + { + $from_date = $this->input->post("from_date"); + $to_date = $this->input->post("to_date"); + $currency = $this->input->post("currency"); + $export_list = $this->Note_model->date_range($from_date, $to_date, $currency); + if ($export_list == false) { + echo "Not found any records for export."; + return false; + } + $this->load->library('PHPExcel'); + $objPHPExcel = new PHPExcel(); + $objPHPExcel->setActiveSheetIndex(0); + //set width + $objPHPExcel->getActiveSheet()->getColumnDimension('A')->setWidth(5); + $objPHPExcel->getActiveSheet()->getColumnDimension('B')->setWidth(30); + $objPHPExcel->getActiveSheet()->getColumnDimension('C')->setWidth(15); + $objPHPExcel->getActiveSheet()->getColumnDimension('D')->setWidth(20); + $objPHPExcel->getActiveSheet()->getColumnDimension('E')->setWidth(30); + $objPHPExcel->getActiveSheet()->getColumnDimension('F')->setWidth(20); + // 对齐 + $objPHPExcel->getActiveSheet()->getStyle('B')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT); + $objPHPExcel->getActiveSheet()->getStyle('C')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT); + // 表标题行 + $objPHPExcel->getActiveSheet() + ->SetCellValue('A1', '#') + ->SetCellValue('B1', '团号') + ->SetCellValue('C1', '金额') + ->SetCellValue('D1', '付款人') + ->SetCellValue('E1', '交易号') + ->SetCellValue('F1', '收单时间'); + $currency_sum = array(); + bcscale(2); + $rowCount = 2; + foreach ($export_list as $key => $row) { + if( trim($row->pn_mc_currency) != "") { + $currency_sum[trim($row->pn_mc_currency)] = @ bcadd($currency_sum[trim($row->pn_mc_currency)], $row->pn_mc_gross); + } + $payer = $row->pn_payer ? ($row->pn_payer . "<" . $row->pn_payer_email . ">") : "退款"; + $orderid = $row->pn_invoice ? $row->pn_invoice : $row->pn_item_number; + $objPHPExcel->getActiveSheet() + ->SetCellValue('A'.$rowCount, ($rowCount-1)) + ->setCellValueExplicit('B'.$rowCount, $orderid,PHPExcel_Cell_DataType::TYPE_STRING) + ->setCellValueExplicit('C'.$rowCount, trim($row->pn_mc_currency) . number_format($row->pn_mc_gross, 2, ".", ""),PHPExcel_Cell_DataType::TYPE_STRING) + ->SetCellValue('D'.$rowCount, $payer) + ->setCellValueExplicit('E'.$rowCount, $row->pn_txn_id,PHPExcel_Cell_DataType::TYPE_STRING) + ->SetCellValue('F'.$rowCount, $row->pn_datetime); + $payer = $orderid = ""; + $rowCount++; + } + $rowCount++; // 隔一行 + // 汇总行 + $objPHPExcel->getActiveSheet() + ->SetCellValue('A' . $rowCount, '合计'); + foreach ($currency_sum as $kc => $cur) { + $objPHPExcel->getActiveSheet() + ->SetCellValue('B' . $rowCount, $kc) + ->setCellValueExplicit('C' . $rowCount, number_format($cur, 2, ".", ""),PHPExcel_Cell_DataType::TYPE_STRING); + $rowCount++; + } + $filename = "export_paypal_" . date('Y-m-d'); + header('Content-Type: application/vnd.ms-excel'); + header('Content-Disposition: attachment;filename="' . $filename . '.xls"'); + header('Cache-Control: max-age=0'); + $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5'); + $objWriter->save('php://output'); + } + } diff --git a/webht/third_party/paypal/models/note_model.php b/webht/third_party/paypal/models/note_model.php index e01702f1..d5f6c022 100644 --- a/webht/third_party/paypal/models/note_model.php +++ b/webht/third_party/paypal/models/note_model.php @@ -50,7 +50,7 @@ class Note_model extends CI_Model { $this->orderby=" ORDER BY CASE pn.pn_send WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.pn_sn DESC "; return $this->get_list(); } - + public function note($pn_txn_id){ $this->init(); $this->topnum=1; @@ -64,12 +64,12 @@ class Note_model extends CI_Model { $search_sql = ''; $search_key = trim($search_key); if (!empty($search_key)) { - $search_sql.=" AND ( pn.pn_txn_id = '$search_key' - OR pn.pn_invoice like '%$search_key%' - OR pn.pn_custom like '%$search_key%' + $search_sql.=" AND ( pn.pn_txn_id = '$search_key' + OR pn.pn_invoice like '%$search_key%' + OR pn.pn_custom like '%$search_key%' OR pn.pn_item_name like '%$search_key%' OR pn.pn_item_number like '%$search_key%' - OR pn.pn_payer like '%$search_key%' + OR pn.pn_payer like '%$search_key%' OR pn.pn_payer_email like '%$search_key%' )"; } $this->search = $search_sql; @@ -95,7 +95,7 @@ class Note_model extends CI_Model { public function get_list() { $this->topnum ? $sql = "SELECT TOP " . $this->topnum : $sql = "SELECT "; - $sql .= " + $sql .= " pn.pn_sn ,pn.pn_txn_id ,pn.pn_invoice @@ -112,7 +112,7 @@ class Note_model extends CI_Model { ,pn.pn_payment_date ,pn.pn_send FROM paypal_note pn - WHERE 1=1 + WHERE 1=1 "; $this->pn_send ? $sql.=$this->pn_send : false; $this->search ? $sql.=$this->search : false; @@ -136,7 +136,7 @@ class Note_model extends CI_Model { $sql = " UPDATE paypal_note SET pn_send = ? - WHERE pn_txn_id = ? + WHERE pn_txn_id = ? "; return $this->HT->query($sql, array($pn_send, $pn_txn_id)); } @@ -146,9 +146,22 @@ class Note_model extends CI_Model { $sql = " UPDATE paypal_note SET pn_invoice = ? - WHERE pn_txn_id = ? + WHERE pn_txn_id = ? "; return $this->HT->query($sql, array($pn_invoice, $pn_txn_id)); } + public function date_range($from, $to, $currency=NULL) + { + $this->init(); + $search_sql = " AND pn_payment_status in ('Completed','Refunded') "; + $search_sql .= " AND pn.pn_datetime BETWEEN '$from 00:00:00' AND '$to 23:59:59' "; + if ( ! empty($currency)) { + $search_sql .= " AND pn_mc_currency = '$currency' "; + } + $this->search = $search_sql; + $this->orderby = ""; + return $this->get_list(); + } + } diff --git a/webht/third_party/paypal/views/note_list.php b/webht/third_party/paypal/views/note_list.php index 29fb67d0..0d8a07ce 100644 --- a/webht/third_party/paypal/views/note_list.php +++ b/webht/third_party/paypal/views/note_list.php @@ -1,4 +1,4 @@ - + + +
+
+
+ + +
+
+ + +
+
+ + +
+ +
+
+
@@ -60,9 +122,9 @@
  • 主题
  • 客人邮箱
  • 交易号
    • -
  • 收款(北京)时间
    • -
  • 通知时间
    • -
  • 通知状态
    • +
  • 收款(北京)时间
    • +
  • 通知时间
    • +
  • 通知状态
    • \ No newline at end of file + diff --git a/webht/views/n-header.php b/webht/views/n-header.php index 02deb3e0..cb06b1ad 100644 --- a/webht/views/n-header.php +++ b/webht/views/n-header.php @@ -8,8 +8,8 @@ - - + + @@ -20,7 +20,7 @@
    session->userdata('isapp')){ ?> - + @@ -45,8 +45,8 @@
    - \ No newline at end of file +