Browse Source

refs #795 Syncronizing with release commit:8a9292318704388b6fa65e721360ff2fa61ce66c build:201802191715.

git-svn-id: https://help.cyberplat.com/svn@705 03a3ef96-f0a9-4432-b0b0-a3692ed642c1
tags/3.11.0
svn 3 years ago
parent
commit
498ad57e27
10 changed files with 15 additions and 24 deletions
  1. +3
    -3
      3.0/src/apps/PaymentProcessor/msvc/PaymentProcessor.vcxproj
  2. +1
    -2
      3.0/src/apps/PaymentProcessor/src/Services/GUIService.cpp
  3. +1
    -5
      3.0/src/modules/GraphicsEngine/GraphicsEngine.qbs
  4. +2
    -11
      3.0/src/modules/GraphicsEngine/src/GraphicsEngine.cpp
  5. +1
    -1
      3.0/src/modules/GraphicsEngine/src/GraphicsEngine.h
  6. +1
    -1
      3.0/src/modules/Hardware/CashAcceptors/src/CCNet/FirmwareVersions.h
  7. +2
    -0
      3.0/src/runtimes/ru/common/receipts/data/receipts/dispense_balance.xml
  8. +2
    -0
      3.0/src/runtimes/ru/common/receipts/data/receipts/dispense_encachment.xml
  9. +2
    -0
      3.0/src/runtimes/ru/common/receipts/data/receipts/encashment.xml
  10. +0
    -1
      3.0/src/runtimes/ru/common/receipts/data/receipts/payment_mts.xml

+ 3
- 3
3.0/src/apps/PaymentProcessor/msvc/PaymentProcessor.vcxproj View File

@@ -78,7 +78,7 @@
<ResourceOutputFileName>$(IntDir)%(Filename).res</ResourceOutputFileName>
</ResourceCompile>
<Link>
<AdditionalDependencies>QtScript4.lib;QtNetwork4.lib;QtCore4.lib;QtGui4.lib;QtSql4.lib;QtXml4.lib;QtOpenGL4.lib;phonon4.lib;qtmain.lib;DatabaseProxy.lib;CryptEngine.lib;Log.lib;Application.lib;MessageQueue.lib;DeviceManager.lib;WatchServiceClient.lib;Connection.lib;KeysUtils.lib;SysUtils.lib;DebugUtils.lib;NetworkTaskManager.lib;GraphicsEngine.lib;ScenarioEngine.lib;SettingsManager.lib;PaymentProcessorSDK.lib;DriverSDK.lib;PluginSDK.lib;Packer.lib;qntp.lib;UpdateEngine.lib;QtSingleApplication.lib;QZint.lib;qBreakpad.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>QtScript4.lib;QtNetwork4.lib;QtCore4.lib;QtGui4.lib;QtSql4.lib;QtXml4.lib;phonon4.lib;qtmain.lib;DatabaseProxy.lib;CryptEngine.lib;Log.lib;Application.lib;MessageQueue.lib;DeviceManager.lib;WatchServiceClient.lib;Connection.lib;KeysUtils.lib;SysUtils.lib;DebugUtils.lib;NetworkTaskManager.lib;GraphicsEngine.lib;ScenarioEngine.lib;SettingsManager.lib;PaymentProcessorSDK.lib;DriverSDK.lib;PluginSDK.lib;Packer.lib;qntp.lib;UpdateEngine.lib;QtSingleApplication.lib;QZint.lib;qBreakpad.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;$(TC_LIB_DIR);$(THIRDPARTY_BIN_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<EnableUAC>false</EnableUAC>
@@ -121,7 +121,7 @@
<ResourceOutputFileName>$(IntDir)%(Filename).res</ResourceOutputFileName>
</ResourceCompile>
<Link>
<AdditionalDependencies>QtScript4.lib;QtNetwork4.lib;QtCore4.lib;QtGui4.lib;QtSql4.lib;QtXml4.lib;QtOpenGL4.lib;phonon4.lib;qtmain.lib;DatabaseProxy.lib;CryptEngine.lib;Log.lib;Application.lib;MessageQueue.lib;DeviceManager.lib;WatchServiceClient.lib;Connection.lib;KeysUtils.lib;SysUtils.lib;DebugUtils.lib;NetworkTaskManager.lib;GraphicsEngine.lib;ScenarioEngine.lib;SettingsManager.lib;PaymentProcessorSDK.lib;DriverSDK.lib;PluginSDK.lib;Packer.lib;qntp.lib;UpdateEngine.lib;QtSingleApplication.lib;QZint.lib;qBreakpad.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>QtScript4.lib;QtNetwork4.lib;QtCore4.lib;QtGui4.lib;QtSql4.lib;QtXml4.lib;phonon4.lib;qtmain.lib;DatabaseProxy.lib;CryptEngine.lib;Log.lib;Application.lib;MessageQueue.lib;DeviceManager.lib;WatchServiceClient.lib;Connection.lib;KeysUtils.lib;SysUtils.lib;DebugUtils.lib;NetworkTaskManager.lib;GraphicsEngine.lib;ScenarioEngine.lib;SettingsManager.lib;PaymentProcessorSDK.lib;DriverSDK.lib;PluginSDK.lib;Packer.lib;qntp.lib;UpdateEngine.lib;QtSingleApplication.lib;QZint.lib;qBreakpad.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;$(TC_LIB_DIR);$(THIRDPARTY_BIN_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<EnableUAC>false</EnableUAC>
@@ -164,7 +164,7 @@
<ResourceOutputFileName>$(IntDir)%(Filename).res</ResourceOutputFileName>
</ResourceCompile>
<Link>
<AdditionalDependencies>QtScriptd4.lib;QtNetworkd4.lib;QtCored4.lib;QtGuid4.lib;QtXmld4.lib;QtSqld4.lib;QtOpenGLd4.lib;phonond4.lib;qtmaind.lib;DatabaseProxyd.lib;CryptEngined.lib;Logd.lib;Applicationd.lib;MessageQueued.lib;DeviceManagerd.lib;WatchServiceClientd.lib;Connectiond.lib;KeysUtilsd.lib;SysUtilsd.lib;DebugUtilsd.lib;NetworkTaskManagerd.lib;GraphicsEngined.lib;ScenarioEngined.lib;SettingsManagerd.lib;PaymentProcessorSDKd.lib;DriverSDKd.lib;PluginSDKd.lib;Packerd.lib;qntpd.lib;UpdateEngined.lib;QtSingleApplicationd.lib;QZintd.lib;qBreakpadd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>QtScriptd4.lib;QtNetworkd4.lib;QtCored4.lib;QtGuid4.lib;QtXmld4.lib;QtSqld4.lib;phonond4.lib;qtmaind.lib;DatabaseProxyd.lib;CryptEngined.lib;Logd.lib;Applicationd.lib;MessageQueued.lib;DeviceManagerd.lib;WatchServiceClientd.lib;Connectiond.lib;KeysUtilsd.lib;SysUtilsd.lib;DebugUtilsd.lib;NetworkTaskManagerd.lib;GraphicsEngined.lib;ScenarioEngined.lib;SettingsManagerd.lib;PaymentProcessorSDKd.lib;DriverSDKd.lib;PluginSDKd.lib;Packerd.lib;qntpd.lib;UpdateEngined.lib;QtSingleApplicationd.lib;QZintd.lib;qBreakpadd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;$(TC_LIB_DIR);$(THIRDPARTY_DIR)\VisualLeakDetector\lib\Win32;$(THIRDPARTY_BIN_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<EnableUAC>false</EnableUAC>


+ 1
- 2
3.0/src/apps/PaymentProcessor/src/Services/GUIService.cpp View File

@@ -158,7 +158,6 @@ bool GUIService::initialize()

bool showCursor = mConfig.value("interface/show_mouse_cursor", false).toBool();
bool showDebugInfo = mConfig.value("interface/show_debug_info", false).toBool();
bool useOpengl = mConfig.value("interface/use_opengl", false).toBool();

QVariantMap scenarios = getUiSettings("scenarios");
if (!scenarios.isEmpty())
@@ -175,7 +174,7 @@ bool GUIService::initialize()
mGraphicsEngine.addHandledKeys(handledKeyList);
}

if (!mGraphicsEngine.initialize(display, mWidth, mHeight, showCursor, useOpengl, showDebugInfo))
if (!mGraphicsEngine.initialize(display, mWidth, mHeight, showCursor, showDebugInfo))
{
LOG(mApplication->getLog(), LogLevel::Error, "Failed to initialize graphics engine.");



+ 1
- 5
3.0/src/modules/GraphicsEngine/GraphicsEngine.qbs View File

@@ -4,15 +4,11 @@ StaticLibrary {
name: "GraphicsEngine"

Depends { name: 'cpp' }
Depends { name: "Qt"; submodules: ["core", "opengl", "concurrent"] }
Depends { name: "Qt"; submodules: ["core", "concurrent"] }

Depends { name: "Core" }
Depends { name: "qt5port" }

files: [ "src/*.cpp", "src/*.h" ]

Export {
Depends { name: "Qt"; submodules: ["opengl"] }
}
}


+ 2
- 11
3.0/src/modules/GraphicsEngine/src/GraphicsEngine.cpp View File

@@ -1,4 +1,4 @@
/* @file Графический интерфейс. */
/* @file Графический интерфейс. */


// Qt
@@ -9,8 +9,6 @@
#include <QtGui/QKeySequence>
#include <QtGui/QApplication>
#include <QtGui/QWidget>
#include <QtOpenGL/QGLFormat>
#include <QtOpenGL/QGLWidget>
#include <QtGui/QDesktopWidget>
#include <QtGui/QGraphicsProxyWidget>
#include <QtGui/QGraphicsSceneMouseEvent>
@@ -141,7 +139,7 @@ GraphicsEngine::~GraphicsEngine()
}

//---------------------------------------------------------------------------
bool GraphicsEngine::initialize(int aDisplay, int aWidth, int aHeight, bool aShowCursor, bool aUseOpenGL, bool aShowDebugInfo)
bool GraphicsEngine::initialize(int aDisplay, int aWidth, int aHeight, bool aShowCursor, bool aShowDebugInfo)
{
// Если задан отсутствующий в системе дисплей, откатываемся на нулевой
if (aDisplay < 0 || aDisplay > mScreens.size() - 1)
@@ -167,13 +165,6 @@ bool GraphicsEngine::initialize(int aDisplay, int aWidth, int aHeight, bool aSho
mScene.addItem(&mDebugWidget);
mDebugWidget.setVisible(aShowDebugInfo);

if (aUseOpenGL)
{
QGLFormat format = QGLFormat::defaultFormat();
QGLWidget* glWidget = new QGLWidget(format);
mView.setViewport(glWidget);
}

mView.setScene(&mScene);

// Настраиваем курсор


+ 1
- 1
3.0/src/modules/GraphicsEngine/src/GraphicsEngine.h View File

@@ -128,7 +128,7 @@ public:
/// Инициализация. Вызывается после addContentDirectory() и addEngine(),
/// инициализирует экран.
bool initialize(int aDisplay, int aWidth, int aHeight, bool aShowCursor, bool aUseOpenGL = false, bool aShowDebugInfo = false);
bool initialize(int aDisplay, int aWidth, int aHeight, bool aShowCursor, bool aShowDebugInfo = false);
/// Освобождение ресурсов
bool finalize();


+ 1
- 1
3.0/src/modules/Hardware/CashAcceptors/src/CCNet/FirmwareVersions.h View File

@@ -24,7 +24,7 @@ namespace CCCNet
{
data()[Models::CashcodeGX ][Currency::RUB][true] = TFimwareVersionSet() << 1205;

data()[Models::CashcodeSM ][Currency::RUB][true] = TFimwareVersionSet() << 1351;
data()[Models::CashcodeSM ][Currency::RUB][true] = TFimwareVersionSet() << 1353;

data()[Models::CashcodeSM ][Currency::RUB][false] = TFimwareVersionSet() << 1378 << 1434;
data()[Models::CashcodeMSM][Currency::RUB][false] = TFimwareVersionSet() << 1115;


+ 2
- 0
3.0/src/runtimes/ru/common/receipts/data/receipts/dispense_balance.xml View File

@@ -19,8 +19,10 @@
<string>Купюры 10 %CURRENCY% x %DISPENSED_10_BILL_COUNT% = %DISPENSED_10_BILL_SUM% %CURRENCY%</string>
<string>Купюры 50 %CURRENCY% x %DISPENSED_50_BILL_COUNT% = %DISPENSED_50_BILL_SUM% %CURRENCY%</string>
<string>Купюры 100 %CURRENCY% x %DISPENSED_100_BILL_COUNT% = %DISPENSED_100_BILL_SUM% %CURRENCY%</string>
<string>Купюры 200 %CURRENCY% x %DISPENSED_200_BILL_COUNT% = %DISPENSED_200_BILL_SUM% %CURRENCY%</string>
<string>Купюры 500 %CURRENCY% x %DISPENSED_500_BILL_COUNT% = %DISPENSED_500_BILL_SUM% %CURRENCY%</string>
<string>Купюры 1000 %CURRENCY% x %DISPENSED_1000_BILL_COUNT% = %DISPENSED_1000_BILL_SUM% %CURRENCY%</string>
<string>Купюры 2000 %CURRENCY% x %DISPENSED_2000_BILL_COUNT% = %DISPENSED_2000_BILL_SUM% %CURRENCY%</string>
<string>Купюры 5000 %CURRENCY% x %DISPENSED_5000_BILL_COUNT% = %DISPENSED_5000_BILL_SUM% %CURRENCY%</string>
<string>-----------------------------------</string>
<string>Кол-во купюр: %DISPENSED_BILL_COUNT%</string>


+ 2
- 0
3.0/src/runtimes/ru/common/receipts/data/receipts/dispense_encachment.xml View File

@@ -21,8 +21,10 @@
<string>Купюры 10 %CURRENCY% x %DISPENSED_10_BILL_COUNT% = %DISPENSED_10_BILL_SUM% %CURRENCY%</string>
<string>Купюры 50 %CURRENCY% x %DISPENSED_50_BILL_COUNT% = %DISPENSED_50_BILL_SUM% %CURRENCY%</string>
<string>Купюры 100 %CURRENCY% x %DISPENSED_100_BILL_COUNT% = %DISPENSED_100_BILL_SUM% %CURRENCY%</string>
<string>Купюры 200 %CURRENCY% x %DISPENSED_200_BILL_COUNT% = %DISPENSED_200_BILL_SUM% %CURRENCY%</string>
<string>Купюры 500 %CURRENCY% x %DISPENSED_500_BILL_COUNT% = %DISPENSED_500_BILL_SUM% %CURRENCY%</string>
<string>Купюры 1000 %CURRENCY% x %DISPENSED_1000_BILL_COUNT% = %DISPENSED_1000_BILL_SUM% %CURRENCY%</string>
<string>Купюры 2000 %CURRENCY% x %DISPENSED_2000_BILL_COUNT% = %DISPENSED_2000_BILL_SUM% %CURRENCY%</string>
<string>Купюры 5000 %CURRENCY% x %DISPENSED_5000_BILL_COUNT% = %DISPENSED_5000_BILL_SUM% %CURRENCY%</string>
<string>-----------------------------------</string>
<string>Кол-во купюр: %DISPENSED_BILL_COUNT%</string>


+ 2
- 0
3.0/src/runtimes/ru/common/receipts/data/receipts/encashment.xml View File

@@ -25,8 +25,10 @@
<string>Купюры 10 %CURRENCY% x %10_BILL_COUNT% = %10_BILL_SUM% %CURRENCY%</string>
<string>Купюры 50 %CURRENCY% x %50_BILL_COUNT% = %50_BILL_SUM% %CURRENCY%</string>
<string>Купюры 100 %CURRENCY% x %100_BILL_COUNT% = %100_BILL_SUM% %CURRENCY%</string>
<string>Купюры 200 %CURRENCY% x %200_BILL_COUNT% = %200_BILL_SUM% %CURRENCY%</string>
<string>Купюры 500 %CURRENCY% x %500_BILL_COUNT% = %500_BILL_SUM% %CURRENCY%</string>
<string>Купюры 1000 %CURRENCY% x %1000_BILL_COUNT% = %1000_BILL_SUM% %CURRENCY%</string>
<string>Купюры 2000 %CURRENCY% x %2000_BILL_COUNT% = %2000_BILL_SUM% %CURRENCY%</string>
<string>Купюры 5000 %CURRENCY% x %5000_BILL_COUNT% = %5000_BILL_SUM% %CURRENCY%</string>
<string>-----------------------------------</string>
<string>Кол-во купюр: %BILL_COUNT%</string>


+ 0
- 1
3.0/src/runtimes/ru/common/receipts/data/receipts/payment_mts.xml View File

@@ -53,7 +53,6 @@
<string>ИНН оператора: [b]%OPERATOR_INN%[/b]</string>
<string>[b]По данному провайдеру возможна задержка платежа[/b]</string>
<string>[b]Платеж принят без акцептования МТС[/b]</string>
<string if="'%AUTHCODE%' &amp;&amp; '%AUTHCODE%'.length &gt; 0">Номер платежа ЕСПП: %AUTHCODE%</string>
<string>-----------------------------------</string>
<string if="%DEALER_IS_BANK% == 0">Оператор по приему платежей:</string>
<string if="%DEALER_IS_BANK% == 0">ООО "КИБЕРПЛАТ"</string>


Loading…
Cancel
Save