diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index 7f9281a..180f2fa 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 992a5fa..97f3e0c 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -53,7 +53,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4060FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.0.6.0FactuGESFactuGES4.0.6.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4070FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.0.7.0FactuGESFactuGES4.0.7.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 12526bb..5539b8b 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 4,0,6,0 -PRODUCTVERSION 4,0,6,0 +FILEVERSION 4,0,7,0 +PRODUCTVERSION 4,0,7,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "4.0.6.0\0" + VALUE "FileVersion", "4.0.7.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "4.0.6.0\0" + VALUE "ProductVersion", "4.0.7.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index d8a4808..1d6deb6 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc index dc07ad9..c3a8fa5 100644 --- a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc +++ b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc @@ -13,4 +13,4 @@ BEGIN END /* C:\Codigo\Source\Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.RES */ -/* c:\temp\dtf124.tmp */ +/* c:\temp\dtf1AB.tmp */ diff --git a/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc b/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc index 39deefb..302bbce 100644 --- a/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc +++ b/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc @@ -14,4 +14,4 @@ END /* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\uDataModulePedidosCliente.dfm */ /* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\PedidosCliente_data.RES */ -/* c:\temp\dtf122.tmp */ +/* c:\temp\dtf1A9.tmp */ diff --git a/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc b/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc index ba6a32c..ad633f2 100644 --- a/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc +++ b/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc @@ -13,4 +13,4 @@ BEGIN END /* C:\Codigo\Source\Modulos\Pedidos de cliente\Model\PedidosCliente_model.RES */ -/* c:\temp\dtf120.tmp */ +/* c:\temp\dtf1A7.tmp */ diff --git a/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc b/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc index c726a88..a1e7afc 100644 --- a/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc +++ b/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc @@ -14,4 +14,4 @@ END /* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\uPluginPedidosCliente.dfm */ /* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\PedidosCliente_plugin.RES */ -/* c:\temp\dtf188.tmp */ +/* c:\temp\dtf20F.tmp */ diff --git a/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc b/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc index 640a122..7eb2c2a 100644 --- a/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc +++ b/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc @@ -26,4 +26,4 @@ END /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorElegirArticulosPedidoCliente.dfm */ /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorDireccionEntregaPedidoCliente.dfm */ /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\PedidosCliente_view.RES */ -/* c:\temp\dtf186.tmp */ +/* c:\temp\dtf20D.tmp */ diff --git a/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas b/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas index a7267d9..ed8f542 100644 --- a/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas +++ b/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas @@ -1014,7 +1014,7 @@ end; procedure TRecibosClienteController.QuitarRemesa(ARecibos: IBizRecibosCliente); begin - if Assigned(ARecibos) then + if Assigned(ARecibos) and Assigned(ARecibos.Pagos) then begin if ARecibos.Pagos.DataTable.RecordCount = 0 then Exit; diff --git a/Source/Modulos/Recibos de cliente/Model/uBizRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Model/uBizRecibosCliente.pas index 2ebbb7e..0cdc448 100644 --- a/Source/Modulos/Recibos de cliente/Model/uBizRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Model/uBizRecibosCliente.pas @@ -178,10 +178,15 @@ end; destructor TBizRecibosCliente.Destroy; begin + FCliente := Nil; FPagos := NIL; FRecibosCompensados := Nil; - FreeAndNIL(FPagosLink); - FreeAndNIL(FRecibosCompensadosLink); + if Assigned(FPagosLink) then + FPagosLink.Free; + +//Peticion #495 +// if Assigned(FRecibosCompensadosLink) then +// FRecibosCompensadosLink.Free; FSeleccionableInterface := NIL; inherited; end; diff --git a/Source/Modulos/Remesas de cliente/Model/uBizRemesasCliente.pas b/Source/Modulos/Remesas de cliente/Model/uBizRemesasCliente.pas index d9ac2ea..2e1320d 100644 --- a/Source/Modulos/Remesas de cliente/Model/uBizRemesasCliente.pas +++ b/Source/Modulos/Remesas de cliente/Model/uBizRemesasCliente.pas @@ -45,7 +45,7 @@ implementation uses uDataTableUtils, uDataModuleUsuarios, SysUtils, uROClasses, Classes, - uFactuGES_App; + uFactuGES_App, dialogs; { TBizRemesaCliente } @@ -91,8 +91,10 @@ procedure TBizRemesaCliente.SetRecibos(const Value: IBizRecibosCliente); begin FRecibos := Value; if Assigned(FRecibos) then + begin if not FRecibos.DataTable.Active then FRecibos.DataTable.Active := True; + end; end; initialization diff --git a/Source/Modulos/Remesas de cliente/RemesasCliente_Group.groupproj b/Source/Modulos/Remesas de cliente/RemesasCliente_Group.groupproj index 7c21b06..230bbd5 100644 --- a/Source/Modulos/Remesas de cliente/RemesasCliente_Group.groupproj +++ b/Source/Modulos/Remesas de cliente/RemesasCliente_Group.groupproj @@ -12,6 +12,9 @@ + + + @@ -201,14 +204,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Tienda web/Controller/Utiles/uActualizarPedidosUtils.pas b/Source/Modulos/Tienda web/Controller/Utiles/uActualizarPedidosUtils.pas index 1e81ce2..4a7ff4d 100644 --- a/Source/Modulos/Tienda web/Controller/Utiles/uActualizarPedidosUtils.pas +++ b/Source/Modulos/Tienda web/Controller/Utiles/uActualizarPedidosUtils.pas @@ -60,6 +60,8 @@ begin begin ID_CLIENTE := AOSCOrder.rdx_customers_id_local; _Cliente := (AClientesController.Buscar(AOSCOrder.rdx_customers_id_local) as IBizCliente); + if not _Cliente.DataTable.Active then + _Cliente.DataTable.Active := True; FECHA_PEDIDO := AOSCOrder.date_purchased; CALLE := AOSCOrder.delivery_street_address; diff --git a/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc b/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc index 0601be4..a456be7 100644 --- a/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc +++ b/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc @@ -14,4 +14,4 @@ END /* C:\Codigo\Source\Modulos\Tienda web\Data\uDataModuleTiendaWeb.dfm */ /* C:\Codigo\Source\Modulos\Tienda web\Data\TiendaWeb_data.res */ -/* c:\temp\dtf13A.tmp */ +/* c:\temp\dtf1C1.tmp */ diff --git a/Source/Modulos/Tienda web/Model/schTiendaWebClient_Intf.pas b/Source/Modulos/Tienda web/Model/schTiendaWebClient_Intf.pas index 46d7e9a..e7952c1 100644 --- a/Source/Modulos/Tienda web/Model/schTiendaWebClient_Intf.pas +++ b/Source/Modulos/Tienda web/Model/schTiendaWebClient_Intf.pas @@ -9,16 +9,20 @@ const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_osc_Customers = '{7B414787-7FB3-4C7E-B5F4-D6DC724C7986}'; - RID_GetLastID = '{EC74F663-AF44-449F-A865-D6FC7DAA2984}'; - RID_osc_AddressBook = '{92F1B476-62B9-48D5-B7FA-08FC8A878695}'; - RID_TiendaWeb = '{EAB775DA-7B9A-4650-A698-63F246F755B3}'; - RID_osc_Manufacturers = '{1D5AC5D5-FA39-47F6-B015-830C5D143002}'; - RID_osc_Languages = '{74B3F68E-6D93-4EC3-A8E0-9EB54A9ABF17}'; - RID_osc_Products = '{06950934-0858-4CDE-A2D6-D4D6CDA7C711}'; - RID_osc_Orders = '{9AD7AD6E-41AF-44D6-97C7-56D7B7C874F6}'; - RID_osc_Orders_products = '{F2D861B5-937C-443B-8C4D-77DDFEED0FBF}'; - RID_osc_Orders_status_history = '{938F6829-DC4D-4551-918A-85D8833B18BC}'; + RID_osc_Customers = '{EC32F0C9-4591-493D-8286-139C48DA96FA}'; + RID_GetLastID = '{31545968-26EF-44AC-AE0D-DA3DF2FF2AEA}'; + RID_osc_AddressBook = '{9E7EC2F8-78EB-469D-AFD7-44762040BFE3}'; + RID_TiendaWeb = '{F23F9E4C-5581-4B66-8819-D0C2CE3EEB86}'; + RID_osc_Manufacturers = '{D7967B27-4D27-4852-A60F-2569EA2A03E1}'; + RID_osc_Languages = '{CB466A9C-5643-414E-89D4-D8A0275FB17D}'; + RID_osc_Products = '{B2F6B99B-CE58-4C86-AC38-F4441D01F915}'; + RID_osc_Orders = '{AD353B86-B979-4CF3-8D72-57254828FDAE}'; + RID_osc_Orders_products = '{510EDA38-70F8-4983-BEBD-08F0CBAEA672}'; + RID_osc_Orders_status_history = '{4F40606A-1E89-45FC-8359-70F6DDDC9491}'; + RID_osc_Customers_Refresh = '{CFE6E885-E4E3-4642-82E7-9666B2301E69}'; + RID_osc_AddressBook_Refresh = '{89B2125D-D723-4A6C-B06A-01D89997BDC2}'; + RID_osc_Manufacturers_Refresh = '{5446BD79-202F-4076-A3D3-F059DD642598}'; + RID_osc_Products_Refresh = '{BCEEF215-2395-4571-B731-CF91C771A7F3}'; { Data table names } nme_osc_Customers = 'osc_Customers'; @@ -31,6 +35,10 @@ const nme_osc_Orders = 'osc_Orders'; nme_osc_Orders_products = 'osc_Orders_products'; nme_osc_Orders_status_history = 'osc_Orders_status_history'; + nme_osc_Customers_Refresh = 'osc_Customers-Refresh'; + nme_osc_AddressBook_Refresh = 'osc_AddressBook-Refresh'; + nme_osc_Manufacturers_Refresh = 'osc_Manufacturers-Refresh'; + nme_osc_Products_Refresh = 'osc_Products-Refresh'; { osc_Customers fields } fld_osc_Customerscustomers_id = 'customers_id'; @@ -260,10 +268,34 @@ const idx_osc_Orders_status_historycustomer_notified = 5; idx_osc_Orders_status_historycomments = 6; + { osc_Customers-Refresh fields } + fld_osc_Customers_Refreshcustomers_id = 'customers_id'; + + { osc_Customers-Refresh field indexes } + idx_osc_Customers_Refreshcustomers_id = 0; + + { osc_AddressBook-Refresh fields } + fld_osc_AddressBook_Refreshaddress_book_id = 'address_book_id'; + + { osc_AddressBook-Refresh field indexes } + idx_osc_AddressBook_Refreshaddress_book_id = 0; + + { osc_Manufacturers-Refresh fields } + fld_osc_Manufacturers_Refreshmanufacturers_id = 'manufacturers_id'; + + { osc_Manufacturers-Refresh field indexes } + idx_osc_Manufacturers_Refreshmanufacturers_id = 0; + + { osc_Products-Refresh fields } + fld_osc_Products_Refreshproducts_id = 'products_id'; + + { osc_Products-Refresh field indexes } + idx_osc_Products_Refreshproducts_id = 0; + type { Iosc_Customers } Iosc_Customers = interface(IDAStronglyTypedDataTable) - ['{D7E9BFB6-3910-4AAF-A23E-EEABE59CF6DD}'] + ['{A688AFE1-80BA-44F1-84C8-5507151E2910}'] { Property getters and setters } function Getcustomers_idValue: Integer; procedure Setcustomers_idValue(const aValue: Integer); @@ -418,7 +450,7 @@ type { IGetLastID } IGetLastID = interface(IDAStronglyTypedDataTable) - ['{2D8C65A9-8193-46BD-BFBC-D635D547978C}'] + ['{7ED81A10-8DDA-467B-88C5-DD7B27138823}'] { Property getters and setters } function Getlast_idValue: Integer; procedure Setlast_idValue(const aValue: Integer); @@ -453,7 +485,7 @@ type { Iosc_AddressBook } Iosc_AddressBook = interface(IDAStronglyTypedDataTable) - ['{904D18A9-9DE6-44BD-87CC-04AEB4722ACC}'] + ['{B102616D-79D3-44C9-8ECD-E8F0F6FA2679}'] { Property getters and setters } function Getaddress_book_idValue: Integer; procedure Setaddress_book_idValue(const aValue: Integer); @@ -656,7 +688,7 @@ type { ITiendaWeb } ITiendaWeb = interface(IDAStronglyTypedDataTable) - ['{49EC332D-5318-4E39-BD54-95C1D08BB4F7}'] + ['{3282D049-6BEF-4154-8E07-4E9625012668}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -787,7 +819,7 @@ type { Iosc_Manufacturers } Iosc_Manufacturers = interface(IDAStronglyTypedDataTable) - ['{56A9B8F8-7538-47E2-8C4D-AD569CE3C226}'] + ['{45D2FBE2-350C-4440-AF6A-6E397C58B22E}'] { Property getters and setters } function Getmanufacturers_idValue: Integer; procedure Setmanufacturers_idValue(const aValue: Integer); @@ -885,7 +917,7 @@ type } { Iosc_Languages } Iosc_Languages = interface(IDAStronglyTypedDataTable) - ['{7C625C62-43EF-4340-A8E6-EC6B4EAA299B}'] + ['{BCE95014-6181-4EDB-ACF6-427BEE965FCC}'] { Property getters and setters } function Getlanguages_idValue: Integer; procedure Setlanguages_idValue(const aValue: Integer); @@ -980,7 +1012,7 @@ type { Iosc_Products } Iosc_Products = interface(IDAStronglyTypedDataTable) - ['{C99FB025-828E-4D74-9270-D9A2C954B6D6}'] + ['{F5C79D4B-1F7C-470C-9BFD-094014D60334}'] { Property getters and setters } function Getproducts_idValue: Integer; procedure Setproducts_idValue(const aValue: Integer); @@ -1111,7 +1143,7 @@ type { Iosc_Orders } Iosc_Orders = interface(IDAStronglyTypedDataTable) - ['{F120AB1C-A35E-4D24-B5E9-41A325E7081B}'] + ['{CD1B248C-F407-4562-B12A-9A8E818C8860}'] { Property getters and setters } function Getorders_idValue: Integer; procedure Setorders_idValue(const aValue: Integer); @@ -1374,7 +1406,7 @@ type { Iosc_Orders_products } Iosc_Orders_products = interface(IDAStronglyTypedDataTable) - ['{CC27855E-2D28-4432-BA5F-D3C10BA8464D}'] + ['{36C757D3-2809-47E5-AA8D-AAAA19BEE8A9}'] { Property getters and setters } function Getorders_products_idValue: Integer; procedure Setorders_products_idValue(const aValue: Integer); @@ -1517,7 +1549,7 @@ type { Iosc_Orders_status_history } Iosc_Orders_status_history = interface(IDAStronglyTypedDataTable) - ['{0EB347F2-296B-4A89-9611-FCE05DD7516F}'] + ['{92FD7BB8-623B-42CB-8737-80D30CDBF714}'] { Property getters and setters } function Getorders_status_history_idValue: Integer; procedure Setorders_status_history_idValue(const aValue: Integer); @@ -1622,6 +1654,146 @@ type end; + { Iosc_Customers_Refresh } + Iosc_Customers_Refresh = interface(IDAStronglyTypedDataTable) + ['{640521B7-55A3-48EF-8354-972E28A7C2D9}'] + { Property getters and setters } + function Getcustomers_idValue: Int64; + procedure Setcustomers_idValue(const aValue: Int64); + function Getcustomers_idIsNull: Boolean; + procedure Setcustomers_idIsNull(const aValue: Boolean); + + + { Properties } + property customers_id: Int64 read Getcustomers_idValue write Setcustomers_idValue; + property customers_idIsNull: Boolean read Getcustomers_idIsNull write Setcustomers_idIsNull; + end; + + { Tosc_Customers_RefreshDataTableRules } + Tosc_Customers_RefreshDataTableRules = class(TIntfObjectDADataTableRules, Iosc_Customers_Refresh) + private + protected + { Property getters and setters } + function Getcustomers_idValue: Int64; virtual; + procedure Setcustomers_idValue(const aValue: Int64); virtual; + function Getcustomers_idIsNull: Boolean; virtual; + procedure Setcustomers_idIsNull(const aValue: Boolean); virtual; + + { Properties } + property customers_id: Int64 read Getcustomers_idValue write Setcustomers_idValue; + property customers_idIsNull: Boolean read Getcustomers_idIsNull write Setcustomers_idIsNull; + + public + constructor Create(aDataTable: TDADataTable); override; + destructor Destroy; override; + + end; + + { Iosc_AddressBook_Refresh } + Iosc_AddressBook_Refresh = interface(IDAStronglyTypedDataTable) + ['{2F461BB1-0D9E-49B1-9E81-5485C3F7ED5E}'] + { Property getters and setters } + function Getaddress_book_idValue: Int64; + procedure Setaddress_book_idValue(const aValue: Int64); + function Getaddress_book_idIsNull: Boolean; + procedure Setaddress_book_idIsNull(const aValue: Boolean); + + + { Properties } + property address_book_id: Int64 read Getaddress_book_idValue write Setaddress_book_idValue; + property address_book_idIsNull: Boolean read Getaddress_book_idIsNull write Setaddress_book_idIsNull; + end; + + { Tosc_AddressBook_RefreshDataTableRules } + Tosc_AddressBook_RefreshDataTableRules = class(TIntfObjectDADataTableRules, Iosc_AddressBook_Refresh) + private + protected + { Property getters and setters } + function Getaddress_book_idValue: Int64; virtual; + procedure Setaddress_book_idValue(const aValue: Int64); virtual; + function Getaddress_book_idIsNull: Boolean; virtual; + procedure Setaddress_book_idIsNull(const aValue: Boolean); virtual; + + { Properties } + property address_book_id: Int64 read Getaddress_book_idValue write Setaddress_book_idValue; + property address_book_idIsNull: Boolean read Getaddress_book_idIsNull write Setaddress_book_idIsNull; + + public + constructor Create(aDataTable: TDADataTable); override; + destructor Destroy; override; + + end; + + { Iosc_Manufacturers_Refresh } + Iosc_Manufacturers_Refresh = interface(IDAStronglyTypedDataTable) + ['{36DF788F-50E7-44E7-B8AA-55CCAE69C65C}'] + { Property getters and setters } + function Getmanufacturers_idValue: Int64; + procedure Setmanufacturers_idValue(const aValue: Int64); + function Getmanufacturers_idIsNull: Boolean; + procedure Setmanufacturers_idIsNull(const aValue: Boolean); + + + { Properties } + property manufacturers_id: Int64 read Getmanufacturers_idValue write Setmanufacturers_idValue; + property manufacturers_idIsNull: Boolean read Getmanufacturers_idIsNull write Setmanufacturers_idIsNull; + end; + + { Tosc_Manufacturers_RefreshDataTableRules } + Tosc_Manufacturers_RefreshDataTableRules = class(TIntfObjectDADataTableRules, Iosc_Manufacturers_Refresh) + private + protected + { Property getters and setters } + function Getmanufacturers_idValue: Int64; virtual; + procedure Setmanufacturers_idValue(const aValue: Int64); virtual; + function Getmanufacturers_idIsNull: Boolean; virtual; + procedure Setmanufacturers_idIsNull(const aValue: Boolean); virtual; + + { Properties } + property manufacturers_id: Int64 read Getmanufacturers_idValue write Setmanufacturers_idValue; + property manufacturers_idIsNull: Boolean read Getmanufacturers_idIsNull write Setmanufacturers_idIsNull; + + public + constructor Create(aDataTable: TDADataTable); override; + destructor Destroy; override; + + end; + + { Iosc_Products_Refresh } + Iosc_Products_Refresh = interface(IDAStronglyTypedDataTable) + ['{6730C665-A7E7-467A-906D-75068D7CE6A1}'] + { Property getters and setters } + function Getproducts_idValue: Int64; + procedure Setproducts_idValue(const aValue: Int64); + function Getproducts_idIsNull: Boolean; + procedure Setproducts_idIsNull(const aValue: Boolean); + + + { Properties } + property products_id: Int64 read Getproducts_idValue write Setproducts_idValue; + property products_idIsNull: Boolean read Getproducts_idIsNull write Setproducts_idIsNull; + end; + + { Tosc_Products_RefreshDataTableRules } + Tosc_Products_RefreshDataTableRules = class(TIntfObjectDADataTableRules, Iosc_Products_Refresh) + private + protected + { Property getters and setters } + function Getproducts_idValue: Int64; virtual; + procedure Setproducts_idValue(const aValue: Int64); virtual; + function Getproducts_idIsNull: Boolean; virtual; + procedure Setproducts_idIsNull(const aValue: Boolean); virtual; + + { Properties } + property products_id: Int64 read Getproducts_idValue write Setproducts_idValue; + property products_idIsNull: Boolean read Getproducts_idIsNull write Setproducts_idIsNull; + + public + constructor Create(aDataTable: TDADataTable); override; + destructor Destroy; override; + + end; + implementation uses Variants, uROBinaryHelpers; @@ -3741,6 +3913,138 @@ begin end; +{ Tosc_Customers_RefreshDataTableRules } +constructor Tosc_Customers_RefreshDataTableRules.Create(aDataTable: TDADataTable); +begin + inherited; +end; + +destructor Tosc_Customers_RefreshDataTableRules.Destroy; +begin + inherited; +end; + +function Tosc_Customers_RefreshDataTableRules.Getcustomers_idValue: Int64; +begin + result := DataTable.Fields[idx_osc_Customers_Refreshcustomers_id].AsLargeInt; +end; + +procedure Tosc_Customers_RefreshDataTableRules.Setcustomers_idValue(const aValue: Int64); +begin + DataTable.Fields[idx_osc_Customers_Refreshcustomers_id].AsLargeInt := aValue; +end; + +function Tosc_Customers_RefreshDataTableRules.Getcustomers_idIsNull: boolean; +begin + result := DataTable.Fields[idx_osc_Customers_Refreshcustomers_id].IsNull; +end; + +procedure Tosc_Customers_RefreshDataTableRules.Setcustomers_idIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_osc_Customers_Refreshcustomers_id].AsVariant := Null; +end; + + +{ Tosc_AddressBook_RefreshDataTableRules } +constructor Tosc_AddressBook_RefreshDataTableRules.Create(aDataTable: TDADataTable); +begin + inherited; +end; + +destructor Tosc_AddressBook_RefreshDataTableRules.Destroy; +begin + inherited; +end; + +function Tosc_AddressBook_RefreshDataTableRules.Getaddress_book_idValue: Int64; +begin + result := DataTable.Fields[idx_osc_AddressBook_Refreshaddress_book_id].AsLargeInt; +end; + +procedure Tosc_AddressBook_RefreshDataTableRules.Setaddress_book_idValue(const aValue: Int64); +begin + DataTable.Fields[idx_osc_AddressBook_Refreshaddress_book_id].AsLargeInt := aValue; +end; + +function Tosc_AddressBook_RefreshDataTableRules.Getaddress_book_idIsNull: boolean; +begin + result := DataTable.Fields[idx_osc_AddressBook_Refreshaddress_book_id].IsNull; +end; + +procedure Tosc_AddressBook_RefreshDataTableRules.Setaddress_book_idIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_osc_AddressBook_Refreshaddress_book_id].AsVariant := Null; +end; + + +{ Tosc_Manufacturers_RefreshDataTableRules } +constructor Tosc_Manufacturers_RefreshDataTableRules.Create(aDataTable: TDADataTable); +begin + inherited; +end; + +destructor Tosc_Manufacturers_RefreshDataTableRules.Destroy; +begin + inherited; +end; + +function Tosc_Manufacturers_RefreshDataTableRules.Getmanufacturers_idValue: Int64; +begin + result := DataTable.Fields[idx_osc_Manufacturers_Refreshmanufacturers_id].AsLargeInt; +end; + +procedure Tosc_Manufacturers_RefreshDataTableRules.Setmanufacturers_idValue(const aValue: Int64); +begin + DataTable.Fields[idx_osc_Manufacturers_Refreshmanufacturers_id].AsLargeInt := aValue; +end; + +function Tosc_Manufacturers_RefreshDataTableRules.Getmanufacturers_idIsNull: boolean; +begin + result := DataTable.Fields[idx_osc_Manufacturers_Refreshmanufacturers_id].IsNull; +end; + +procedure Tosc_Manufacturers_RefreshDataTableRules.Setmanufacturers_idIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_osc_Manufacturers_Refreshmanufacturers_id].AsVariant := Null; +end; + + +{ Tosc_Products_RefreshDataTableRules } +constructor Tosc_Products_RefreshDataTableRules.Create(aDataTable: TDADataTable); +begin + inherited; +end; + +destructor Tosc_Products_RefreshDataTableRules.Destroy; +begin + inherited; +end; + +function Tosc_Products_RefreshDataTableRules.Getproducts_idValue: Int64; +begin + result := DataTable.Fields[idx_osc_Products_Refreshproducts_id].AsLargeInt; +end; + +procedure Tosc_Products_RefreshDataTableRules.Setproducts_idValue(const aValue: Int64); +begin + DataTable.Fields[idx_osc_Products_Refreshproducts_id].AsLargeInt := aValue; +end; + +function Tosc_Products_RefreshDataTableRules.Getproducts_idIsNull: boolean; +begin + result := DataTable.Fields[idx_osc_Products_Refreshproducts_id].IsNull; +end; + +procedure Tosc_Products_RefreshDataTableRules.Setproducts_idIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_osc_Products_Refreshproducts_id].AsVariant := Null; +end; + + initialization RegisterDataTableRules(RID_osc_Customers, Tosc_CustomersDataTableRules); RegisterDataTableRules(RID_GetLastID, TGetLastIDDataTableRules); @@ -3752,5 +4056,9 @@ initialization RegisterDataTableRules(RID_osc_Orders, Tosc_OrdersDataTableRules); RegisterDataTableRules(RID_osc_Orders_products, Tosc_Orders_productsDataTableRules); RegisterDataTableRules(RID_osc_Orders_status_history, Tosc_Orders_status_historyDataTableRules); + RegisterDataTableRules(RID_osc_Customers_Refresh, Tosc_Customers_RefreshDataTableRules); + RegisterDataTableRules(RID_osc_AddressBook_Refresh, Tosc_AddressBook_RefreshDataTableRules); + RegisterDataTableRules(RID_osc_Manufacturers_Refresh, Tosc_Manufacturers_RefreshDataTableRules); + RegisterDataTableRules(RID_osc_Products_Refresh, Tosc_Products_RefreshDataTableRules); end. diff --git a/Source/Modulos/Tienda web/Model/schTiendaWebServer_Intf.pas b/Source/Modulos/Tienda web/Model/schTiendaWebServer_Intf.pas index 4e6406e..1e50b10 100644 --- a/Source/Modulos/Tienda web/Model/schTiendaWebServer_Intf.pas +++ b/Source/Modulos/Tienda web/Model/schTiendaWebServer_Intf.pas @@ -9,21 +9,25 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_osc_CustomersDelta = '{231389E5-387B-485F-92BA-6A9D5A04B8C5}'; - RID_GetLastIDDelta = '{297778AF-EA70-49C4-87B8-3A1872EB6864}'; - RID_osc_AddressBookDelta = '{CA6AD7D9-BC5B-4928-8DF8-F2C4A41B1869}'; - RID_TiendaWebDelta = '{F5C7B2A1-0B48-4C7D-B895-076D5824FFD5}'; - RID_osc_ManufacturersDelta = '{6FF380D1-E143-4870-947A-581AAF9E9CF6}'; - RID_osc_LanguagesDelta = '{CA42020F-6544-4029-BC84-51234090EB8F}'; - RID_osc_ProductsDelta = '{6F4677C4-BDEF-43E8-BEE8-425AA74C13F5}'; - RID_osc_OrdersDelta = '{E80B38F6-D0AA-4B8C-8110-427D492DDC37}'; - RID_osc_Orders_productsDelta = '{2FCFD487-854D-420B-9586-E8F12C08F95D}'; - RID_osc_Orders_status_historyDelta = '{8632B188-5EA5-4866-BFE4-90CB15C3A42B}'; + RID_osc_CustomersDelta = '{E7BFEB15-9076-4314-8F6E-93F7C26A3B18}'; + RID_GetLastIDDelta = '{F4AC41AA-ED03-4127-A738-DF5396847EB7}'; + RID_osc_AddressBookDelta = '{7ED8837D-A798-4285-ABE0-4B41B11FDC4A}'; + RID_TiendaWebDelta = '{ECA71055-3247-41ED-8941-DC56DD814178}'; + RID_osc_ManufacturersDelta = '{47E1134A-7477-4B1A-A039-6ED2A386681B}'; + RID_osc_LanguagesDelta = '{5638499A-3DC0-45F2-8D2C-F3A5049534F4}'; + RID_osc_ProductsDelta = '{0410F665-B1E3-4E89-9705-6688AD95BB90}'; + RID_osc_OrdersDelta = '{8905E192-7635-45B8-86BE-8FBE80E53FA3}'; + RID_osc_Orders_productsDelta = '{D75AB370-84B5-409D-B00D-B0298F404AA5}'; + RID_osc_Orders_status_historyDelta = '{03022934-FB83-4AF7-AA75-09CE33BA0F20}'; + RID_osc_Customers_RefreshDelta = '{D54699A1-CBA9-4AB5-BEE1-A092BB98E545}'; + RID_osc_AddressBook_RefreshDelta = '{EE3A7DB0-95D3-48C8-A882-95D43C45CED2}'; + RID_osc_Manufacturers_RefreshDelta = '{18A6BCB6-0CCC-49DD-84EF-8B909B7C758E}'; + RID_osc_Products_RefreshDelta = '{C53F8A05-C9C0-41B5-8273-777DE9F8E1B8}'; type { Iosc_CustomersDelta } Iosc_CustomersDelta = interface(Iosc_Customers) - ['{231389E5-387B-485F-92BA-6A9D5A04B8C5}'] + ['{E7BFEB15-9076-4314-8F6E-93F7C26A3B18}'] { Property getters and setters } function GetOldcustomers_idValue : Integer; function GetOldcustomers_firstnameValue : String; @@ -177,7 +181,7 @@ type { IGetLastIDDelta } IGetLastIDDelta = interface(IGetLastID) - ['{297778AF-EA70-49C4-87B8-3A1872EB6864}'] + ['{F4AC41AA-ED03-4127-A738-DF5396847EB7}'] { Property getters and setters } function GetOldlast_idValue : Integer; @@ -211,7 +215,7 @@ type { Iosc_AddressBookDelta } Iosc_AddressBookDelta = interface(Iosc_AddressBook) - ['{CA6AD7D9-BC5B-4928-8DF8-F2C4A41B1869}'] + ['{7ED8837D-A798-4285-ABE0-4B41B11FDC4A}'] { Property getters and setters } function GetOldaddress_book_idValue : Integer; function GetOldcustomers_idValue : Integer; @@ -413,7 +417,7 @@ type { ITiendaWebDelta } ITiendaWebDelta = interface(ITiendaWeb) - ['{F5C7B2A1-0B48-4C7D-B895-076D5824FFD5}'] + ['{ECA71055-3247-41ED-8941-DC56DD814178}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -543,7 +547,7 @@ type { Iosc_ManufacturersDelta } Iosc_ManufacturersDelta = interface(Iosc_Manufacturers) - ['{6FF380D1-E143-4870-947A-581AAF9E9CF6}'] + ['{47E1134A-7477-4B1A-A039-6ED2A386681B}'] { Property getters and setters } function GetOldmanufacturers_idValue : Integer; function GetOldmanufacturers_nameValue : String; @@ -637,7 +641,7 @@ type { Iosc_LanguagesDelta } Iosc_LanguagesDelta = interface(Iosc_Languages) - ['{CA42020F-6544-4029-BC84-51234090EB8F}'] + ['{5638499A-3DC0-45F2-8D2C-F3A5049534F4}'] { Property getters and setters } function GetOldlanguages_idValue : Integer; function GetOldnameValue : String; @@ -731,7 +735,7 @@ type { Iosc_ProductsDelta } Iosc_ProductsDelta = interface(Iosc_Products) - ['{6F4677C4-BDEF-43E8-BEE8-425AA74C13F5}'] + ['{0410F665-B1E3-4E89-9705-6688AD95BB90}'] { Property getters and setters } function GetOldproducts_idValue : Integer; function GetOldproducts_nameValue : String; @@ -862,7 +866,7 @@ type { Iosc_OrdersDelta } Iosc_OrdersDelta = interface(Iosc_Orders) - ['{E80B38F6-D0AA-4B8C-8110-427D492DDC37}'] + ['{8905E192-7635-45B8-86BE-8FBE80E53FA3}'] { Property getters and setters } function GetOldorders_idValue : Integer; function GetOldrdx_orders_id_localValue : Integer; @@ -1125,7 +1129,7 @@ type { Iosc_Orders_productsDelta } Iosc_Orders_productsDelta = interface(Iosc_Orders_products) - ['{2FCFD487-854D-420B-9586-E8F12C08F95D}'] + ['{D75AB370-84B5-409D-B00D-B0298F404AA5}'] { Property getters and setters } function GetOldorders_products_idValue : Integer; function GetOldorders_idValue : Integer; @@ -1267,7 +1271,7 @@ type { Iosc_Orders_status_historyDelta } Iosc_Orders_status_historyDelta = interface(Iosc_Orders_status_history) - ['{8632B188-5EA5-4866-BFE4-90CB15C3A42B}'] + ['{03022934-FB83-4AF7-AA75-09CE33BA0F20}'] { Property getters and setters } function GetOldorders_status_history_idValue : Integer; function GetOldorders_idValue : Integer; @@ -1372,6 +1376,142 @@ type end; + { Iosc_Customers_RefreshDelta } + Iosc_Customers_RefreshDelta = interface(Iosc_Customers_Refresh) + ['{D54699A1-CBA9-4AB5-BEE1-A092BB98E545}'] + { Property getters and setters } + function GetOldcustomers_idValue : Int64; + + { Properties } + property Oldcustomers_id : Int64 read GetOldcustomers_idValue; + end; + + { Tosc_Customers_RefreshBusinessProcessorRules } + Tosc_Customers_RefreshBusinessProcessorRules = class(TDABusinessProcessorRules, Iosc_Customers_Refresh, Iosc_Customers_RefreshDelta) + private + protected + { Property getters and setters } + function Getcustomers_idValue: Int64; virtual; + function Getcustomers_idIsNull: Boolean; virtual; + function GetOldcustomers_idValue: Int64; virtual; + function GetOldcustomers_idIsNull: Boolean; virtual; + procedure Setcustomers_idValue(const aValue: Int64); virtual; + procedure Setcustomers_idIsNull(const aValue: Boolean); virtual; + + { Properties } + property customers_id : Int64 read Getcustomers_idValue write Setcustomers_idValue; + property customers_idIsNull : Boolean read Getcustomers_idIsNull write Setcustomers_idIsNull; + property Oldcustomers_id : Int64 read GetOldcustomers_idValue; + property Oldcustomers_idIsNull : Boolean read GetOldcustomers_idIsNull; + + public + constructor Create(aBusinessProcessor: TDABusinessProcessor); override; + destructor Destroy; override; + + end; + + { Iosc_AddressBook_RefreshDelta } + Iosc_AddressBook_RefreshDelta = interface(Iosc_AddressBook_Refresh) + ['{EE3A7DB0-95D3-48C8-A882-95D43C45CED2}'] + { Property getters and setters } + function GetOldaddress_book_idValue : Int64; + + { Properties } + property Oldaddress_book_id : Int64 read GetOldaddress_book_idValue; + end; + + { Tosc_AddressBook_RefreshBusinessProcessorRules } + Tosc_AddressBook_RefreshBusinessProcessorRules = class(TDABusinessProcessorRules, Iosc_AddressBook_Refresh, Iosc_AddressBook_RefreshDelta) + private + protected + { Property getters and setters } + function Getaddress_book_idValue: Int64; virtual; + function Getaddress_book_idIsNull: Boolean; virtual; + function GetOldaddress_book_idValue: Int64; virtual; + function GetOldaddress_book_idIsNull: Boolean; virtual; + procedure Setaddress_book_idValue(const aValue: Int64); virtual; + procedure Setaddress_book_idIsNull(const aValue: Boolean); virtual; + + { Properties } + property address_book_id : Int64 read Getaddress_book_idValue write Setaddress_book_idValue; + property address_book_idIsNull : Boolean read Getaddress_book_idIsNull write Setaddress_book_idIsNull; + property Oldaddress_book_id : Int64 read GetOldaddress_book_idValue; + property Oldaddress_book_idIsNull : Boolean read GetOldaddress_book_idIsNull; + + public + constructor Create(aBusinessProcessor: TDABusinessProcessor); override; + destructor Destroy; override; + + end; + + { Iosc_Manufacturers_RefreshDelta } + Iosc_Manufacturers_RefreshDelta = interface(Iosc_Manufacturers_Refresh) + ['{18A6BCB6-0CCC-49DD-84EF-8B909B7C758E}'] + { Property getters and setters } + function GetOldmanufacturers_idValue : Int64; + + { Properties } + property Oldmanufacturers_id : Int64 read GetOldmanufacturers_idValue; + end; + + { Tosc_Manufacturers_RefreshBusinessProcessorRules } + Tosc_Manufacturers_RefreshBusinessProcessorRules = class(TDABusinessProcessorRules, Iosc_Manufacturers_Refresh, Iosc_Manufacturers_RefreshDelta) + private + protected + { Property getters and setters } + function Getmanufacturers_idValue: Int64; virtual; + function Getmanufacturers_idIsNull: Boolean; virtual; + function GetOldmanufacturers_idValue: Int64; virtual; + function GetOldmanufacturers_idIsNull: Boolean; virtual; + procedure Setmanufacturers_idValue(const aValue: Int64); virtual; + procedure Setmanufacturers_idIsNull(const aValue: Boolean); virtual; + + { Properties } + property manufacturers_id : Int64 read Getmanufacturers_idValue write Setmanufacturers_idValue; + property manufacturers_idIsNull : Boolean read Getmanufacturers_idIsNull write Setmanufacturers_idIsNull; + property Oldmanufacturers_id : Int64 read GetOldmanufacturers_idValue; + property Oldmanufacturers_idIsNull : Boolean read GetOldmanufacturers_idIsNull; + + public + constructor Create(aBusinessProcessor: TDABusinessProcessor); override; + destructor Destroy; override; + + end; + + { Iosc_Products_RefreshDelta } + Iosc_Products_RefreshDelta = interface(Iosc_Products_Refresh) + ['{C53F8A05-C9C0-41B5-8273-777DE9F8E1B8}'] + { Property getters and setters } + function GetOldproducts_idValue : Int64; + + { Properties } + property Oldproducts_id : Int64 read GetOldproducts_idValue; + end; + + { Tosc_Products_RefreshBusinessProcessorRules } + Tosc_Products_RefreshBusinessProcessorRules = class(TDABusinessProcessorRules, Iosc_Products_Refresh, Iosc_Products_RefreshDelta) + private + protected + { Property getters and setters } + function Getproducts_idValue: Int64; virtual; + function Getproducts_idIsNull: Boolean; virtual; + function GetOldproducts_idValue: Int64; virtual; + function GetOldproducts_idIsNull: Boolean; virtual; + procedure Setproducts_idValue(const aValue: Int64); virtual; + procedure Setproducts_idIsNull(const aValue: Boolean); virtual; + + { Properties } + property products_id : Int64 read Getproducts_idValue write Setproducts_idValue; + property products_idIsNull : Boolean read Getproducts_idIsNull write Setproducts_idIsNull; + property Oldproducts_id : Int64 read GetOldproducts_idValue; + property Oldproducts_idIsNull : Boolean read GetOldproducts_idIsNull; + + public + constructor Create(aBusinessProcessor: TDABusinessProcessor); override; + destructor Destroy; override; + + end; + implementation uses @@ -4435,6 +4575,178 @@ begin end; +{ Tosc_Customers_RefreshBusinessProcessorRules } +constructor Tosc_Customers_RefreshBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); +begin + inherited; +end; + +destructor Tosc_Customers_RefreshBusinessProcessorRules.Destroy; +begin + inherited; +end; + +function Tosc_Customers_RefreshBusinessProcessorRules.Getcustomers_idValue: Int64; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_osc_Customers_Refreshcustomers_id]; +end; + +function Tosc_Customers_RefreshBusinessProcessorRules.Getcustomers_idIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_osc_Customers_Refreshcustomers_id]); +end; + +function Tosc_Customers_RefreshBusinessProcessorRules.GetOldcustomers_idValue: Int64; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_osc_Customers_Refreshcustomers_id]; +end; + +function Tosc_Customers_RefreshBusinessProcessorRules.GetOldcustomers_idIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_osc_Customers_Refreshcustomers_id]); +end; + +procedure Tosc_Customers_RefreshBusinessProcessorRules.Setcustomers_idValue(const aValue: Int64); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_osc_Customers_Refreshcustomers_id] := aValue; +end; + +procedure Tosc_Customers_RefreshBusinessProcessorRules.Setcustomers_idIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_osc_Customers_Refreshcustomers_id] := Null; +end; + + +{ Tosc_AddressBook_RefreshBusinessProcessorRules } +constructor Tosc_AddressBook_RefreshBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); +begin + inherited; +end; + +destructor Tosc_AddressBook_RefreshBusinessProcessorRules.Destroy; +begin + inherited; +end; + +function Tosc_AddressBook_RefreshBusinessProcessorRules.Getaddress_book_idValue: Int64; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_osc_AddressBook_Refreshaddress_book_id]; +end; + +function Tosc_AddressBook_RefreshBusinessProcessorRules.Getaddress_book_idIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_osc_AddressBook_Refreshaddress_book_id]); +end; + +function Tosc_AddressBook_RefreshBusinessProcessorRules.GetOldaddress_book_idValue: Int64; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_osc_AddressBook_Refreshaddress_book_id]; +end; + +function Tosc_AddressBook_RefreshBusinessProcessorRules.GetOldaddress_book_idIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_osc_AddressBook_Refreshaddress_book_id]); +end; + +procedure Tosc_AddressBook_RefreshBusinessProcessorRules.Setaddress_book_idValue(const aValue: Int64); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_osc_AddressBook_Refreshaddress_book_id] := aValue; +end; + +procedure Tosc_AddressBook_RefreshBusinessProcessorRules.Setaddress_book_idIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_osc_AddressBook_Refreshaddress_book_id] := Null; +end; + + +{ Tosc_Manufacturers_RefreshBusinessProcessorRules } +constructor Tosc_Manufacturers_RefreshBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); +begin + inherited; +end; + +destructor Tosc_Manufacturers_RefreshBusinessProcessorRules.Destroy; +begin + inherited; +end; + +function Tosc_Manufacturers_RefreshBusinessProcessorRules.Getmanufacturers_idValue: Int64; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_osc_Manufacturers_Refreshmanufacturers_id]; +end; + +function Tosc_Manufacturers_RefreshBusinessProcessorRules.Getmanufacturers_idIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_osc_Manufacturers_Refreshmanufacturers_id]); +end; + +function Tosc_Manufacturers_RefreshBusinessProcessorRules.GetOldmanufacturers_idValue: Int64; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_osc_Manufacturers_Refreshmanufacturers_id]; +end; + +function Tosc_Manufacturers_RefreshBusinessProcessorRules.GetOldmanufacturers_idIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_osc_Manufacturers_Refreshmanufacturers_id]); +end; + +procedure Tosc_Manufacturers_RefreshBusinessProcessorRules.Setmanufacturers_idValue(const aValue: Int64); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_osc_Manufacturers_Refreshmanufacturers_id] := aValue; +end; + +procedure Tosc_Manufacturers_RefreshBusinessProcessorRules.Setmanufacturers_idIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_osc_Manufacturers_Refreshmanufacturers_id] := Null; +end; + + +{ Tosc_Products_RefreshBusinessProcessorRules } +constructor Tosc_Products_RefreshBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); +begin + inherited; +end; + +destructor Tosc_Products_RefreshBusinessProcessorRules.Destroy; +begin + inherited; +end; + +function Tosc_Products_RefreshBusinessProcessorRules.Getproducts_idValue: Int64; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_osc_Products_Refreshproducts_id]; +end; + +function Tosc_Products_RefreshBusinessProcessorRules.Getproducts_idIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_osc_Products_Refreshproducts_id]); +end; + +function Tosc_Products_RefreshBusinessProcessorRules.GetOldproducts_idValue: Int64; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_osc_Products_Refreshproducts_id]; +end; + +function Tosc_Products_RefreshBusinessProcessorRules.GetOldproducts_idIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_osc_Products_Refreshproducts_id]); +end; + +procedure Tosc_Products_RefreshBusinessProcessorRules.Setproducts_idValue(const aValue: Int64); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_osc_Products_Refreshproducts_id] := aValue; +end; + +procedure Tosc_Products_RefreshBusinessProcessorRules.Setproducts_idIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_osc_Products_Refreshproducts_id] := Null; +end; + + initialization RegisterBusinessProcessorRules(RID_osc_CustomersDelta, Tosc_CustomersBusinessProcessorRules); RegisterBusinessProcessorRules(RID_GetLastIDDelta, TGetLastIDBusinessProcessorRules); @@ -4446,5 +4758,9 @@ initialization RegisterBusinessProcessorRules(RID_osc_OrdersDelta, Tosc_OrdersBusinessProcessorRules); RegisterBusinessProcessorRules(RID_osc_Orders_productsDelta, Tosc_Orders_productsBusinessProcessorRules); RegisterBusinessProcessorRules(RID_osc_Orders_status_historyDelta, Tosc_Orders_status_historyBusinessProcessorRules); + RegisterBusinessProcessorRules(RID_osc_Customers_RefreshDelta, Tosc_Customers_RefreshBusinessProcessorRules); + RegisterBusinessProcessorRules(RID_osc_AddressBook_RefreshDelta, Tosc_AddressBook_RefreshBusinessProcessorRules); + RegisterBusinessProcessorRules(RID_osc_Manufacturers_RefreshDelta, Tosc_Manufacturers_RefreshBusinessProcessorRules); + RegisterBusinessProcessorRules(RID_osc_Products_RefreshDelta, Tosc_Products_RefreshBusinessProcessorRules); end. diff --git a/Source/Modulos/Tienda web/Servidor/srvTiendaWeb_Impl.dfm b/Source/Modulos/Tienda web/Servidor/srvTiendaWeb_Impl.dfm index 8972b8f..975060f 100644 --- a/Source/Modulos/Tienda web/Servidor/srvTiendaWeb_Impl.dfm +++ b/Source/Modulos/Tienda web/Servidor/srvTiendaWeb_Impl.dfm @@ -1926,38 +1926,27 @@ object srvTiendaWeb: TsrvTiendaWeb DataType = datString Size = 32 Value = '' - ParamType = daptInput end item Name = 'manufacturers_image' DataType = datString Size = 64 Value = '' - ParamType = daptInput end item Name = 'date_added' DataType = datDateTime Value = '' - ParamType = daptInput end item Name = 'last_modified' DataType = datDateTime Value = '' - ParamType = daptInput end item Name = 'rdx_manufacturers_id_local' DataType = datInteger Value = '' - ParamType = daptInput - end - item - Name = 'OLD_manufacturers_id' - DataType = datInteger - Value = '' - ParamType = daptInput end> Statements = < item @@ -1968,7 +1957,8 @@ object srvTiendaWeb: TsrvTiendaWeb 'ers_name,'#10' manufacturers_image = :manufacturers_image, '#10' d' + 'ate_added = :date_added, '#10' last_modified = :last_modified, '#10' ' + ' rdx_manufacturers_id_local = :rdx_manufacturers_id_local'#10' WH' + - 'ERE'#10' (manufacturers_id = :OLD_manufacturers_id)' + 'ERE'#10' (rdx_manufacturers_id_local = :rdx_manufacturers_id_loca' + + 'l)'#10 StatementType = stSQL ColumnMappings = <> end> @@ -2960,7 +2950,7 @@ object srvTiendaWeb: TsrvTiendaWeb UpdateCommandName = 'Update_Customers' RefreshDatasetName = 'osc_Customers-Refresh' ReferencedDataset = 'osc_Customers' - ProcessorOptions = [poAutoGenerateInsert, poPrepareCommands] + ProcessorOptions = [poAutoGenerateInsert, poPrepareCommands, poIgnoreRowsAffected] UpdateMode = updWhereKeyOnly Left = 384 Top = 22 @@ -2983,7 +2973,7 @@ object srvTiendaWeb: TsrvTiendaWeb UpdateCommandName = 'Update_osc_Manufacturers' RefreshDatasetName = 'osc_Manufacturers-Refresh' ReferencedDataset = 'osc_Manufacturers' - ProcessorOptions = [poPrepareCommands] + ProcessorOptions = [poPrepareCommands, poIgnoreRowsAffected] UpdateMode = updWhereKeyOnly Left = 496 Top = 22 @@ -2995,7 +2985,7 @@ object srvTiendaWeb: TsrvTiendaWeb UpdateCommandName = 'Update_osc_Products' RefreshDatasetName = 'osc_Products-Refresh' ReferencedDataset = 'osc_Products' - ProcessorOptions = [poPrepareCommands] + ProcessorOptions = [poPrepareCommands, poIgnoreRowsAffected] UpdateMode = updWhereKeyOnly Left = 496 Top = 86 diff --git a/Source/Modulos/Tienda web/Views/uEditorTiendaWeb.pas b/Source/Modulos/Tienda web/Views/uEditorTiendaWeb.pas index 48ad1f1..2260d8e 100644 --- a/Source/Modulos/Tienda web/Views/uEditorTiendaWeb.pas +++ b/Source/Modulos/Tienda web/Views/uEditorTiendaWeb.pas @@ -5,7 +5,8 @@ interface uses Windows, SysUtils, Classes, Graphics, Forms, Controls, StdCtrls, Buttons, ComCtrls, ExtCtrls, ActnList, cxControls, cxContainer, cxEdit, cxCheckBox, cxDBEdit, DB, uDADataTable, uIEditorTiendaWeb, uBizTiendaWeb, - cxTextEdit, uTiendaWebController, DBXpress, WideStrings, SqlExpr; + cxTextEdit, uTiendaWebController, DBXpress, WideStrings, SqlExpr, + uDAInterfaces; type TfEditorTiendaWeb = class(TForm, IEditorTiendaWeb) diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 54ab28a..9acc124 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index e5807f0..035800c 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -158,12 +158,12 @@ uses uConexionOSC in 'Configuracion\uConexionOSC.pas' {frConexionOSC: TFrame}, schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas', schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas', - schTiendaWebClient_Intf in '..\Modulos\Tienda web\Model\schTiendaWebClient_Intf.pas', - schTiendaWebServer_Intf in '..\Modulos\Tienda web\Model\schTiendaWebServer_Intf.pas', schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas', schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas', schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas', - schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas'; + schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas', + schTiendaWebClient_Intf in '..\Modulos\Tienda web\Model\schTiendaWebClient_Intf.pas', + schTiendaWebServer_Intf in '..\Modulos\Tienda web\Model\schTiendaWebServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 2d083ed..11af204 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -35,7 +35,7 @@ Delphi.Personality - FalseTrueFalse/standaloneTrueFalse4060FalseFalseFalseFalseFalse308212524.0.6.04.0.6.0martes, 26 de octubre de 2010 16:20 + FalseTrueFalse/standaloneTrueFalse4070FalseFalseFalseFalseFalse308212524.0.7.04.0.7.0martes, 02 de noviembre de 2010 18:27 ExpressPrinting System by Developer Express Inc. FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index a6eb0e7..bf1a4ec 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 4,0,6,0 -PRODUCTVERSION 4,0,6,0 +FILEVERSION 4,0,7,0 +PRODUCTVERSION 4,0,7,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -12,9 +12,9 @@ BEGIN BEGIN BLOCK "0C0A04E4" BEGIN - VALUE "FileVersion", "4.0.6.0\0" - VALUE "ProductVersion", "4.0.6.0\0" - VALUE "CompileDate", "martes, 26 de octubre de 2010 16:25\0" + VALUE "FileVersion", "4.0.7.0\0" + VALUE "ProductVersion", "4.0.7.0\0" + VALUE "CompileDate", "martes, 02 de noviembre de 2010 18:52\0" END END BLOCK "VarFileInfo"