RubyGems - mercator_mesonic - Versions diffs - 0.0.1 → 0.1 - Mend

mercator_mesonic 0.0.1 → 0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

checksums.yaml +4 -4
data/README.rdoc +14 -4
data/app/controllers/users_controller_extensions.rb +14 -0
data/app/models/inventory_extensions.rb +23 -0
data/app/models/mercator_mesonic/artikelstamm.rb +82 -0
data/app/models/mercator_mesonic/kontakte_stamm.rb +10 -2
data/app/models/mercator_mesonic/kontenstamm.rb +8 -1
data/app/models/mercator_mesonic/kontenstamm_adresse.rb +12 -5
data/app/models/mercator_mesonic/kontenstamm_fakt.rb +15 -4
data/app/models/mercator_mesonic/kontenstamm_fibu.rb +12 -3
data/app/models/mercator_mesonic/order.rb +32 -28
data/app/models/mercator_mesonic/order_item.rb +25 -22
data/app/models/mercator_mesonic/price.rb +4 -4
data/app/models/mercator_mesonic/webartikel.rb +99 -21
data/app/models/order_extensions.rb +45 -0
data/app/models/user_extensions.rb +89 -0
data/app/views/users/invoices_shipments_payments.dryml +144 -0
data/db/migrate/20140327130259_add_vatline_articlegroup_provisioncode_characteristic_to_inventories.rb +15 -0
data/lib/mercator_mesonic/engine.rb +2 -0
data/lib/mercator_mesonic/version.rb +2 -2
data/lib/tasks/user.rake +75 -0
data/lib/tasks/webartikel.rake +49 -0
metadata +55 -34
data/app/helpers/mercator_mesonic/application_helper.rb +0 -4
data/lib/tasks/mercator_mesonic_tasks.rake +0 -4

data/app/views/users/invoices_shipments_payments.dryml ADDED Viewed

@@ -0,0 +1,144 @@
+<page title="Home">
+  <body: class="front-page"/>
+  <content:>
+    <section class="content-body">
+      <ul class="nav nav-tabs">
+        <li class="active">
+          <a href="#invoices" data-toggle="tab">
+            <t key='mercator.invoice.other'/>
+          </a>
+        </li>
+        <li>
+          <a href="#open_shipments" data-toggle="tab">
+            <t key='mercator.open_deliveries'/>
+          </a>
+        </li>
+        <li>
+          <a href="#open_payments" data-toggle="tab">
+            <t key='mercator.open_payments'/>
+          </a>
+        </li>
+      </ul>
+      <div id="myTabContent" class="tab-content">
+        <div class="tab-pane fade in active" id="invoices">
+          <repeat with="&@invoices">
+            <h3><t key='mercator.invoice.one'/> <view with="&this[0]"/></h3>
+            <p>
+              <strong><t key='mercator.customer_number'/>:</strong>
+              <view with="&this[1][0].Konto"/>,
+              <strong><t key='mercator.invoice.date'/>:</strong>
+              <view with="&this[1][0].Rechnungsdatum.to_date"/>
+            </p>
+            <table class="table table-striped table-condensed">
+              <tr>
+                <th><t key='mercator.ordering_text'/></th>
+                <th><t key='attributes.product_number'/></th>
+                <th><t key='mercator.identifier'/></th>
+                <th><t key='attributes.amount'/></th>
+                <th><t key='activerecord.attributes.lineitem.product_price'/></th>
+                <th><t key='activerecord.attributes.lineitem.value'/></th>
+              </tr>
+              <repeat with="&this[1]">
+                <tr>
+                  <td><view:Bestelltext/></td>
+                  <td><view:ArtNr/></td>
+                  <td><view:Bezeichnung/></td>
+                  <td><view:Menge/></td>
+                  <td><view with="&number_to_currency(this.Einzelpreis)"/></td>
+                  <td><view with="&number_to_currency(this.Gesamtpreis)"/></td>
+                </tr>
+              </repeat>
+            </table>
+          </repeat>
+          <else>
+            <t key='mercator.no_invoices'/>
+          </else>
+        </div>
+        <div class="tab-pane fade" id="open_shipments">
+          <repeat with="&@open_shipments">
+            <h3><t key='mercator.packing_slip_number'/> <view with="&this[0]"/></h3>
+            <p>
+              <strong><t key='mercator.customer_number'/>:</strong>
+              <view with="&this[1][0].Konto"/>,
+              <strong><t key='mercator.delivery_slip_date'/>:</strong>
+              <view with="&this[1][0].Lieferscheindatum.to_date"/><br/>
+              <strong><t key='mercator.invoice.number'/>:</strong>
+              <view with="&this[1][0].Rechnungsnummer.to_date"/><br/>
+              <strong><t key='mercator.invoice.date'/>:</strong>
+              <view with="&this[1][0].Rechnungsdatum.to_date"/>
+            </p>
+            <table class="table table-striped table-condensed">
+              <tr>
+                <th><t key='mercator.ordering_text'/></th>
+                <th><t key='attributes.product_number'/></th>
+                <th><t key='mercator.identifier'/></th>
+                <th><t key='attributes.amount'/></th>
+                <th><t key='activerecord.attributes.lineitem.product_price'/></th>
+                <th><t key='activerecord.attributes.lineitem.value'/></th>
+              </tr>
+              <repeat with="&this[1]">
+                <tr>
+                  <td><view:Bestelltext/></td>
+                  <td><view:ArtNr/></td>
+                  <td><view:Bezeichnung/></td>
+                  <td><view:Menge/></td>
+                  <td><view with="&number_to_currency(this.Einzelpreis)"/></td>
+                  <td><view with="&number_to_currency(this.Gesamtpreis)"/></td>
+                </tr>
+              </repeat>
+            </table>
+          </repeat>
+          <else><t key='mercator.no_deliveries'/>n</else>
+        </div>
+        <div class="tab-pane fade" id="open_payments">
+          <repeat with="&@open_payments">
+            <h3><t key='mercator.delivery_number'/> <view with="&this[0]"/></h3>
+            <p>
+              <strong><t key='mercator.customer_number'/>:</strong>
+              <view with="&this[1][0].Konto"/>,
+              <strong><t key='mercator.order.date'/>:</strong>
+              <view with="&this[1][0].Auftragsdatum.to_date"/><br/>
+              <strong><t key='mercator.order.number'/>:</strong>
+              <view with="&this[1][0].Auftragsnummer.to_date"/><br/>
+              <strong><t key='mercator.invoice.date'/>:</strong>
+              <view with="&this[1][0].Rechnungsdatum.to_date"/>
+            </p>
+            <table class="table table-striped table-condensed">
+              <tr>
+                <th><t key='mercator.order.text'/></th>
+                <th><t key='attributes.product_number'/></th>
+                <th><t key='mercator.identifier'/></th>
+                <th><t key='attributes.amount'/></th>
+                <th><t key='activerecord.attributes.lineitem.product_price'/></th>
+                <th><t key='activerecord.attributes.lineitem.value'/></th>
+              </tr>
+              <repeat with="&this[1]">
+                <tr>
+                  <td><view:Bestelltext/></td>
+                  <td><view:ArtNr/></td>
+                  <td><view:Bezeichnung/></td>
+                  <td><view:Menge/></td>
+                  <td><view with="&number_to_currency(this.Einzelpreis)"/></td>
+                  <td><view with="&number_to_currency(this.Gesamtpreis)"/></td>
+                </tr>
+              </repeat>
+            </table>
+          </repeat>
+          <else><t key='mercator.no_open_payments'/></else>
+        </div>
+      </div>
+    </section>
+  </content:>
+</page>

data/db/migrate/20140327130259_add_vatline_articlegroup_provisioncode_characteristic_to_inventories.rb ADDED Viewed

@@ -0,0 +1,15 @@
+class AddVatlineArticlegroupProvisioncodeCharacteristicToInventories < ActiveRecord::Migration
+  def self.up
+    add_column :inventories, :erp_vatline, :integer
+    add_column :inventories, :erp_article_group, :integer
+    add_column :inventories, :erp_provision_code, :integer
+    add_column :inventories, :erp_characteristic_flag, :integer
+  end
+  def self.down
+    remove_column :inventories, :erp_vatline
+    remove_column :inventories, :erp_article_group
+    remove_column :inventories, :erp_provision_code
+    remove_column :inventories, :erp_characteristic_flag
+  end
+end

data/lib/mercator_mesonic/engine.rb CHANGED Viewed

@@ -1,5 +1,7 @@
 module MercatorMesonic
   class Engine < ::Rails::Engine
     isolate_namespace MercatorMesonic
+    config.erp = "mesonic"
   end
 end

data/lib/mercator_mesonic/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module MercatorMesonic
-  VERSION = "0.0.1"
-end
+  VERSION = "0.1"
+end

data/lib/tasks/user.rake ADDED Viewed

@@ -0,0 +1,75 @@
+# encoding: utf-8
+require "squeel"
+namespace :mesonic do
+  namespace :users do
+    # starten als: 'bundle exec rake mesonic:users:update_erp_account_nrs'
+    # in Produktivumgebungen: 'bundle exec rake mesonic:users:update_erp_account_nrs RAILS_ENV=production'
+    desc 'Update erp account nrs via erp contact numbers from Mesonic '
+    task :update_erp_account_nrs => :environment do
+      ::JobLogger.info("=" * 50)
+      ::JobLogger.info("Started Job: mesonic:users:update_erp_account_nrs")
+      User.update_erp_account_nrs
+      ::JobLogger.info("Finished Job: mesonic:users:update_erp_account_nrs")
+      ::JobLogger.info("=" * 50)
+    end
+  end
+  namespace :addresses do
+    # starten als: 'bundle exec rake mesonic:addresses:import'
+    # in Produktivumgebungen: 'bundle exec rake mesonic:addresses:import RAILS_ENV=production'
+    desc 'Import addresses from Mesonic '
+    task :import => :environment do
+      ::JobLogger.info("=" * 50)
+      ::JobLogger.info("Started Job: mesonic:addresses:import")
+      if MercatorMesonic::Webartikel.test_connection
+        User.where{erp_contact_nr != nil}.all.each do |user|
+          user.update(erp_account_nr: user.erp_account_nr[0..-3]+"68",
+                      erp_contact_nr: user.erp_contact_nr[0..-3]+"68")
+          @mesonic_address = MercatorMesonic::KontenstammAdresse.where(mesoprim: user.erp_account_nr).first
+          if @mesonic_address
+            name = @mesonic_address.firstname ? @mesonic_address.firstname + " " + @mesonic_address.lastname : @mesonic_address.lastname
+            name = name ? name : "Bitte Name aktualisieren!"
+            land = @mesonic_address.land ? @mesonic_address.land : "Österreich"
+            @billing_address = BillingAddress.new(user_id: user.id,
+                                                  name: name,
+                                                  c_o: @mesonic_address.to_hand,
+                                                  street: @mesonic_address.street,
+                                                  postalcode: @mesonic_address.postal,
+                                                  city: @mesonic_address.city,
+                                                  country: land,
+                                                  email_address: @mesonic_address.email)
+            if @billing_address.save
+              ::JobLogger.info("Saved BillingAddress " + @billing_address.id.to_s)
+            else
+              ::JobLogger.error("Saving BillingAddress " + @billing_address.name + "failed.")
+            end
+            @address = Address.new(user_id: user.id,
+                                   name: name,
+                                   c_o: @mesonic_address.to_hand,
+                                   street: @mesonic_address.street,
+                                   postalcode: @mesonic_address.postal,
+                                   city: @mesonic_address.city,
+                                   country: land)
+            if @address.save
+              ::JobLogger.info("Saved Address " + @address.id.to_s)
+            else
+              ::JobLogger.error("Saving Address " + @address.name + "failed.")
+            end
+          else
+            ::JobLogger.warn("Contact " + user.erp_account_nr.to_s + " not found.")
+          end
+        end
+      end
+      ::JobLogger.info("Finished Job: mesonic:addresses:import")
+      ::JobLogger.info("=" * 50)
+    end
+  end
+end

data/lib/tasks/webartikel.rake ADDED Viewed

@@ -0,0 +1,49 @@
+# encoding: utf-8
+namespace :webartikel do
+  # starten als: 'bundle exec rake webartikel:import'
+  # in Produktivumgebungen: 'bundle exec rake webartikel:import RAILS_ENV=production'
+  desc 'Import from Mesonic Webartikel view into inventories'
+  task :import => :environment do
+    ::JobLogger.info("=" * 50)
+    ::JobLogger.info("Started Job: webartikel:import")
+    if MercatorMesonic::Webartikel.test_connection
+      MercatorMesonic::Webartikel.import(update: "all")
+    end
+    ::JobLogger.info("Finished Job: webartikel:import")
+    ::JobLogger.info("=" * 50)
+  end
+  # starten als: 'bundle exec rake webartikel:update'
+  # in Produktivumgebungen: 'bundle exec rake webartikel:update RAILS_ENV=production'
+  desc 'Update from Mesonic Webartikel view into inventories'
+  task :update => :environment do
+    ::JobLogger.info("=" * 50)
+    ::JobLogger.info("Started Job: webartikel:update")
+    if MercatorMesonic::Webartikel.test_connection
+      MercatorMesonic::Webartikel.import(update: "changed")
+    end
+    ::JobLogger.info("Finished Job: webartikel:update")
+    ::JobLogger.info("=" * 50)
+  end
+    # starten als: 'bundle exec rake webartikel:remove_orphans'
+  # in Produktivumgebungen: 'bundle exec rake webartikel:remove_orphans RAILS_ENV=production'
+  desc 'Remove ophaned inventories'
+  task :remove_orphans => :environment do
+    ::JobLogger.info("=" * 50)
+    ::JobLogger.info("Started Job: webartikel:remove_orphans")
+    if MercatorMesonic::Webartikel.test_connection
+      MercatorMesonic::Webartikel.remove_orphans
+    end
+    ::JobLogger.info("Finished Job: webartikel:remove_orphans")
+    ::JobLogger.info("=" * 50)
+  end
+end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercator_mesonic
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: '0.1'
 platform: ruby
 authors:
 - Stefan Haslinger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activerecord-sqlserver-adapter
   requirement: !ruby/object:Gem::Requirement
@@ -38,10 +38,24 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: MercatorMesonic interfaces between Mercator and Mesonic in the realm
   of customers, addresses, articles, inventories, orders, and orderitems.
 email:
-- stefan.haslinger@mittenin.at
+- stefan.haslinger@informatom.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -52,8 +66,10 @@ files:
 - app/assets/javascripts/mercator_mesonic/application.js
 - app/assets/stylesheets/mercator_mesonic/application.css
 - app/controllers/mercator_mesonic/application_controller.rb
-- app/helpers/mercator_mesonic/application_helper.rb
+- app/controllers/users_controller_extensions.rb
+- app/models/inventory_extensions.rb
 - app/models/mercator_mesonic/akt_mandant.rb
+- app/models/mercator_mesonic/artikelstamm.rb
 - app/models/mercator_mesonic/base.rb
 - app/models/mercator_mesonic/belegart.rb
 - app/models/mercator_mesonic/kontakte_stamm.rb
@@ -66,13 +82,18 @@ files:
 - app/models/mercator_mesonic/price.rb
 - app/models/mercator_mesonic/webartikel.rb
 - app/models/mercator_mesonic/zahlungsart.rb
+- app/models/order_extensions.rb
+- app/models/user_extensions.rb
+- app/views/users/invoices_shipments_payments.dryml
 - config/routes.rb
 - db/migrate/20140319161842_add_erp_updated_at_to_inventory.rb
 - db/migrate/20140325093328_add_erp_contact_nr_erp_account_nr_to_user.rb
+- db/migrate/20140327130259_add_vatline_articlegroup_provisioncode_characteristic_to_inventories.rb
 - lib/mercator_mesonic.rb
 - lib/mercator_mesonic/engine.rb
 - lib/mercator_mesonic/version.rb
-- lib/tasks/mercator_mesonic_tasks.rake
+- lib/tasks/user.rake
+- lib/tasks/webartikel.rake
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
@@ -109,7 +130,7 @@ files:
 - test/mercator_mesonic_test.rb
 - test/models/mercator_mesonic/base_test.rb
 - test/test_helper.rb
-homepage: http://informatom.com
+homepage: http://mercator.informatom.com
 licenses: []
 metadata: {}
 post_install_message:
@@ -134,39 +155,39 @@ specification_version: 4
 summary: MercatorMesonic provides Mercator ERP Integration for the Mesonic Guided
   Selling Application.
 test_files:
-- test/mercator_mesonic_test.rb
-- test/dummy/public/422.html
-- test/dummy/public/404.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/routes.rb
-- test/dummy/config/database.yml
-- test/dummy/config/initializers/session_store.rb
+- test/fixtures/mercator_mesonic/bases.yml
+- test/models/mercator_mesonic/base_test.rb
+- test/dummy/bin/bundle
+- test/dummy/bin/rails
+- test/dummy/bin/rake
 - test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/locales/en.yml
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/session_store.rb
 - test/dummy/config/application.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/locales/en.yml
 - test/dummy/config/environment.rb
-- test/dummy/bin/rake
-- test/dummy/bin/rails
-- test/dummy/bin/bundle
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config/routes.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/database.yml
+- test/dummy/public/404.html
+- test/dummy/public/favicon.ico
+- test/dummy/public/500.html
+- test/dummy/public/422.html
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/config.ru
-- test/dummy/Rakefile
-- test/integration/navigation_test.rb
 - test/test_helper.rb
-- test/models/mercator_mesonic/base_test.rb
-- test/fixtures/mercator_mesonic/bases.yml
+- test/integration/navigation_test.rb
+- test/mercator_mesonic_test.rb