TabletDirector-develop

• 

  David Butt 14 Jan 2016 8033008528aac9c9837df420e3dfd22f56d21803

  Merge remote-tracking branch 'origin/2.4' into Trunk
• 

  David Butt 14 Jan 2016 e4fcdaabae6abb0ca8ef49e417ba0fd035776645

  ecommerce stuff tablet director changes for ecommerce

  • NoCompileScripts/NoCompileScripts.csproj (diffs)
  • NoCompileScripts/ShopifyMapping.cs (diffs)
  • TabletDirector.sln (diffs)
  • TabletDirector/API/OrderApiController.cs (diffs)
  • TabletDirector/Controllers/LabelController.cs (diffs)
  • TabletDirector/Controllers/OrderController.cs (diffs)
  • TabletDirector/Controllers/OrderReleaseController.cs (diffs)
  • TabletDirector/Controllers/WebServiceController.cs (diffs)
  • TabletDirector/Models/DatabaseModels/OrderHeader.cs (diffs)
  • TabletDirector/Models/ImportModels/ImportOrder.cs (diffs)
  • TabletDirector/Models/PushApiModels/OrderComplete.cs (diffs)
  • TabletDirector/Models/PushApiModels/PackingComplete.cs (diffs)
  • TabletDirector/Models/PushApiModels/PrintOrderDetail.cs (diffs)
  • eCommerce.DataLayer/DataContext.cs (diffs)
  • eCommerce.DataLayer/eCommerce.DataLayer.csproj (diffs)
  • eCommerce.ExecutionConsole/App.config (diffs)
  • eCommerce.ExecutionConsole/Program.cs (diffs)
  • eCommerce.ExecutionConsole/ServiceConfig.settings (diffs)
  • eCommerce.ExecutionConsole/ShopifyConfiguration.xml (diffs)
  • eCommerce.ServiceLayer/IntegrationModels/Shopify/Configuration.cs (diffs)
  • eCommerce.ServiceLayer/IntegrationModels/Shopify/IShopifyMapping.cs (diffs)
  • eCommerce.ServiceLayer/IntegrationModels/Shopify/LineItem.cs (diffs)
  • eCommerce.ServiceLayer/IntegrationModels/Shopify/Order.cs (diffs)
  • eCommerce.ServiceLayer/IntegrationModels/Shopify/Product.cs (diffs)
  • eCommerce.ServiceLayer/IntegrationServices/MagentoService.cs (diffs)
  • eCommerce.ServiceLayer/IntegrationServices/QuickBooksDesktopService.cs (diffs)
  • eCommerce.ServiceLayer/IntegrationServices/ShopifyService.cs (diffs)
  • eCommerce.ServiceLayer/SchedulerModels/QuickbooksDesktop/GetOrders.cs (diffs)
  • eCommerce.ServiceLayer/SchedulerModels/QuickbooksDesktop/ImportItems.cs (diffs)
  • eCommerce.ServiceLayer/SchedulerModels/QuickbooksDesktop/ProcessCompletedOrders.cs (diffs)
  • eCommerce.ServiceLayer/SchedulerModels/QuickbooksDesktop/ProcessInventory.cs (diffs)
  • eCommerce.ServiceLayer/SchedulerModels/Shopify/GetOrders.cs (diffs)
  • eCommerce.ServiceLayer/SchedulerModels/Shopify/ImportItems.cs (diffs)
  • eCommerce.ServiceLayer/SchedulerModels/Shopify/ProcessCompletedOrders.cs (diffs)
  • eCommerce.ServiceLayer/SchedulerModels/Shopify/ProcessInventory.cs (diffs)
  • eCommerce.ServiceLayer/ServiceConfiguration.cs (diffs)
  • eCommerce.ServiceLayer/Services/IntegrationService.cs (diffs)
  • eCommerce.ServiceLayer/eCommerce.ServiceLayer.csproj (diffs)
• 

  David Butt 14 Jan 2016 50b3cf85f2259ce26bafcd800370929bffc6009a

  Added flags for require lot at pick and for at pack

  • TabletDirector/Controllers/WebServiceController.cs (diffs)
  • TabletDirector/Migrations/201601141715375_AddRequireLotAtPickAndPackFlags.Designer.cs (diffs)
  • TabletDirector/Migrations/201601141715375_AddRequireLotAtPickAndPackFlags.cs (diffs)
  • TabletDirector/Migrations/201601141715375_AddRequireLotAtPickAndPackFlags.resx (diffs)
  • TabletDirector/Models/DatabaseModels/AppSettings.cs (diffs)
  • TabletDirector/Models/ServiceModels/SmUser.cs (diffs)
  • TabletDirector/TabletDirector.csproj (diffs)
  • TabletDirector/Views/AppSettings/Edit.cshtml (diffs)
• 

  David Butt 13 Jan 2016 d192fce178af08adc1d7a46ae3287d18a6e53a5d

  fixed PO number not blank

  • TabletDirector/Controllers/PoHeaderController.cs (diffs)
• 

  David Butt 11 Jan 2016 57675b1e2dad8208dabeb2ba1c70838fc0134052

  fixed another po error

  • TabletDirector/Controllers/PoHeaderController.cs (diffs)
• 

  David Butt 11 Jan 2016 01b397c59b4565ff92b033a143e8389e96d43008

  po number fix redux

  • TabletDirector/Controllers/PoHeaderController.cs (diffs)
• 

  David Butt 11 Jan 2016 f9a9389c45c2fe45c44a157b206c0d3443d75ce9

  fixed PO with null PO Number

  • TabletDirector/Controllers/PoHeaderController.cs (diffs)
• 

  David Butt 07 Jan 2016 3378f5f4c6282d31c5079dcb7bb1e1c832a103d8

  changed order management now has its default selection as "Open" added pick zone name to edit order page

  • TabletDirector/Controllers/OrderReleaseController.cs (diffs)
  • TabletDirector/Views/Order/Edit.cshtml (diffs)
  • TabletDirector/Views/OrderRelease/Index.cshtml (diffs)
• 

  David Butt 06 Jan 2016 2927ea1a74b5c7f18aa22c419e1306379a2d9a69

  fixed date regex to the tablet

  • TabletDirector/Controllers/WebServiceController.cs (diffs)
• 

  David Butt 22 Dec 2015 0972c22abbfd1908b24b41debfd27e39909a1310

  now removes previous cart when deleting from API

  • TabletDirector/API/OrderApiController.cs (diffs)
• 

  David Butt 22 Dec 2015 34f5e2a095f8fa3472a8737b3e7fcbb980158441

  added orders page back for searching fixed error handling for delete cart

  • TabletDirector/API/OrderApiController.cs (diffs)
  • TabletDirector/Views/Shared/_MenuPartial.cshtml (diffs)
• 

  David Butt 22 Dec 2015 c7b38fea5be876b8e0743026146ad50405de0c1a

  added save to create and delete cart

  • TabletDirector/API/OrderApiController.cs (diffs)
• 

  David Butt 15 Dec 2015 3677499ce1d6fbe9617a14bf4e5c6cd38525c14e

  fixed batch allocation with threaded min grab

  • TabletDirector/Services/AllocationServices/AllocationServiceMinGrab_Threaded.cs (diffs)
• 

  David Butt 15 Dec 2015 7dc0f7e94f094727558a96c3f5df7636cb2774e8

  fixed hold issue when not having allocated unknown items

  • TabletDirector/Controllers/WebServiceController.cs (diffs)