瀏覽代碼

[FIX] messages

Gogs 6 年之前
父節點
當前提交
ecdb71150e
共有 4 個文件被更改,包括 26 次插入24 次删除
  1. 3 3
      __openerp__.py
  2. 2 2
      controllers/main.py
  3. 10 8
      static/src/js/main.js
  4. 11 11
      templates.xml

+ 3 - 3
__openerp__.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 {
-    'name': "Print Engine",
+    'name': "Printer Bridge",
     'author': "Robert Gauto",
-    'category': 'Uncategorized',
-    'version': '0.1',
+    'category': 'Tools',
+    'version': '8.0.0.1',
     'depends': ['base', 'web'],
     'data': [
         'templates.xml',

+ 2 - 2
controllers/main.py

@@ -8,7 +8,7 @@ class PrintEngineController(http.Controller):
 
     '''
     '''
-    @http.route('/print_engine/socket_config', auth='user', type='json')
+    @http.route('/printer_bridge/socket_config', auth='user', type='json')
     def socket_config(self, **kw):
         res_user = request.env.user
 
@@ -23,7 +23,7 @@ class PrintEngineController(http.Controller):
 
     '''
     '''
-    @http.route('/print_engine/get_pdf', auth='user', type='json')
+    @http.route('/printer_bridge/get_pdf', auth='user', type='json')
     def get_pdf(self, **kw):
         ctx = request.context
 

+ 10 - 8
static/src/js/main.js

@@ -1,4 +1,4 @@
-window.pdfjsLib.GlobalWorkerOptions.workerSrc = '/print_engine/static/lib/js/pdf.worker.js';
+window.pdfjsLib.GlobalWorkerOptions.workerSrc = '/printer_bridge/static/lib/js/pdf.worker.js';
 
 // Tools
 openerp.pdfJs = window.pdfjsLib || {};
@@ -10,7 +10,7 @@ openerp.html2canvas = window.html2canvas || {};
  * @param {*} instance 
  * @param {*} local 
  */
-openerp.print_engine = function (instance, local) {
+openerp.printer_bridge = function (instance, local) {
 
     // Clase que maneja el socket de conexión entre odoo y el programa de impresión cliente encargada de la impresión directa
     var SocketManager = instance.web.Class.extend({
@@ -136,7 +136,7 @@ openerp.print_engine = function (instance, local) {
             });
         },
         get_socket_config: function () {
-            var url = '/print_engine/socket_config';
+            var url = '/printer_bridge/socket_config';
             return this.get_from_server(url);
         },
         get_from_server: function (url) {
@@ -533,7 +533,7 @@ openerp.print_engine = function (instance, local) {
                     var a = document.createElement('a');
 
                     a.href = url;
-                    a.download = (self.name || metadata.contentDispositionFilename) + '.pdf';
+                    a.download = (self.name || metadata.contentDispositionFilename || 'document') + '.pdf';
                     a.target = '_parent';
                     a.click();
                 });
@@ -551,10 +551,12 @@ openerp.print_engine = function (instance, local) {
         var matchMimeType = source.match(/data:[a-zA-Z0-9]+\/[a-zA-Z0-9-.+]+.*,/);
 
         if (!matchMimeType) {
+            instance.webclient.crashmanager.show_message('Formato no válido para la impresión');
             return;
         }
-
+        
         if (!source.startsWith(matchMimeType[0])) {
+            instance.webclient.crashmanager.show_message('Formato no válido para la impresión');
             return;
         }
 
@@ -626,7 +628,7 @@ openerp.print_engine = function (instance, local) {
         }
     });
 
-    instance.web.client_actions.add('printer.test_ticket', 'instance.print_engine.TicketTestPage');
+    instance.web.client_actions.add('printer_bridge.test_ticket', 'instance.printer_bridge.TicketTestPage');
 
     if (instance.web) {
         if (instance.web.UserMenu) {
@@ -724,7 +726,7 @@ openerp.print_engine = function (instance, local) {
                     });
                 },
                 trigger_print_pdf: function (action) {
-                    var url = '/print_engine/get_pdf';
+                    var url = '/printer_bridge/get_pdf';
                     var ctx = _.clone(action.context);
 
                     ctx.report_name = action.report_name;
@@ -749,7 +751,7 @@ openerp.print_engine = function (instance, local) {
                         return;
                     }
 
-                    if (instance.print_engine.socket_manager.socket.disconnected) {
+                    if (local.socket_manager.socket.disconnected) {
                         if (config.action_download_pdf) {
                             self.trigger_download_pdf(action);
                             return;

+ 11 - 11
templates.xml

@@ -2,23 +2,23 @@
 <openerp>
     <data>
         <!-- Assets -->
-        <template id="printers_manager_assets" inherit_id="web.assets_backend">
+        <template id="printer_bridge_assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
-                <script type="text/javascript" src="/print_engine/static/lib/js/socket.io.js" />
-                <script type="text/javascript" src="/print_engine/static/lib/js/pdf.js" />
-                <script type="text/javascript" src="/print_engine/static/lib/js/pdf.worker.js" />
-                <script type="text/javascript" src="/print_engine/static/lib/js/print.js" />
-                <script type="text/javascript" src="/print_engine/static/lib/js/html2canvas.js" />
-                <script type="text/javascript" src="/print_engine/static/src/js/main.js" />
-                <link rel="stylesheet" href="/print_engine/static/src/css/main.css" />
+                <script type="text/javascript" src="/printer_bridge/static/lib/js/socket.io.js" />
+                <script type="text/javascript" src="/printer_bridge/static/lib/js/pdf.js" />
+                <script type="text/javascript" src="/printer_bridge/static/lib/js/pdf.worker.js" />
+                <script type="text/javascript" src="/printer_bridge/static/lib/js/print.js" />
+                <script type="text/javascript" src="/printer_bridge/static/lib/js/html2canvas.js" />
+                <script type="text/javascript" src="/printer_bridge/static/src/js/main.js" />
+                <link rel="stylesheet" href="/printer_bridge/static/src/css/main.css" />
             </xpath>
         </template>
 
-        <record id="printers_manager_test_ticket" model="ir.actions.client">
+        <record id="printer_bridge_test_ticket" model="ir.actions.client">
             <field name="name">Pos Ticket Test</field>
-            <field name="tag">printer.test_ticket</field>
+            <field name="tag">printer_bridge.test_ticket</field>
         </record>
 
-        <menuitem id="test_ticket_menu" name="Test Ticket" parent="report.reporting_menuitem" action="printers_manager_test_ticket" />
+        <menuitem id="test_ticket_menu" name="Test Ticket" parent="report.reporting_menuitem" action="printer_bridge_test_ticket" />
     </data>
 </openerp>